diff --git a/security/nss/Makefile b/security/nss/Makefile index c8ed340751bb..3c53472fec68 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -1,123 +1,123 @@ PORTNAME= nss -DISTVERSION= 3.122.1 +DISTVERSION= 3.123 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 WWW= https://firefox-source-docs.mozilla.org/security/nss/index.html LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_powerpc64le= as:devel/binutils LIB_DEPENDS= libnspr4.so:devel/nspr \ libsqlite3.so:databases/sqlite3 TEST_DEPENDS= bash:shells/bash USES= cpe gmake perl5 WRKSRC_SUBDIR= nss USE_LDCONFIG= yes CPE_VENDOR= mozilla CPE_PRODUCT= network_security_services USE_PERL5= build MAKE_ENV= NSPR_LIB_DIR="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ FREEBL_LOWHASH=1 \ NSS_ENABLE_WERROR=0 \ NSS_DISABLE_GTESTS=1 \ NSS_USE_SYSTEM_SQLITE=1 CFLAGS+= -iquote ./mpi -I${LOCALBASE}/include/nspr -Wno-error=unused-function 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 OPTIONS_DEFINE_powerpc= VSX OPTIONS_DEFINE_powerpc64= VSX VSX_CFLAGS= -DUSE_PPC_CRYPTO VSX_DESC= Use VSX optimized routines (POWER8 or newer) TESTING_UNSAFE= Fatal DOMSUF env. variable is not defined .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 ${ARCH} == armv6 MAKE_ENV+= NSS_DISABLE_ARM32_NEON=1 .endif .if ${ARCH} == powerpc64 || ${ARCH} == powerpc EXTRA_PATCHES= ${FILESDIR}/${ARCH}-lib_freebl_scripts_gen.sh USES+= compiler:c++11-lang # -mcrypto -mvsx .if ! ${PORT_OPTIONS:MVSX} MAKE_ENV+= NSS_DISABLE_CRYPTO_VSX=1 .endif .endif .if ${OPSYS} == FreeBSD && ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CC+= -B${LOCALBASE}/bin .endif do-test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ LD_LIBRARY_PATH="${BINS}/lib" \ ${MAKE_ENV} \ bash ./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"||' .if ${ARCH:Mpowerpc*} pre-build: @cd ${WRKSRC}/lib/freebl/scripts && ./gen.sh .endif do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss ${STAGEDIR}${PREFIX}/lib ${FIND} ${DIST}/public/nss -type l \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss \; ${INSTALL_LIB} ${BINS}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ ${STAGEDIR}${PREFIX}/lib/ .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 diff --git a/security/nss/distinfo b/security/nss/distinfo index 52958a0fbc39..d31e4969cc71 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1776190262 -SHA256 (nss-3.122.1.tar.gz) = de5a655da82a67e502b802ae0b53f3eb02ea53f509c3fc0ab54a892e04493bbf -SIZE (nss-3.122.1.tar.gz) = 77656779 +TIMESTAMP = 1776440372 +SHA256 (nss-3.123.tar.gz) = 2145113398a269779a7390515a1638800836b130248e33f93243268c026d4e49 +SIZE (nss-3.123.tar.gz) = 77762089 diff --git a/security/nss/files/patch-lib_softoken_pkcs11c.c b/security/nss/files/patch-lib_softoken_pkcs11c.c deleted file mode 100644 index 5acfe3f87c7b..000000000000 --- a/security/nss/files/patch-lib_softoken_pkcs11c.c +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/softoken/pkcs11c.c.orig 2020-05-01 21:08:55 UTC -+++ lib/softoken/pkcs11c.c -@@ -6106,9 +6106,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) - break; - case NSSLOWKEYDSAKey: - keyType = CKK_DSA; -- crv = (sftk_hasAttribute(key, CKA_NSS_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; -- if (crv != CKR_OK) -- break; - crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType, - sizeof(keyType)); - if (crv != CKR_OK) -@@ -6148,9 +6145,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) - /* what about fortezza??? */ - case NSSLOWKEYECKey: - keyType = CKK_EC; -- crv = (sftk_hasAttribute(key, CKA_NSS_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; -- if (crv != CKR_OK) -- break; - crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType, - sizeof(keyType)); - if (crv != CKR_OK)