From b5396dac1dce2f558ce5aedc06e856ebe74a5167 Mon Sep 17 00:00:00 2001 From: landry Date: Sun, 12 May 2019 17:58:20 +0000 Subject: [PATCH] Update to nss 3.44, will be a requirement for gecko 68. See https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.44_release_notes Add a patch from FreeBSD via https://bugzilla.mozilla.org/show_bug.cgi?id=1551041 to fix the build on big-endian. thanks to cwen@ for testing on macppc. --- security/nss/Makefile | 6 +++--- security/nss/distinfo | 4 ++-- .../patch-nss_lib_freebl_crypto_primitives_c | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 security/nss/patches/patch-nss_lib_freebl_crypto_primitives_c diff --git a/security/nss/Makefile b/security/nss/Makefile index b891a37fbcd..68b6944f204 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.101 2019/04/22 09:24:22 landry Exp $ +# $OpenBSD: Makefile,v 1.102 2019/05/12 17:58:20 landry Exp $ COMMENT= libraries to support development of security-enabled apps -VERSION= 3.43 +VERSION= 3.44 NSPR_VERSION= 4.19 DISTNAME= nss-${VERSION} -SO_VERSION= 57.0 +SO_VERSION= 57.1 .for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3 SHARED_LIBS+= ${_lib} ${SO_VERSION} .endfor diff --git a/security/nss/distinfo b/security/nss/distinfo index 7155b455f73..ffeffc73670 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.43.tar.gz) = 8wvBtzMIh7dd6f7DfbwXMAF1jcQ/sJX/vEXaxAk/4so= -SIZE (nss-3.43.tar.gz) = 23466026 +SHA256 (nss-3.44.tar.gz) = pWIOWbbu7f1aEskpi1CtkumJiyI+IU62deNvT/tbav8= +SIZE (nss-3.44.tar.gz) = 23474704 diff --git a/security/nss/patches/patch-nss_lib_freebl_crypto_primitives_c b/security/nss/patches/patch-nss_lib_freebl_crypto_primitives_c new file mode 100644 index 00000000000..355e0e81730 --- /dev/null +++ b/security/nss/patches/patch-nss_lib_freebl_crypto_primitives_c @@ -0,0 +1,18 @@ +$OpenBSD: patch-nss_lib_freebl_crypto_primitives_c,v 1.1 2019/05/12 17:58:20 landry Exp $ + +fix build on big endian w/ gcc 4.2 + +https://bugzilla.mozilla.org/show_bug.cgi?id=1551041 + +Index: nss/lib/freebl/crypto_primitives.c +--- nss/lib/freebl/crypto_primitives.c.orig ++++ nss/lib/freebl/crypto_primitives.c +@@ -22,7 +22,7 @@ swap8b(PRUint64 value) + return (value); + } + +-#elif !defined(_MSC_VER) && !__has_builtin(__builtin_bswap64) && !((defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) ++#elif defined(IS_LITTLE_ENDIAN) && !defined(_MSC_VER) && !__has_builtin(__builtin_bswap64) && !((defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) + + PRUint64 + swap8b(PRUint64 x)