Index: branches/2018Q2/security/ca_root_nss/Makefile =================================================================== --- branches/2018Q2/security/ca_root_nss/Makefile (revision 471878) +++ branches/2018Q2/security/ca_root_nss/Makefile (revision 471879) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} CATEGORIES= security MASTER_SITES= MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} MAINTAINER= ports-secteam@FreeBSD.org COMMENT= Root certificate bundle from the Mozilla Project LICENSE= MPL20 OPTIONS_DEFINE= ETCSYMLINK OPTIONS_DEFAULT= ETCSYMLINK OPTIONS_SUB= yes ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem ETCSYMLINK_CONFLICTS_INSTALL= ca-roots-[0-9]* USES= perl5 ssl:build USE_PERL5= build NO_ARCH= yes NO_WRKSUBDIR= yes CERTDIR?= share/certs PLIST_SUB+= CERTDIR=${CERTDIR} # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # !!! These versions are intended to track security/nss. !!! # !!! 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 SUB_FILES= MAca-bundle.pl pkg-message SUB_LIST= VERSION_NSS=${VERSION_NSS} .include do-extract: @${MKDIR} ${WRKDIR} @${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \ ${CERTDATA_TXT_PATH} @${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR} @${RM} -r ${WRKDIR}/nss-${VERSION_NSS} do-build: apply-slist @${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \ ${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKDIR}/certdata.txt > \ ${WRKDIR}/ca-root-nss.crt do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR} ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR} .if ${PORT_OPTIONS:METCSYMLINK} ${MKDIR} ${STAGEDIR}/etc/ssl ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem .endif ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample ${MKDIR} ${STAGEDIR}${PREFIX}/openssl ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample .include Index: branches/2018Q2/security/ca_root_nss/distinfo =================================================================== --- branches/2018Q2/security/ca_root_nss/distinfo (revision 471878) +++ branches/2018Q2/security/ca_root_nss/distinfo (revision 471879) @@ -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 Index: branches/2018Q2/security/nss/Makefile =================================================================== --- branches/2018Q2/security/nss/Makefile (revision 471878) +++ branches/2018Q2/security/nss/Makefile (revision 471879) @@ -1,107 +1,107 @@ # Created by: Maxim Sobolev # $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 MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= zip:archivers/zip \ nspr>=4.12:devel/nspr \ sqlite3>=3.7.15:databases/sqlite3 LIB_DEPENDS= libnspr4.so:devel/nspr \ libsqlite3.so:databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss USES= cpe gmake perl5 CPE_VENDOR= mozilla CPE_PRODUCT= network_security_services USE_PERL5= build MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ FREEBL_LOWHASH=1 \ NSS_DISABLE_GTESTS=1 \ NSS_USE_SYSTEM_SQLITE=1 CFLAGS+= -I${LOCALBASE}/include/nspr SUB_FILES= nss-config nss.pc SUB_LIST= PORTVERSION=${PORTVERSION} DIST= ${WRKSRC:H}/dist EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite INSTALL_BINS= certutil cmsutil crlutil derdump makepqg \ mangle modutil ocspclnt oidcalc p7content p7env p7sign \ p7verify pk12util rsaperf shlibsign signtool signver \ ssltap strsclnt symkeyutil vfychain vfyserv OPTIONS_DEFINE= DEBUG .include .if ! ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= BUILD_OPT=1 BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ .else BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif .if ${OPSYS} == FreeBSD && ${ARCH} == i386 && ! ${MACHINE_CPU:Msse2} USES+= compiler:c++14-lang # gcm.h .endif .if ${OPSYS} == FreeBSD && ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CC+= -B${LOCALBASE}/bin .endif check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ LD_LIBRARY_PATH="${BINS}/lib" \ ${MAKE_ENV} \ ./all.sh @if ${GREP} -Fh '>Failed<' \ ${WRKSRC:H}/tests_results/security/*/results.html; then \ echo "Some tests have failed. Let ${MAINTAINER} know."; \ exit 1; \ else \ echo "All tests succeeded. Good news."; \ fi post-patch: @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ ${FIND} . -name "*.c" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"||' ${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \ ${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|' do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss ${FIND} ${DIST}/public/nss -type l \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \; ${INSTALL_LIB} ${BINS}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/nss ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ ${STAGEDIR}${PREFIX}/lib/nss .for bin in ${INSTALL_BINS} ${INSTALL_PROGRAM} ${BINS}/bin/${bin} \ ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: branches/2018Q2/security/nss/distinfo =================================================================== --- branches/2018Q2/security/nss/distinfo (revision 471878) +++ branches/2018Q2/security/nss/distinfo (revision 471879) @@ -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 Index: branches/2018Q2/security/nss/files/patch-bug1459739 =================================================================== --- branches/2018Q2/security/nss/files/patch-bug1459739 (revision 471878) +++ branches/2018Q2/security/nss/files/patch-bug1459739 (nonexistent) @@ -1,101 +0,0 @@ -commit f54baf1791c6 -Author: Mike Hommey -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' Property changes on: branches/2018Q2/security/nss/files/patch-bug1459739 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 471878) +++ branches/2018Q2 (revision 471879) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r471878