cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to nss 3.21.

Browse Source 
Tested in a bulk and ok ajacoutot@, thanks!
This commit is contained in:
landry 2015-11-23 11:32:12 +00:00
parent cb0c1bc190
commit 5bd2a921a8
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/nss/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.55 2015/10/30 07:59:39 landry Exp $ # $OpenBSD: Makefile,v 1.56 2015/11/23 11:32:12 landry Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT= libraries to support development of security-enabled apps COMMENT= libraries to support development of security-enabled apps
VERSION= 3.20.1 VERSION= 3.21
DISTNAME = nss-${VERSION} DISTNAME = nss-${VERSION}
SO_VERSION= 38.0 SO_VERSION= 39.0
.for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3 .for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
SHARED_LIBS+= ${_lib} ${SO_VERSION} SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor .endfor
@ -29,6 +29,7 @@ WANTLIB += c pthread z nspr4 plc4 plds4 sqlite3>=22
MAKE_ENV= BUILD_OPT=1 \ MAKE_ENV= BUILD_OPT=1 \
LOCALBASE="${LOCALBASE}" \ LOCALBASE="${LOCALBASE}" \
NSS_ENABLE_ECC=1 \ NSS_ENABLE_ECC=1 \
NSS_DISABLE_GTESTS=1 \
NSS_USE_SYSTEM_SQLITE=1 \ NSS_USE_SYSTEM_SQLITE=1 \
SO_VERSION="${SO_VERSION}" \ SO_VERSION="${SO_VERSION}" \
XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \

4
security/nss/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nss-3.20.1.tar.gz) = rTyPEd/ZVwwtBKYUDV73wr3Q/jDWyeVUhyGkJRpejJc= SHA256 (nss-3.21.tar.gz) = P3pbAn183VwOT/dUTaM/3G9WwvjCf/8Ck4/Upvvocjk=
SIZE (nss-3.20.1.tar.gz) = 6958956 SIZE (nss-3.21.tar.gz) = 6978112

8
security/nss/patches/patch-nss_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-nss_Makefile,v 1.1 2013/06/23 18:40:01 landry Exp $ $OpenBSD: patch-nss_Makefile,v 1.2 2015/11/23 11:32:12 landry Exp $
--- nss/Makefile.orig Tue May 28 23:43:24 2013 --- nss/Makefile.orig Mon Nov 9 06:12:59 2015
+++ nss/Makefile Wed Jun 12 22:05:57 2013 +++ nss/Makefile Thu Nov 19 11:54:44 2015
@@ -44,7 +44,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk @@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (7) Execute "local" rules. (OPTIONAL). # # (7) Execute "local" rules. (OPTIONAL). #
####################################################################### #######################################################################

24
security/nss/patches/patch-nss_lib_util_verref_h Normal file
View File

@ -0,0 +1,24 @@
$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