diff options
author | jbeich <jbeich@FreeBSD.org> | 2018-06-07 03:01:51 +0800 |
---|---|---|
committer | jbeich <jbeich@FreeBSD.org> | 2018-06-07 03:01:51 +0800 |
commit | f63a6a1609433db010d625d72a9d922d4800edde (patch) | |
tree | 5d38c7cbce7f17017d04ccff6f7ef21e3c67515f /security | |
parent | 30083e5f4734f38b799d4ea839ce45e9cd896615 (diff) | |
download | freebsd-ports-gnome-f63a6a1609433db010d625d72a9d922d4800edde.tar.gz freebsd-ports-gnome-f63a6a1609433db010d625d72a9d922d4800edde.tar.zst freebsd-ports-gnome-f63a6a1609433db010d625d72a9d922d4800edde.zip |
security/nss: update to 3.37.3
Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.37.3_release_notes
Changes: https://hg.mozilla.org/projects/nss/shortlog/NSS_3_37_3_RTM
ABI: https://abi-laboratory.pro/tracker/timeline/nss/
Diffstat (limited to 'security')
-rw-r--r-- | security/ca_root_nss/Makefile | 2 | ||||
-rw-r--r-- | security/ca_root_nss/distinfo | 6 | ||||
-rw-r--r-- | security/nss/Makefile | 2 | ||||
-rw-r--r-- | security/nss/distinfo | 6 | ||||
-rw-r--r-- | security/nss/files/patch-bug1459739 | 101 |
5 files changed, 8 insertions, 109 deletions
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index 6511510a8d40..62cbe1a9aec9 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.37.1 +VERSION_NSS= 3.37.3 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo index 4e772ac01a45..1aa06dc70d24 100644 --- a/security/ca_root_nss/distinfo +++ b/security/ca_root_nss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526459045 -SHA256 (nss-3.37.1.tar.gz) = 097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405 -SIZE (nss-3.37.1.tar.gz) = 23034142 +TIMESTAMP = 1528192937 +SHA256 (nss-3.37.3.tar.gz) = 9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be +SIZE (nss-3.37.3.tar.gz) = 23034239 diff --git a/security/nss/Makefile b/security/nss/Makefile index 50805c2457c7..c16371cecc44 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.37.1 +PORTVERSION= 3.37.3 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src diff --git a/security/nss/distinfo b/security/nss/distinfo index 4e772ac01a45..1aa06dc70d24 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526459045 -SHA256 (nss-3.37.1.tar.gz) = 097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405 -SIZE (nss-3.37.1.tar.gz) = 23034142 +TIMESTAMP = 1528192937 +SHA256 (nss-3.37.3.tar.gz) = 9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be +SIZE (nss-3.37.3.tar.gz) = 23034239 diff --git a/security/nss/files/patch-bug1459739 b/security/nss/files/patch-bug1459739 deleted file mode 100644 index fd3e3811ca1c..000000000000 --- a/security/nss/files/patch-bug1459739 +++ /dev/null @@ -1,101 +0,0 @@ -commit f54baf1791c6 -Author: Mike Hommey <mh@glandium.org> -Date: Sun May 27 16:20:00 2018 +0200 - - Bug 1432455 - Build FStar.c when not building with int128 support. r=fkiefer ---- - lib/freebl/Makefile | 6 +++++- - lib/freebl/freebl.gyp | 29 +++++++++++++++++------------ - lib/freebl/freebl_base.gypi | 4 +++- - 3 files changed, 25 insertions(+), 14 deletions(-) - -diff --git lib/freebl/Makefile lib/freebl/Makefile -index e6a94d35c4..bff11c7c8e 100644 ---- lib/freebl/Makefile -+++ lib/freebl/Makefile -@@ -535,12 +535,16 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) - # All intel architectures get the 64 bit version - # With custom uint128 if necessary (faster than generic 32 bit version). - ECL_SRCS += curve25519_64.c -- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c -+ VERIFIED_SRCS += Hacl_Curve25519.c - else - # All non intel architectures get the generic 32 bit implementation (slow!) - ECL_SRCS += curve25519_32.c - endif - -+ifndef HAVE_INT128_SUPPORT -+ VERIFIED_SRCS += FStar.c -+endif -+ - ####################################################################### - # (5) Execute "global" rules. (OPTIONAL) # - ####################################################################### -diff --git lib/freebl/freebl.gyp lib/freebl/freebl.gyp -index 3760102ad8..004807483e 100644 ---- lib/freebl/freebl.gyp -+++ lib/freebl/freebl.gyp -@@ -277,18 +277,10 @@ - 'MP_IS_LITTLE_ENDIAN', - ], - }], -- [ 'OS!="win"', { -- 'conditions': [ -- [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { -- 'defines': [ -- # The Makefile does version-tests on GCC, but we're not doing that here. -- 'HAVE_INT128_SUPPORT', -- ], -- }, { -- 'defines': [ -- 'KRML_NOUINT128', -- ], -- }], -+ [ 'have_int128_support==1', { -+ 'defines': [ -+ # The Makefile does version-tests on GCC, but we're not doing that here. -+ 'HAVE_INT128_SUPPORT', - ], - }, { - 'defines': [ -@@ -350,5 +342,18 @@ - }, - 'variables': { - 'module': 'nss', -+ 'conditions': [ -+ [ 'OS!="win"', { -+ 'conditions': [ -+ [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { -+ 'have_int128_support%': 1, -+ }, { -+ 'have_int128_support%': 0, -+ }], -+ ], -+ }, { -+ 'have_int128_support%': 0, -+ }], -+ ], - } - } -diff --git lib/freebl/freebl_base.gypi lib/freebl/freebl_base.gypi -index 850c327c26..1372994f4c 100644 ---- lib/freebl/freebl_base.gypi -+++ lib/freebl/freebl_base.gypi -@@ -60,7 +60,6 @@ - 'shvfy.c', - 'sysrand.c', - 'tlsprfalg.c', -- 'verified/FStar.c', - ], - 'conditions': [ - [ 'OS=="linux" or OS=="android"', { -@@ -220,6 +219,9 @@ - }], - ], - }], -+ [ 'have_int128_support==0', { -+ 'sources': [ 'verified/FStar.c' ], -+ }], - ], - 'ldflags': [ - '-Wl,-Bsymbolic' |