Wed May 5 16:54:03 2021 UTC ()
nss: add upstream bug report URL


(wiz)
diff -r1.129 -r1.130 pkgsrc/devel/nss/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk
cvs diff -r1.129 -r1.130 pkgsrc/devel/nss/distinfo (switch to unified diff)

--- pkgsrc/devel/nss/distinfo 2021/05/01 21:52:02 1.129
+++ pkgsrc/devel/nss/distinfo 2021/05/05 16:54:02 1.130
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.129 2021/05/01 21:52:02 wiz Exp $ 1$NetBSD: distinfo,v 1.130 2021/05/05 16:54:02 wiz Exp $
2 2
3SHA1 (nss-3.64.tar.gz) = e8f7dd8ab325a57a46b1d717c86bdae1be66e911 3SHA1 (nss-3.64.tar.gz) = e8f7dd8ab325a57a46b1d717c86bdae1be66e911
4RMD160 (nss-3.64.tar.gz) = bad3022ebac60e794d999dd7c74092c6b80c39d0 4RMD160 (nss-3.64.tar.gz) = bad3022ebac60e794d999dd7c74092c6b80c39d0
5SHA512 (nss-3.64.tar.gz) = 0a85e1f64f97670f70596d8a479693939ca454025a4b3bbd557a54ed683ffed625c670fef6a6e3440365af9aa472384f84464942381b1c093659f6a6a222ba04 5SHA512 (nss-3.64.tar.gz) = 0a85e1f64f97670f70596d8a479693939ca454025a4b3bbd557a54ed683ffed625c670fef6a6e3440365af9aa472384f84464942381b1c093659f6a6a222ba04
6Size (nss-3.64.tar.gz) = 82173054 bytes 6Size (nss-3.64.tar.gz) = 82173054 bytes
7SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1 7SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
8SHA1 (patch-me) = ffb5f119764c158c0bd789bd18fc77c61f2e9d2b 8SHA1 (patch-me) = ffb5f119764c158c0bd789bd18fc77c61f2e9d2b
9SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0 9SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0
10SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4 10SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
11SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6 11SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
12SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af 12SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
13SHA1 (patch-nss_coreconf_NetBSD.mk) = 3def6739b8776dcb98ee78f712b0d76192ec29b4 13SHA1 (patch-nss_coreconf_NetBSD.mk) = 176663074ce42719fed33dcaac69a930e3ede301
14SHA1 (patch-nss_coreconf_OpenBSD.mk) = 944f71fcaaa7d5b2b3ed008341b1392a65480f2b 14SHA1 (patch-nss_coreconf_OpenBSD.mk) = 944f71fcaaa7d5b2b3ed008341b1392a65480f2b
15SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74 15SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
16SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7 16SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7
17SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b 17SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b
18SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb 18SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
19SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071 19SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
20SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7 20SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
cvs diff -r1.3 -r1.4 pkgsrc/devel/nss/patches/Attic/patch-nss_coreconf_NetBSD.mk (switch to unified diff)

--- pkgsrc/devel/nss/patches/Attic/patch-nss_coreconf_NetBSD.mk 2021/05/01 21:52:02 1.3
+++ pkgsrc/devel/nss/patches/Attic/patch-nss_coreconf_NetBSD.mk 2021/05/05 16:54:03 1.4
@@ -1,81 +1,83 @@ @@ -1,81 +1,83 @@
1$NetBSD: patch-nss_coreconf_NetBSD.mk,v 1.3 2021/05/01 21:52:02 wiz Exp $ 1$NetBSD: patch-nss_coreconf_NetBSD.mk,v 1.4 2021/05/05 16:54:03 wiz Exp $
2 2
3Match more closely to OpenBSD.mk, and in particular, hide symbols (MAPFILE). 3Match more closely to OpenBSD.mk, and in particular, hide symbols (MAPFILE).
4 4
5- fix wrong value of CPU_ARCH on NetBSD/evbarm-earmv7f 5- fix wrong value of CPU_ARCH on NetBSD/evbarm-earmv7f
6- s/aarch64eb/aarch64/ 6- s/aarch64eb/aarch64/
7 7
 8https://bugzilla.mozilla.org/show_bug.cgi?id=1709654
 9
