svn commit: r309970 - in head/security: ca_root_nss nss

[Florian Smeets]

Author: flo
Date: Sat Jan  5 21:34:25 2013
New Revision: 309970
URL: http://svnweb.freebsd.org/changeset/ports/309970

Log:
  Update to 3.14.1.with.ckbi.1.93
  
  This was released to revoke certificates that were used for MITM. For
  details see:
  
  https://blog.mozilla.org/security/2013/01/03/revoking-trust-in-two-turktrust-certficates/

Modified:
  head/security/ca_root_nss/Makefile
  head/security/ca_root_nss/distinfo
  head/security/nss/Makefile
  head/security/nss/distinfo

Modified: head/security/ca_root_nss/Makefile
==============================================================================
--- head/security/ca_root_nss/Makefile	Sat Jan  5 18:01:02 2013	(r309969)
+++ head/security/ca_root_nss/Makefile	Sat Jan  5 21:34:25 2013	(r309970)
@@ -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}_RTM/src
+MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
 DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
 
 MAINTAINER=	gecko at FreeBSD.org
@@ -29,7 +29,9 @@ PLIST_SUB+=	CERTDIR=${CERTDIR}
 # !!!  Please DO NOT submit patches for new version until it has !!!
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.14
+VERSION_NSS=	3.14.1
+CKBI_VER=	1.93
+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
 

Modified: head/security/ca_root_nss/distinfo
==============================================================================
--- head/security/ca_root_nss/distinfo	Sat Jan  5 18:01:02 2013	(r309969)
+++ head/security/ca_root_nss/distinfo	Sat Jan  5 21:34:25 2013	(r309970)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.tar.gz) = b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b
-SIZE (nss-3.14.tar.gz) = 6068755
+SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98
+SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393

Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile	Sat Jan  5 18:01:02 2013	(r309969)
+++ head/security/nss/Makefile	Sat Jan  5 21:34:25 2013	(r309970)
@@ -6,11 +6,11 @@
 #    $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $
 
 PORTNAME=	nss
-PORTVERSION=	${_MAJOR}.${_MINOR} #.${_PATCH}
+PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
-DISTNAME=	nss-${PORTVERSION}
+MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
+DISTNAME=	nss-${PORTVERSION}.with.ckbi.${CKBI_VER}
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
@@ -22,8 +22,9 @@ LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/n
 
 _MAJOR=	3
 _MINOR=	14
-_PATCH=	0
+_PATCH=	1
 
+CKBI_VER=	1.93
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
 
 MAKE_JOBS_UNSAFE=	yes

Modified: head/security/nss/distinfo
==============================================================================
--- head/security/nss/distinfo	Sat Jan  5 18:01:02 2013	(r309969)
+++ head/security/nss/distinfo	Sat Jan  5 21:34:25 2013	(r309970)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.tar.gz) = b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b
-SIZE (nss-3.14.tar.gz) = 6068755
+SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98
+SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393