Update to nss 3.24, requirement of firefox 48.

- Remove patch-nss_lib_util_verref_h, merged upstream (#1226179)
- Remove useless patch-nss_coreconf_UNIX_mk, our -O2 takes precedence
- Remove chunk of patch-nss_coreconf_OpenBSD_mk, was merged upstream in
  #1250891. While here remove the addition of -Wl,Bsymbolic to MKSHLIB
which was here since forever for no justified reason.
This commit is contained in:
landry 2016-06-14 14:48:51 +00:00
parent 954a1f016c
commit 7a3e950865
6 changed files with 13 additions and 60 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.62 2016/03/16 16:46:33 naddy Exp $
# $OpenBSD: Makefile,v 1.63 2016/06/14 14:48:51 landry Exp $
COMMENT= libraries to support development of security-enabled apps
VERSION= 3.23
VERSION= 3.24
DISTNAME= nss-${VERSION}
SO_VERSION= 40.0
SO_VERSION= 41.0
.for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor

View File

@ -1,2 +1,2 @@
SHA256 (nss-3.23.tar.gz) = lLOD4xyWcenfzKgQhKioE4F+jwWlf1RTNQmzGNJuEc8=
SIZE (nss-3.23.tar.gz) = 7467001
SHA256 (nss-3.24.tar.gz) = LwhBSS+RzKRztz3sbKuc92WkheAy1I0uiucmHlTEGe0=
SIZE (nss-3.24.tar.gz) = 7307782

View File

@ -1,25 +1,12 @@
$OpenBSD: patch-nss_coreconf_OpenBSD_mk,v 1.2 2016/03/04 16:29:24 landry Exp $
Remove -ansi: https://bugzilla.mozilla.org/show_bug.cgi?id=1250891
--- nss/coreconf/OpenBSD.mk.orig Fri Feb 26 21:51:11 2016
+++ nss/coreconf/OpenBSD.mk Thu Mar 3 11:15:41 2016
@@ -24,9 +24,9 @@ OS_LIBS += -pthread
$OpenBSD: patch-nss_coreconf_OpenBSD_mk,v 1.3 2016/06/14 14:48:51 landry Exp $
--- nss/coreconf/OpenBSD.mk.orig Wed Jun 8 22:10:01 2016
+++ nss/coreconf/OpenBSD.mk Wed Jun 8 22:10:16 2016
@@ -24,7 +24,7 @@ OS_LIBS += -pthread
DSO_LDOPTS += -pthread
endif
-DLL_SUFFIX = so.1.0
+DLL_SUFFIX = so.${SO_VERSION}
-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DOPENBSD
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DOPENBSD
OS_LIBS =
@@ -35,7 +35,7 @@ ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
USE_SYSTEM_ZLIB = 1
ZLIB_LIBS = -lz

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-nss_coreconf_UNIX_mk,v 1.1 2013/06/23 18:40:01 landry Exp $
--- nss/coreconf/UNIX.mk.orig Tue May 28 23:43:24 2013
+++ nss/coreconf/UNIX.mk Wed Jun 12 22:01:11 2013
@@ -10,7 +10,7 @@ AR = ar cr $@
LDOPTS += -L$(SOURCE_LIB_DIR)
ifdef BUILD_OPT
- OPTIMIZER += -O
+ OPTIMIZER +=
DEFINES += -UDEBUG -DNDEBUG
else
OPTIMIZER += -g

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-nss_lib_util_verref_h,v 1.1 2015/11/23 11:32:12 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=1226179
#pragma GCC diagnostic was added in gcc 4.6
--- nss/lib/util/verref.h.orig Mon Nov 9 06:12:59 2015
+++ nss/lib/util/verref.h Fri Nov 20 08:50:21 2015
@@ -18,7 +18,7 @@
#pragma warning(disable: 4101)
#endif
/* This works for both gcc and clang */
-#if defined(__GNUC__) && !defined(NSS_NO_GCC48)
+#if defined(__GNUC__) && !defined(NSS_NO_GCC48) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
@@ -35,6 +35,6 @@
#ifdef _MSC_VER
#pragma warning(pop)
#endif
-#if defined(__GNUC__) && !defined(NSS_NO_GCC48)
+#if defined(__GNUC__) && !defined(NSS_NO_GCC48) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic pop
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2014/09/29 08:52:31 landry Exp $
@comment $OpenBSD: PLIST,v 1.9 2016/06/14 14:48:51 landry Exp $
@bin bin/certutil
@bin bin/cmsutil
@bin bin/crlutil
@ -33,6 +33,8 @@ include/nss/key.h
include/nss/keyhi.h
include/nss/keyt.h
include/nss/keythi.h
include/nss/lowkeyi.h
include/nss/lowkeyti.h
include/nss/nss.h
include/nss/nssb64.h
include/nss/nssb64t.h