Sun Apr 12 10:25:17 2020 UTC ()
nss: delete patch hunk which should no longer be necessary


(tnn)
diff -r1.108 -r1.109 pkgsrc/devel/nss/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/nss/patches/patch-me
cvs diff -r1.108 -r1.109 pkgsrc/devel/nss/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/nss/distinfo 2020/03/18 13:22:10 1.108
+++ pkgsrc/devel/nss/distinfo 2020/04/12 10:25:17 1.109
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.108 2020/03/18 13:22:10 ryoon Exp $ 1$NetBSD: distinfo,v 1.109 2020/04/12 10:25:17 tnn Exp $
2 2
3SHA1 (nss-3.51.tar.gz) = f1d46871728cd5afc81ec07d9833bb2b8c4fa68f 3SHA1 (nss-3.51.tar.gz) = f1d46871728cd5afc81ec07d9833bb2b8c4fa68f
4RMD160 (nss-3.51.tar.gz) = f35fa4a2439f8ec3d2f23c575cfa1d5c7cfe48ef 4RMD160 (nss-3.51.tar.gz) = f35fa4a2439f8ec3d2f23c575cfa1d5c7cfe48ef
5SHA512 (nss-3.51.tar.gz) = 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd 5SHA512 (nss-3.51.tar.gz) = 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
6Size (nss-3.51.tar.gz) = 78305125 bytes 6Size (nss-3.51.tar.gz) = 78305125 bytes
7SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca 7SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca
8SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69 8SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
9SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1 9SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
10SHA1 (patch-me) = a0d4bf85652c0cdac7fdf95dc2fb7545d66349cd 10SHA1 (patch-me) = c1b6b22e8bb504df46a0b1a365375b5514a51358
11SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709 11SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709
12SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834 12SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834
13SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561 13SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561
14SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a 14SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a
15SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4 15SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
16SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6 16SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
17SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754 17SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754
18SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74 18SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
19SHA1 (patch-nss_lib_freebl_md5.c) = 5cbec40695e296f0713895fb85cd37f6df76b85b 19SHA1 (patch-nss_lib_freebl_md5.c) = 5cbec40695e296f0713895fb85cd37f6df76b85b
20SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb 20SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
21SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071 21SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
22SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7 22SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
23SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af 23SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
cvs diff -r1.6 -r1.7 pkgsrc/devel/nss/patches/patch-me (expand / switch to unified diff)

--- pkgsrc/devel/nss/patches/patch-me 2020/01/10 03:43:20 1.6
+++ pkgsrc/devel/nss/patches/patch-me 2020/04/12 10:25:17 1.7
@@ -1,47 +1,28 @@ @@ -1,47 +1,28 @@
1$NetBSD: patch-me,v 1.6 2020/01/10 03:43:20 ryoon Exp $ 1$NetBSD: patch-me,v 1.7 2020/04/12 10:25:17 tnn Exp $
2 2
3Add DragonFly support. 3Add DragonFly support.
4Always include GCM for aarch64. 4Always include GCM for aarch64.
5 5
6--- nss/lib/freebl/Makefile.orig 2020-01-03 20:27:43.000000000 +0000 6--- nss/lib/freebl/Makefile.orig 2020-03-06 18:44:20.000000000 +0000
7+++ nss/lib/freebl/Makefile 7+++ nss/lib/freebl/Makefile
8@@ -101,6 +101,9 @@ endif 8@@ -320,7 +320,7 @@ endif
9 ifdef NSS_NO_INIT_SUPPORT 
10 DEFINES += -DNSS_NO_INIT_SUPPORT 
11 endif 
12+ifeq ($(CPU_ARCH),aarch64) 
13+ EXTRA_SRCS += gcm-aarch64.c 
14+endif 
15  
16 ifdef FREEBL_PRELINK_COMMAND 
17 DEFINES +=-DFREEBL_PRELINK_COMMAND=\"$(FREEBL_PRELINK_COMMAND)\" 
18@@ -121,7 +124,7 @@ endif 
19 endif 
20 ifeq ($(CPU_ARCH),aarch64) 
21 DEFINES += -DUSE_HW_AES 
22- EXTRA_SRCS += aes-armv8.c gcm-aarch64.c 
23+ EXTRA_SRCS += aes-armv8.c 
24 endif 
25 ifeq ($(CPU_ARCH),arm) 
26 EXTRA_SRCS += gcm-arm32-neon.c 
27@@ -320,7 +323,7 @@ endif 
28 # to bind the blapi function references in FREEBLVector vector 9 # to bind the blapi function references in FREEBLVector vector
29 # (ldvector.c) to the blapi functions defined in the freebl 10 # (ldvector.c) to the blapi functions defined in the freebl
30 # shared libraries. 11 # shared libraries.
31-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) 12-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
32+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) 13+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
33 MKSHLIB += -Wl,-Bsymbolic 14 MKSHLIB += -Wl,-Bsymbolic
34 endif 15 endif
35  16
36@@ -472,7 +475,11 @@ else 17@@ -472,7 +472,11 @@ else
37 ifdef NS_USE_GCC 18 ifdef NS_USE_GCC
38 LD = gcc 19 LD = gcc
39 AS = gcc 20 AS = gcc
40+ ifdef CC_IS_CLANG 21+ ifdef CC_IS_CLANG
41+ ASFLAGS = -no-integrated-as 22+ ASFLAGS = -no-integrated-as
42+ else 23+ else
43 ASFLAGS = -x assembler-with-cpp 24 ASFLAGS = -x assembler-with-cpp
44+ endif 25+ endif
45 endif 26 endif
46 ifeq ($(USE_64),1) 27 ifeq ($(USE_64),1)
47 # Solaris for AMD64 28 # Solaris for AMD64