diff options
| author | tnn <tnn@pkgsrc.org> | 2020-04-12 10:25:17 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-04-12 10:25:17 +0000 |
| commit | 192a243ccebbbd788826d684d1bbeb36db0997a1 (patch) | |
| tree | 3a5c5bca1e745cbd944c2b3af370ce7b0b5deb5a | |
| parent | 211a1ad28c23e123c1c9a448845843d055605280 (diff) | |
| download | pkgsrc-192a243ccebbbd788826d684d1bbeb36db0997a1.tar.gz | |
nss: delete patch hunk which should no longer be necessary
| -rw-r--r-- | devel/nss/distinfo | 4 | ||||
| -rw-r--r-- | devel/nss/patches/patch-me | 27 |
2 files changed, 6 insertions, 25 deletions
diff --git a/devel/nss/distinfo b/devel/nss/distinfo index fe038314e02..8c30ffadcf8 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -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 diff --git a/devel/nss/patches/patch-me b/devel/nss/patches/patch-me index 09a72df835f..d618209d6cc 100644 --- a/devel/nss/patches/patch-me +++ b/devel/nss/patches/patch-me @@ -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 |