[SVN-Commit] r685 - branches/experimental/security/ca_root_nss branches/experimental/security/nss trunk/security/ca_root_nss trunk/security/nss

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Thu Jan 12 23:49:20 UTC 2012 

Author: flo
Date: Thu Jan 12 23:49:12 2012
New Revision: 685

Log:
- sync nss/ca_root_nss with ports

Modified:
   branches/experimental/security/ca_root_nss/Makefile
   branches/experimental/security/nss/Makefile
   trunk/security/ca_root_nss/Makefile
   trunk/security/ca_root_nss/distinfo
   trunk/security/nss/Makefile
   trunk/security/nss/distinfo

Modified: branches/experimental/security/ca_root_nss/Makefile
==============================================================================
--- branches/experimental/security/ca_root_nss/Makefile	Fri Dec 30 09:14:54 2011	(r684)
+++ branches/experimental/security/ca_root_nss/Makefile	Thu Jan 12 23:49:12 2012	(r685)
@@ -2,7 +2,7 @@
 # Date created:				Thu Jan 25 13:02:14 CST 2007
 # Whom:	      				Brooks Davis <brooks at FreeBSD.org>
 #
-# $FreeBSD: ports/security/ca_root_nss/Makefile,v 1.15 2011/10/08 21:37:44 flo Exp $
+# $FreeBSD: ports/security/ca_root_nss/Makefile,v 1.17 2012/01/12 23:41:00 flo Exp $
 #
 
 PORTNAME=	ca_root_nss

Modified: branches/experimental/security/nss/Makefile
==============================================================================
--- branches/experimental/security/nss/Makefile	Fri Dec 30 09:14:54 2011	(r684)
+++ branches/experimental/security/nss/Makefile	Thu Jan 12 23:49:12 2012	(r685)
@@ -2,7 +2,7 @@
 # Date created:				18 December 2001
 # Whom:					Maxim Sobolev <sobomax at FreeBSD.org>
 #
-# $FreeBSD: ports/security/nss/Makefile,v 1.59 2011/10/07 20:40:40 kwm Exp $
+# $FreeBSD: ports/security/nss/Makefile,v 1.61 2012/01/12 23:41:27 flo Exp $
 #    $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $
 
 PORTNAME=	nss

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile	Fri Dec 30 09:14:54 2011	(r684)
+++ trunk/security/ca_root_nss/Makefile	Thu Jan 12 23:49:12 2012	(r685)
@@ -2,12 +2,11 @@
 # Date created:				Thu Jan 25 13:02:14 CST 2007
 # Whom:	      				Brooks Davis <brooks at FreeBSD.org>
 #
-# $FreeBSD: ports/security/ca_root_nss/Makefile,v 1.15 2011/10/08 21:37:44 flo Exp $
+# $FreeBSD: ports/security/ca_root_nss/Makefile,v 1.17 2012/01/12 23:41:00 flo Exp $
 #
 
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}
-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
@@ -29,8 +28,8 @@
 # !!!  www/apache13-modssl.  Please DO NOT submit patches for    !!!
 # !!!  new versions until they have been committed there first.  !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.12.11
-CKBI_VER=	1.87
+VERSION_NSS=	3.13.1
+CKBI_VER=	1.88
 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

Modified: trunk/security/ca_root_nss/distinfo
==============================================================================
--- trunk/security/ca_root_nss/distinfo	Fri Dec 30 09:14:54 2011	(r684)
+++ trunk/security/ca_root_nss/distinfo	Thu Jan 12 23:49:12 2012	(r685)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.12.11.with.ckbi.1.87.tar.gz) = 4b84a7cd361bf2d14935d0f27681dd148cf3124edf558a271cfde8882f7f7020
-SIZE (nss-3.12.11.with.ckbi.1.87.tar.gz) = 6035595
+SHA256 (nss-3.13.1.with.ckbi.1.88.tar.gz) = 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879
+SIZE (nss-3.13.1.with.ckbi.1.88.tar.gz) = 6065634

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Fri Dec 30 09:14:54 2011	(r684)
+++ trunk/security/nss/Makefile	Thu Jan 12 23:49:12 2012	(r685)
@@ -2,7 +2,7 @@
 # Date created:				18 December 2001
 # Whom:					Maxim Sobolev <sobomax at FreeBSD.org>
 #
-# $FreeBSD: ports/security/nss/Makefile,v 1.59 2011/10/07 20:40:40 kwm Exp $
+# $FreeBSD: ports/security/nss/Makefile,v 1.61 2012/01/12 23:41:27 flo Exp $
 #    $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $
 
 PORTNAME=	nss
@@ -21,10 +21,10 @@
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 _MAJOR=	3
-_MINOR=	12
-_PATCH=	11
+_MINOR=	13
+_PATCH=	1
 
-CKBI_VER=	1.87
+CKBI_VER=	1.88
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
 
@@ -39,9 +39,9 @@
 
 DIST=		${WRKSRC:H:H}/dist
 
-EXTERNALS=	CVS dbm security/nss/cmd/zlib nsprpub security/dbm
+EXTERNALS=	CVS dbm security/nss/lib/zlib nsprpub security/dbm
 EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
-	${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,}
+	${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,}
 
 BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 
@@ -50,10 +50,11 @@
 		p7verify pk12util rsaperf shlibsign signtool signver \
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
-test:
+check regression-test test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
 		    LD_LIBRARY_PATH="${BINS}/lib" \
+		    ${MAKE_ENV}	\
 			./all.sh
 	@if ${GREP} -F '>Failed<'	\
 	    ${WRKSRC:H:H}/tests_results/security/*/results.html; then	\
@@ -81,6 +82,8 @@
 		${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/lib/softoken/manifest.mn
+	${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \
+		${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|'
 
 do-install:
 	${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss

Modified: trunk/security/nss/distinfo
==============================================================================
--- trunk/security/nss/distinfo	Fri Dec 30 09:14:54 2011	(r684)
+++ trunk/security/nss/distinfo	Thu Jan 12 23:49:12 2012	(r685)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.12.11.with.ckbi.1.87.tar.gz) = 4b84a7cd361bf2d14935d0f27681dd148cf3124edf558a271cfde8882f7f7020
-SIZE (nss-3.12.11.with.ckbi.1.87.tar.gz) = 6035595
+SHA256 (nss-3.13.1.with.ckbi.1.88.tar.gz) = 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879
+SIZE (nss-3.13.1.with.ckbi.1.88.tar.gz) = 6065634

More information about the freebsd-gecko mailing list