aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorpgollucci <pgollucci@FreeBSD.org>2010-09-08 09:42:36 +0800
committerpgollucci <pgollucci@FreeBSD.org>2010-09-08 09:42:36 +0800
commit062e3ef03c9bce662688708afccd632e88d9f17f (patch)
treeb91259d8a9a995d7a00547ee431960c35df5bd83 /security
parent7fe520161abf9f7419e45fb11aaf6833b885ed14 (diff)
downloadfreebsd-ports-gnome-062e3ef03c9bce662688708afccd632e88d9f17f.tar.gz
freebsd-ports-gnome-062e3ef03c9bce662688708afccd632e88d9f17f.tar.zst
freebsd-ports-gnome-062e3ef03c9bce662688708afccd632e88d9f17f.zip
- fix file name ca-bundle.crt -> ca-root-nss.crt [1]
- Properly sub VERSION_NSS var [1] - While here, update to 3.12.6 to sync with security/nss PR: ports/143584 [1] Submitted by: Kevin Kobb <kkobb@skylinecorp.com> [1] Approved by: maintainer timeout (brooks ; 209 days) [1]
Diffstat (limited to 'security')
-rw-r--r--security/ca_root_nss/Makefile6
-rw-r--r--security/ca_root_nss/distinfo6
-rw-r--r--security/ca_root_nss/files/patch-ca-bundle.pl15
3 files changed, 16 insertions, 11 deletions
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index 5432f816f11e..efea812ad3de 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -25,7 +25,7 @@ CERTDIR?= share/certs
PLIST_SUB+= CERTDIR=${CERTDIR}
# These versions intend to track security/nss and www/apache13-modssl.
-VERSION_NSS= 3.12.4
+VERSION_NSS= 3.12.6
VERSION_APACHE= 1.3.41
VERSION_MODSSL= 2.8.31
MASTER_SITES_MODSSL= http://www.modssl.org/source/ \
@@ -58,6 +58,10 @@ do-extract:
@${RM} -rf ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
${WRKDIR}/nss-${VERSION_NSS}
+post-patch:
+ @${PERL} -pi -e 's,%%VERSION_NSS%%,${VERSION_NSS},g;' \
+ ${WRKDIR}/ca-bundle.pl
+
do-build:
@${PERL} ${WRKDIR}/ca-bundle.pl < ${WRKDIR}/certdata.txt > \
${WRKDIR}/ca-root-nss.crt
diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo
index 25b3654c054a..de66b8e0a345 100644
--- a/security/ca_root_nss/distinfo
+++ b/security/ca_root_nss/distinfo
@@ -1,6 +1,6 @@
-MD5 (nss-3.12.4.tar.gz) = 1ee3ed9c1900079319bd1de51388d856
-SHA256 (nss-3.12.4.tar.gz) = 8202546524c69ce03e1c3ef5e2956b71b8fa0a5bffdf06568597e7c0d1f83bf0
-SIZE (nss-3.12.4.tar.gz) = 5412877
+MD5 (nss-3.12.6.tar.gz) = da42596665f226de5eb3ecfc1ec57cd1
+SHA256 (nss-3.12.6.tar.gz) = 8f9759be1ce928e82830923fde62a66e270c4645f10a4c176acfccb6021a9795
+SIZE (nss-3.12.6.tar.gz) = 5947630
MD5 (mod_ssl-2.8.31-1.3.41.tar.gz) = 4d55fc5c7cbf38820b44edf767f571c4
SHA256 (mod_ssl-2.8.31-1.3.41.tar.gz) = dc3e7fef57e53a9ab8b1a541d712ea94630ffe5f1d1eb291d5fa19a80c71dd4d
SIZE (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067
diff --git a/security/ca_root_nss/files/patch-ca-bundle.pl b/security/ca_root_nss/files/patch-ca-bundle.pl
index b1341d874de9..92e16a39dcac 100644
--- a/security/ca_root_nss/files/patch-ca-bundle.pl
+++ b/security/ca_root_nss/files/patch-ca-bundle.pl
@@ -1,9 +1,9 @@
-
-$FreeBSD$
-
---- ca-bundle.pl.orig
-+++ ca-bundle.pl
-@@ -3,30 +3,18 @@
+--- ca-bundle.pl.orig 2010-02-05 10:08:58.000000000 -0500
++++ ca-bundle.pl 2010-02-05 10:13:35.000000000 -0500
+@@ -1,32 +1,20 @@
+ ##
+-## ca-bundle.pl -- Regenerate ca-bundle.crt from the Mozilla certdata.txt
++## ca-bundle.pl -- Regenerate ca-root-nss.crt from the Mozilla certdata.txt
##
# configuration
@@ -14,7 +14,8 @@ $FreeBSD$
-$date =~ s/\n$//s;
print <<EOH;
##
- ## ca-bundle.crt -- Bundle of CA Root Certificates
+-## ca-bundle.crt -- Bundle of CA Root Certificates
++## ca-root-nss.crt -- Bundle of CA Root Certificates
##
## This is a bundle of X.509 certificates of public Certificate
## Authorities (CA). These were automatically extracted from Mozilla's