CVS commit: pkgsrc/devel/nss

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Apr 12 10:25:17 UTC 2020

Modified Files:
        pkgsrc/devel/nss: distinfo
        pkgsrc/devel/nss/patches: patch-me

Log Message:
nss: delete patch hunk which should no longer be necessary


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/nss/patches/patch-me

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.108 pkgsrc/devel/nss/distinfo:1.109
--- pkgsrc/devel/nss/distinfo:1.108     Wed Mar 18 13:22:10 2020
+++ pkgsrc/devel/nss/distinfo   Sun Apr 12 10:25:17 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.108 2020/03/18 13:22:10 ryoon Exp $
+$NetBSD: distinfo,v 1.109 2020/04/12 10:25:17 tnn Exp $
 
 SHA1 (nss-3.51.tar.gz) = f1d46871728cd5afc81ec07d9833bb2b8c4fa68f
 RMD160 (nss-3.51.tar.gz) = f35fa4a2439f8ec3d2f23c575cfa1d5c7cfe48ef
@@ -7,7 +7,7 @@ Size (nss-3.51.tar.gz) = 78305125 bytes
 SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca
 SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
 SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
-SHA1 (patch-me) = a0d4bf85652c0cdac7fdf95dc2fb7545d66349cd
+SHA1 (patch-me) = c1b6b22e8bb504df46a0b1a365375b5514a51358
 SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709
 SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834
 SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561

Index: pkgsrc/devel/nss/patches/patch-me
diff -u pkgsrc/devel/nss/patches/patch-me:1.6 pkgsrc/devel/nss/patches/patch-me:1.7
--- pkgsrc/devel/nss/patches/patch-me:1.6       Fri Jan 10 03:43:20 2020
+++ pkgsrc/devel/nss/patches/patch-me   Sun Apr 12 10:25:17 2020
@@ -1,30 +1,11 @@
-$NetBSD: patch-me,v 1.6 2020/01/10 03:43:20 ryoon Exp $
+$NetBSD: patch-me,v 1.7 2020/04/12 10:25:17 tnn Exp $
 
 Add DragonFly support.
 Always include GCM for aarch64.
 
---- nss/lib/freebl/Makefile.orig       2020-01-03 20:27:43.000000000 +0000
+--- nss/lib/freebl/Makefile.orig       2020-03-06 18:44:20.000000000 +0000
 +++ nss/lib/freebl/Makefile
-@@ -101,6 +101,9 @@ endif
- ifdef NSS_NO_INIT_SUPPORT
-     DEFINES += -DNSS_NO_INIT_SUPPORT
- endif
-+ifeq ($(CPU_ARCH),aarch64)
-+    EXTRA_SRCS += gcm-aarch64.c
-+endif
- 
- ifdef FREEBL_PRELINK_COMMAND
-       DEFINES +=-DFREEBL_PRELINK_COMMAND=\"$(FREEBL_PRELINK_COMMAND)\"
-@@ -121,7 +124,7 @@ endif
- endif
- ifeq ($(CPU_ARCH),aarch64)
-     DEFINES += -DUSE_HW_AES
--    EXTRA_SRCS += aes-armv8.c gcm-aarch64.c
-+    EXTRA_SRCS += aes-armv8.c
- endif
- ifeq ($(CPU_ARCH),arm)
-     EXTRA_SRCS += gcm-arm32-neon.c
-@@ -320,7 +323,7 @@ endif
+@@ -320,7 +320,7 @@ endif
  # to bind the blapi function references in FREEBLVector vector
  # (ldvector.c) to the blapi functions defined in the freebl
  # shared libraries.
@@ -33,7 +14,7 @@ Always include GCM for aarch64.
      MKSHLIB += -Wl,-Bsymbolic
  endif
  
-@@ -472,7 +475,11 @@ else
+@@ -472,7 +472,11 @@ else
      ifdef NS_USE_GCC
        LD = gcc
        AS = gcc