pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/nss
Module Name: pkgsrc
Committed By: wiz
Date: Sat May 1 21:52:03 UTC 2021
Modified Files:
pkgsrc/devel/nss: Makefile distinfo
pkgsrc/devel/nss/patches: patch-nss_coreconf_NetBSD.mk
patch-nss_coreconf_OpenBSD.mk
Removed Files:
pkgsrc/devel/nss/patches: patch-nss_lib_freebl_blapi.h
patch-nss_lib_freebl_md5.c
patch-nss_lib_freebl_sha-fast-amd64-sun.s
Log Message:
nss: hide symbols on NetBSD like on other platforms
Remove local workarounds again
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 pkgsrc/devel/nss/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/devel/nss/patches/patch-nss_coreconf_OpenBSD.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/nss/patches/patch-nss_lib_freebl_blapi.h \
pkgsrc/devel/nss/patches/patch-nss_lib_freebl_sha-fast-amd64-sun.s
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/nss/patches/patch-nss_lib_freebl_md5.c
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/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.204 pkgsrc/devel/nss/Makefile:1.205
--- pkgsrc/devel/nss/Makefile:1.204 Fri Apr 23 16:07:43 2021
+++ pkgsrc/devel/nss/Makefile Sat May 1 21:52:02 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.204 2021/04/23 16:07:43 rin Exp $
+# $NetBSD: Makefile,v 1.205 2021/05/01 21:52:02 wiz Exp $
DISTNAME= nss-${NSS_RELEASE:S/.0$//}
NSS_RELEASE= 3.64.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel security
MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.128 pkgsrc/devel/nss/distinfo:1.129
--- pkgsrc/devel/nss/distinfo:1.128 Fri Apr 23 16:07:43 2021
+++ pkgsrc/devel/nss/distinfo Sat May 1 21:52:02 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.128 2021/04/23 16:07:43 rin Exp $
+$NetBSD: distinfo,v 1.129 2021/05/01 21:52:02 wiz Exp $
SHA1 (nss-3.64.tar.gz) = e8f7dd8ab325a57a46b1d717c86bdae1be66e911
RMD160 (nss-3.64.tar.gz) = bad3022ebac60e794d999dd7c74092c6b80c39d0
@@ -10,14 +10,11 @@ SHA1 (patch-mf) = 40e58385fb6f944f463bf0
SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
-SHA1 (patch-nss_coreconf_NetBSD.mk) = 61901b8f5d3f5b18b5f52dbb6c43215d425c70e5
-SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754
+SHA1 (patch-nss_coreconf_NetBSD.mk) = 3def6739b8776dcb98ee78f712b0d76192ec29b4
+SHA1 (patch-nss_coreconf_OpenBSD.mk) = 944f71fcaaa7d5b2b3ed008341b1392a65480f2b
SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7
-SHA1 (patch-nss_lib_freebl_blapi.h) = 1fa1acb0a988f71cf4229faa2cc9155a105b6799
SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b
-SHA1 (patch-nss_lib_freebl_md5.c) = 7d0b88710c3bc099f3a76bce8bb95a7538ccf0bc
-SHA1 (patch-nss_lib_freebl_sha-fast-amd64-sun.s) = 11a043550811b19f4c71b67971efe69855cb1071
SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
Index: pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk
diff -u pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk:1.2 pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk:1.3
--- pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk:1.2 Fri Apr 23 16:07:43 2021
+++ pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk Sat May 1 21:52:02 2021
@@ -1,20 +1,81 @@
-$NetBSD: patch-nss_coreconf_NetBSD.mk,v 1.2 2021/04/23 16:07:43 rin Exp $
+$NetBSD: patch-nss_coreconf_NetBSD.mk,v 1.3 2021/05/01 21:52:02 wiz Exp $
+
+Match more closely to OpenBSD.mk, and in particular, hide symbols (MAPFILE).
- fix wrong value of CPU_ARCH on NetBSD/evbarm-earmv7f
- s/aarch64eb/aarch64/
---- nss/coreconf/NetBSD.mk.orig 2021-04-16 01:17:44.000000000 +0900
-+++ nss/coreconf/NetBSD.mk 2021-04-24 00:37:05.764452953 +0900
-@@ -15,6 +15,12 @@
+--- nss/coreconf/NetBSD.mk.orig 2021-04-15 16:17:44.000000000 +0000
++++ nss/coreconf/NetBSD.mk
+@@ -5,9 +5,10 @@
+
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+
+-DEFAULT_COMPILER = gcc
+-CC = gcc
+-CCC = g++
++CC ?= gcc
++CXX ?= g++
++DEFAULT_COMPILER = ${CC}
++CCC = ${CXX}
+ RANLIB = ranlib
+
+ CPU_ARCH := $(shell uname -p)
+@@ -15,16 +16,14 @@ ifeq ($(CPU_ARCH),i386)
OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
endif
+-
+-ifndef OBJECT_FMT
+-OBJECT_FMT := $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
+ifeq (,$(filter-out earm%,$(CPU_ARCH)))
+CPU_ARCH = arm
+endif
+ifeq ($(CPU_ARCH),aarch64eb)
+CPU_ARCH = aarch64
-+endif
+ endif
+
+-ifeq ($(OBJECT_FMT),ELF)
+ DLL_SUFFIX = so
+-else
+-DLL_SUFFIX = so.1.0
+-endif
+
+ OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
+@@ -33,9 +32,16 @@ OS_LIBS = -lcompat
+ ARCH = netbsd
+
+ DSO_CFLAGS = -fPIC -DPIC
+-DSO_LDOPTS = -shared
+-ifeq ($(OBJECT_FMT),ELF)
+-DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
++DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
++
++#
++# The default implementation strategy for NetBSD is pthreads.
++#
++ifndef CLASSIC_NSPR
++USE_PTHREADS = 1
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS += -pthread
++DSO_LDOPTS += -pthread
+ endif
+
+ ifdef LIBRUNPATH
+@@ -44,12 +50,8 @@ endif
+
+ MKSHLIB = $(CC) $(DSO_LDOPTS)
+ ifdef MAPFILE
+-# Add LD options to restrict exported symbols to those in the map file
++ MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+-# Change PROCESS to put the mapfile in the correct format for this platform
+-PROCESS_MAP_FILE = cp $< $@
+-
+-
+-G++INCLUDES = -I/usr/include/g++
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
- ifndef OBJECT_FMT
- OBJECT_FMT := $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
+-INCLUDES += -I/usr/X11R6/include
Index: pkgsrc/devel/nss/patches/patch-nss_coreconf_OpenBSD.mk
diff -u pkgsrc/devel/nss/patches/patch-nss_coreconf_OpenBSD.mk:1.3 pkgsrc/devel/nss/patches/patch-nss_coreconf_OpenBSD.mk:1.4
--- pkgsrc/devel/nss/patches/patch-nss_coreconf_OpenBSD.mk:1.3 Sun May 5 22:47:28 2019
+++ pkgsrc/devel/nss/patches/patch-nss_coreconf_OpenBSD.mk Sat May 1 21:52:02 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-nss_coreconf_OpenBSD.mk,v 1.3 2019/05/05 22:47:28 ryoon Exp $
+$NetBSD: patch-nss_coreconf_OpenBSD.mk,v 1.4 2021/05/01 21:52:02 wiz Exp $
* Use non-versioned libraries for OpenBSD too
---- nss/coreconf/OpenBSD.mk.orig 2016-05-17 07:58:45.000000000 +0000
+--- nss/coreconf/OpenBSD.mk.orig 2021-04-15 16:17:44.000000000 +0000
+++ nss/coreconf/OpenBSD.mk
@@ -24,7 +24,7 @@ OS_LIBS += -pthread
DSO_LDOPTS += -pthread
Home |
Main Index |
Thread Index |
Old Index