diff options
| author | wiz <wiz> | 2009-11-03 02:43:55 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-11-03 02:43:55 +0000 |
| commit | 25dce1c3dd61927d84eb8c206fc631441eec532a (patch) | |
| tree | f6c1a796ce92d7b44c85a03f763a96d9777f9a85 | |
| parent | 2f2880ed89a8482a6d56cdf9bdd69f1a5b1210dd (diff) | |
| download | pkgsrc-25dce1c3dd61927d84eb8c206fc631441eec532a.tar.gz | |
Simplify awk usage to make it work with nawk, from Matthias Pfaller in
PR 42238.
While here, update to latest certificates from mozilla.
| -rw-r--r-- | security/mozilla-rootcerts/Makefile | 4 | ||||
| -rw-r--r-- | security/mozilla-rootcerts/distinfo | 8 | ||||
| -rw-r--r-- | security/mozilla-rootcerts/files/mozilla-rootcerts.sh | 13 |
3 files changed, 8 insertions, 17 deletions
diff --git a/security/mozilla-rootcerts/Makefile b/security/mozilla-rootcerts/Makefile index 0ad3758e963..11cfdac9f79 100644 --- a/security/mozilla-rootcerts/Makefile +++ b/security/mozilla-rootcerts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/06/22 23:05:00 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2009/11/03 02:43:55 wiz Exp $ DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE} CATEGORIES= security @@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS= awk:run echo:run expr:run ln:run ls:run openssl:run rm:run -CERTDATA_DATE= 20070713 +CERTDATA_DATE= 20090831 CERTDATA= certdata-${CERTDATA_DATE}.txt WRKSRC= ${WRKDIR} diff --git a/security/mozilla-rootcerts/distinfo b/security/mozilla-rootcerts/distinfo index f81e78032c5..fb9a9ff1933 100644 --- a/security/mozilla-rootcerts/distinfo +++ b/security/mozilla-rootcerts/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/09/20 20:02:53 jlam Exp $ +$NetBSD: distinfo,v 1.2 2009/11/03 02:43:55 wiz Exp $ -SHA1 (certdata-20070713.txt) = 2f07092e7bceb4354f9255a8455d46671831b2be -RMD160 (certdata-20070713.txt) = c665e7265fb7fc2a04bc4405d4d650f8ff1c182e -Size (certdata-20070713.txt) = 793526 bytes +SHA1 (certdata-20090831.txt) = 59b7c651a8de466998a230e7f8afc6bd71d1e9b6 +RMD160 (certdata-20090831.txt) = 72cb87687f74c05efd5ce7bb09b29561a272a1e6 +Size (certdata-20090831.txt) = 1071095 bytes diff --git a/security/mozilla-rootcerts/files/mozilla-rootcerts.sh b/security/mozilla-rootcerts/files/mozilla-rootcerts.sh index 84ec5ea318c..e2fc6b2516b 100644 --- a/security/mozilla-rootcerts/files/mozilla-rootcerts.sh +++ b/security/mozilla-rootcerts/files/mozilla-rootcerts.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mozilla-rootcerts.sh,v 1.1.1.1 2007/09/20 20:02:53 jlam Exp $ +# $NetBSD: mozilla-rootcerts.sh,v 1.2 2009/11/03 02:43:56 wiz Exp $ # # This script is meant to be used as follows: # @@ -126,13 +126,6 @@ extract) # "mozilla-rootcert-<n>.pem" in the current working directory. # cat "$certfile" | ${AWK} -v OPENSSL=${OPENSSL} ' - function join(array, start, end, separator, result, i) { - result = array[start] - for (i = start + 1; i <= end; i++) - result = result separator array[i] - return result - } - function base8to10(o, octal, decimal, power, i, n) { decimal = 0 n = split(o, octal, "") @@ -149,7 +142,6 @@ extract) BEGIN { filenum = 0 while (getline) { - D = 0 if ($0 !~ /^CKA_VALUE MULTILINE_OCTAL/) continue filename = "mozilla-rootcert-" filenum ".pem" @@ -160,10 +152,9 @@ extract) if ($0 ~ /^END/) break n = split($0, line, "\\") for (i = 2; i <= n; i++) { - der[D++] = sprintf("%c", base8to10(line[i])) + printf("%c", base8to10(line[i])) | cmd } } - printf("%s", join(der, 0, D, "")) | cmd close(cmd) } }' |