8--- nss/coreconf/NetBSD.mk.orig 2021-04-15 16:17:44.000000000 +0000 10--- nss/coreconf/NetBSD.mk.orig 2021-04-15 16:17:44.000000000 +0000
9+++ nss/coreconf/NetBSD.mk 11+++ nss/coreconf/NetBSD.mk
10@@ -5,9 +5,10 @@ 12@@ -5,9 +5,10 @@
11  13
12 include $(CORE_DEPTH)/coreconf/UNIX.mk 14 include $(CORE_DEPTH)/coreconf/UNIX.mk
13  15
14-DEFAULT_COMPILER = gcc 16-DEFAULT_COMPILER = gcc
15-CC = gcc 17-CC = gcc
16-CCC = g++ 18-CCC = g++
17+CC ?= gcc 19+CC ?= gcc
18+CXX ?= g++ 20+CXX ?= g++
19+DEFAULT_COMPILER = ${CC} 21+DEFAULT_COMPILER = ${CC}
20+CCC = ${CXX} 22+CCC = ${CXX}
21 RANLIB = ranlib 23 RANLIB = ranlib
22  24
23 CPU_ARCH := $(shell uname -p) 25 CPU_ARCH := $(shell uname -p)
24@@ -15,16 +16,14 @@ ifeq ($(CPU_ARCH),i386) 26@@ -15,16 +16,14 @@ ifeq ($(CPU_ARCH),i386)
25 OS_REL_CFLAGS = -Di386 27 OS_REL_CFLAGS = -Di386
26 CPU_ARCH = x86 28 CPU_ARCH = x86
27 endif 29 endif
28- 30-
29-ifndef OBJECT_FMT 31-ifndef OBJECT_FMT
30-OBJECT_FMT := $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi) 32-OBJECT_FMT := $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
31+ifeq (,$(filter-out earm%,$(CPU_ARCH))) 33+ifeq (,$(filter-out earm%,$(CPU_ARCH)))
32+CPU_ARCH = arm 34+CPU_ARCH = arm
33+endif 35+endif
34+ifeq ($(CPU_ARCH),aarch64eb) 36+ifeq ($(CPU_ARCH),aarch64eb)
35+CPU_ARCH = aarch64 37+CPU_ARCH = aarch64
36 endif 38 endif
37  39
38-ifeq ($(OBJECT_FMT),ELF) 40-ifeq ($(OBJECT_FMT),ELF)
39 DLL_SUFFIX = so 41 DLL_SUFFIX = so
40-else 42-else
41-DLL_SUFFIX = so.1.0 43-DLL_SUFFIX = so.1.0
42-endif 44-endif
43  45
44 OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK 46 OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
45  47
46@@ -33,9 +32,16 @@ OS_LIBS = -lcompat 48@@ -33,9 +32,16 @@ OS_LIBS = -lcompat
47 ARCH = netbsd 49 ARCH = netbsd
48  50
49 DSO_CFLAGS = -fPIC -DPIC 51 DSO_CFLAGS = -fPIC -DPIC
50-DSO_LDOPTS = -shared 52-DSO_LDOPTS = -shared
51-ifeq ($(OBJECT_FMT),ELF) 53-ifeq ($(OBJECT_FMT),ELF)
52-DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) 54-DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
53+DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) 55+DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
54+ 56+
55+# 57+#
56+# The default implementation strategy for NetBSD is pthreads. 58+# The default implementation strategy for NetBSD is pthreads.
57+# 59+#
58+ifndef CLASSIC_NSPR 60+ifndef CLASSIC_NSPR
59+USE_PTHREADS = 1 61+USE_PTHREADS = 1
60+DEFINES += -D_THREAD_SAFE -D_REENTRANT 62+DEFINES += -D_THREAD_SAFE -D_REENTRANT
61+OS_LIBS += -pthread 63+OS_LIBS += -pthread
62+DSO_LDOPTS += -pthread 64+DSO_LDOPTS += -pthread
63 endif 65 endif
64  66
65 ifdef LIBRUNPATH 67 ifdef LIBRUNPATH
66@@ -44,12 +50,8 @@ endif 68@@ -44,12 +50,8 @@ endif
67  69
68 MKSHLIB = $(CC) $(DSO_LDOPTS) 70 MKSHLIB = $(CC) $(DSO_LDOPTS)
69 ifdef MAPFILE 71 ifdef MAPFILE
70-# Add LD options to restrict exported symbols to those in the map file 72-# Add LD options to restrict exported symbols to those in the map file
71+ MKSHLIB += -Wl,--version-script,$(MAPFILE) 73+ MKSHLIB += -Wl,--version-script,$(MAPFILE)
72 endif 74 endif
73-# Change PROCESS to put the mapfile in the correct format for this platform 75-# Change PROCESS to put the mapfile in the correct format for this platform
74-PROCESS_MAP_FILE = cp $< $@ 76-PROCESS_MAP_FILE = cp $< $@
75- 77-
76- 78-
77-G++INCLUDES = -I/usr/include/g++ 79-G++INCLUDES = -I/usr/include/g++
78+PROCESS_MAP_FILE = grep -v ';-' $< | \ 80+PROCESS_MAP_FILE = grep -v ';-' $< | \
79+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ 81+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
80  82
81-INCLUDES += -I/usr/X11R6/include 83-INCLUDES += -I/usr/X11R6/include