Update to 3.16.3

Add cpe informations

Submitted by:	Jan Beich

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

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

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" \

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

security/nss/files/patch-bug856300

@@ -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

security/nss/files/patch-bug963150

@@ -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);
-     }
-