update to 3.13.2

6 files changed, 14 insertions, 45 deletions

diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index a04790b9d798..4ab9bbdd4ec4 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
+MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
 DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -28,10 +28,8 @@ PLIST_SUB+=	CERTDIR=${CERTDIR}
 # !!!  www/apache13-modssl.  Please DO NOT submit patches for    !!!
 # !!!  new versions until they have been committed there first.  !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.13.1
-CKBI_VER=	1.88
+VERSION_NSS=	3.13.2
 VERSION_APACHE=	1.3.41
-NSS_SUFFIX=	.with.ckbi.${CKBI_VER}
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/mozilla/security/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 854c26c5e095..2ea28aa44e45 100644
--- a/security/ca_root_nss/distinfo
+++ b/security/ca_root_nss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nss-3.13.1.with.ckbi.1.88.tar.gz) = 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879
-SIZE (nss-3.13.1.with.ckbi.1.88.tar.gz) = 6065634
+SHA256 (nss-3.13.2.tar.gz) = 92eafdbb62e3071afe71beeaca94c9f33b0b8d11654cbf1797c84aa9f7c1c8e5
+SIZE (nss-3.13.2.tar.gz) = 6082528
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 5b51b96a69e7..8640b2ee444a 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	nss
 PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
-PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
-DISTNAME=	nss-${PORTVERSION}.with.ckbi.${CKBI_VER}
+MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
+DISTNAME=	nss-${PORTVERSION}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
@@ -23,9 +22,7 @@ LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr \
 
 _MAJOR=	3
 _MINOR=	13
-_PATCH=	1
-
-CKBI_VER=	1.88
+_PATCH=	2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
 
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 854c26c5e095..2ea28aa44e45 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nss-3.13.1.with.ckbi.1.88.tar.gz) = 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879
-SIZE (nss-3.13.1.with.ckbi.1.88.tar.gz) = 6065634
+SHA256 (nss-3.13.2.tar.gz) = 92eafdbb62e3071afe71beeaca94c9f33b0b8d11654cbf1797c84aa9f7c1c8e5
+SIZE (nss-3.13.2.tar.gz) = 6082528
diff --git a/security/nss/files/patch-bugzilla-702090 b/security/nss/files/patch-bugzilla-702090
deleted file mode 100644
index 1b7a43db292a..000000000000
--- a/security/nss/files/patch-bugzilla-702090
+++ /dev/null
@@ -1,23 +0,0 @@
-Taken from here:
-https://bug702090.bugzilla.mozilla.org/attachment.cgi?id=575453
-
---- ../../security/nss/lib/util/pkcs11n.h.orig	2011-09-14 10:21:10.000000000 +0900
-+++ ../../security/nss/lib/util/pkcs11n.h	2011-11-19 00:45:01.131860104 +0900
-@@ -346,7 +346,7 @@
-  * labels have never been accurate to what was really implemented.
-  * The new labels correctly reflect what the values effectively mean.
-  */
--#if __GNUC__ > 3
-+#if defined(__GNUC__) && (__GNUC__ > 3)
- /* make GCC warn when we use these #defines */
- /*
-  *  This is really painful because GCC doesn't allow us to mark random
-@@ -362,7 +362,7 @@
-  *  cast the resulting value to the deprecated type in the #define, thus
-  *  producting the warning when the #define is used.
-  */
--#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
-+#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
- /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
-  * is a gcc version issue rather than mac or ppc specific */
- typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
\ No newline at end of file
diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb
index cfd68e7d52f5..7874a3ad9f09 100644
--- a/security/nss/files/patch-sysdb
+++ b/security/nss/files/patch-sysdb
@@ -81,17 +81,14 @@
  
 --- lib/softoken/legacydb/config.mk.orig	2009-08-31 12:39:49.000000000 +0200
 +++ lib/softoken/legacydb/config.mk	2009-08-31 12:40:03.000000000 +0200
-@@ -40,10 +40,6 @@
+@@ -40,7 +40,6 @@
  
- EXTRA_LIBS +=	$(CRYPTOLIB) 
+ EXTRA_LIBS += \
+ 	$(CRYPTOLIB) \
+-	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
+ 	$(NULL)
  
--ifndef NSS_DISABLE_DBM
--EXTRA_LIBS +=	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
--endif
--
  # can't do this in manifest.mn because OS_TARGET isn't defined there.
- ifeq (,$(filter-out WIN%,$(OS_TARGET)))
- 
 --- lib/certdb/xauthkid.c.orig	2009-08-31 12:43:13.000000000 +0200
 +++ lib/certdb/xauthkid.c	2009-08-31 12:44:21.000000000 +0200
 @@ -39,7 +39,7 @@