diff options
| -rw-r--r-- | security/ca_root_nss/Makefile | 2 | ||||
| -rw-r--r-- | security/ca_root_nss/distinfo | 4 | ||||
| -rw-r--r-- | security/nss/Makefile | 9 | ||||
| -rw-r--r-- | security/nss/distinfo | 4 | ||||
| -rw-r--r-- | security/nss/files/patch-bug856300 | 11 | ||||
| -rw-r--r-- | security/nss/files/patch-bug963150 | 30 |
6 files changed, 10 insertions, 50 deletions
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index f23d4d80bb0c..451052a95c39 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -24,7 +24,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.16.1 +VERSION_NSS= 3.16.3 #NSS_SUFFIX= .with.ckbi.1.93 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 df400028fccf..987f13b8113b 100644 --- a/security/ca_root_nss/distinfo +++ b/security/ca_root_nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.16.1.tar.gz) = fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e -SIZE (nss-3.16.1.tar.gz) = 6409506 +SHA256 (nss-3.16.3.tar.gz) = 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60 +SIZE (nss-3.16.3.tar.gz) = 6426732 diff --git a/security/nss/Makefile b/security/nss/Makefile index 2dbdc6c2a9ad..9c1c5effa432 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.16.1 -PORTREVISION= 2 +PORTVERSION= 3.16.3 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src @@ -12,7 +11,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - nspr>=4.10.3:${PORTSDIR}/devel/nspr \ + nspr>=4.10.5:${PORTSDIR}/devel/nspr \ sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3 LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 @@ -21,7 +20,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss -USES= gmake perl5 +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" \ diff --git a/security/nss/distinfo b/security/nss/distinfo index df400028fccf..987f13b8113b 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.16.1.tar.gz) = fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e -SIZE (nss-3.16.1.tar.gz) = 6409506 +SHA256 (nss-3.16.3.tar.gz) = 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60 +SIZE (nss-3.16.3.tar.gz) = 6426732 diff --git a/security/nss/files/patch-bug856300 b/security/nss/files/patch-bug856300 deleted file mode 100644 index 7653f0fd6b4b..000000000000 --- a/security/nss/files/patch-bug856300 +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/freebl/Makefile~ -+++ lib/freebl/Makefile -@@ -659,7 +659,7 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( - # symbolic names to registers, for example, - # .set Htbl, %rdi - # So we can't use Clang's integrated assembler with intel-gcm.s. --ifneq (,$(findstring clang,$(AS))) -+ifneq (,$(findstring clang,$(shell $(AS) -v 2>&1))) - $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as - endif - endif diff --git a/security/nss/files/patch-bug963150 b/security/nss/files/patch-bug963150 deleted file mode 100644 index 84fed1912dce..000000000000 --- a/security/nss/files/patch-bug963150 +++ /dev/null @@ -1,30 +0,0 @@ -diff --git lib/pk11wrap/pk11cert.c lib/pk11wrap/pk11cert.c ---- lib/pk11wrap/pk11cert.c -+++ lib/pk11wrap/pk11cert.c -@@ -976,18 +976,25 @@ PK11_ImportCert(PK11SlotInfo *slot, CERT - cert->istemp = PR_FALSE; - cert->isperm = PR_TRUE; - } - - /* add the new instance to the cert, force an update of the - * CERTCertificate, and finish - */ - nssPKIObject_AddInstance(&c->object, certobj); -+ /* nssTrustDomain_AddCertsToCache may release a reference to 'c' and -+ * replace 'c' by a different value. So we add a reference to 'c' to -+ * prevent 'c' from being destroyed. */ -+ nssCertificate_AddRef(c); - nssTrustDomain_AddCertsToCache(STAN_GetDefaultTrustDomain(), &c, 1); -+ /* XXX should we pass the original value of 'c' to -+ * STAN_ForceCERTCertificateUpdate? */ - (void)STAN_ForceCERTCertificateUpdate(c); -+ nssCertificate_Destroy(c); - SECITEM_FreeItem(keyID,PR_TRUE); - return SECSuccess; - loser: - CERT_MapStanError(); - SECITEM_FreeItem(keyID,PR_TRUE); - if (PORT_GetError() != SEC_ERROR_TOKEN_NOT_LOGGED_IN) { - PORT_SetError(SEC_ERROR_ADDING_CERT); - } - |