Update security/nss and security/ca_root_nss to 3.17.1. Manual merge

because these ports have very complex revision history interleaved with
other Mozilla ports.

Approved by:	ports-secteam
Security:	CVE-2014-1544
Security:	48108fb0-751c-4cbb-8f33-09239ead4b55.html

6 files changed, 19 insertions, 29 deletions

diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index f23d4d80bb0c..00a1e815044c 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -14,6 +14,7 @@ ETCSYMLINK_DESC=	Add symlink to /etc/ssl/cert.pem
 
 USES=		perl5
 USE_PERL5=	build
+NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 CERTDIR?=	share/certs
@@ -24,7 +25,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.17.1
 #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..f10d11f4c10f 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.17.1.tar.gz) = 0e210afba7cd1e033a08f61fcd1f466639649fc413e72aa050f3d52c19376e5f
+SIZE (nss-3.17.1.tar.gz) = 6927105
diff --git a/security/ca_root_nss/pkg-plist b/security/ca_root_nss/pkg-plist
index 796c14f82541..684e1fd864c4 100644
--- a/security/ca_root_nss/pkg-plist
+++ b/security/ca_root_nss/pkg-plist
@@ -1,4 +1,2 @@
 %%CERTDIR%%/ca-root-nss.crt
-@dirrmtry %%CERTDIR%%
-%%ETCSYMLINK%%@cwd /
-%%ETCSYMLINK%%etc/ssl/cert.pem
+%%ETCSYMLINK%%/etc/ssl/cert.pem
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 3337fc6861ae..0d1670747ad1 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -2,9 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.16.1
-PORTREVISION=	1
-#DISTVERSIONSUFFIX=	.with.ckbi.1.93
+PORTVERSION=	3.17.1
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 
@@ -12,7 +10,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 +19,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" \
@@ -40,15 +40,17 @@ INSTALL_BINS=	certcgi certutil checkcert cmsutil crlutil derdump makepqg \
 		p7verify pk12util rsaperf shlibsign signtool signver \
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
-.if !defined(WITH_DEBUG)
+OPTIONS_DEFINE=	DEBUG
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MDEBUG}
 MAKE_ENV+=	BUILD_OPT=1
 BINS=		${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 .else
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == amd64
 USE_BINUTILS=	# intel-gcm.s
 CFLAGS+=	-B${LOCALBASE}/bin
@@ -81,7 +83,7 @@ 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_DATA} ${BINS}/lib/*.so.1 \
+	${INSTALL_LIB} ${BINS}/lib/*.so.1 \
 		${STAGEDIR}${PREFIX}/lib/nss
 	${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
 	    	${STAGEDIR}${PREFIX}/lib/nss
@@ -94,4 +96,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/nss/distinfo b/security/nss/distinfo
index df400028fccf..f10d11f4c10f 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.17.1.tar.gz) = 0e210afba7cd1e033a08f61fcd1f466639649fc413e72aa050f3d52c19376e5f
+SIZE (nss-3.17.1.tar.gz) = 6927105
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