Sat Apr 18 20:11:35 2015 UTC ()
Add support for -d destdir to the mozilla-rootcerts installer script.


(dholland)
diff -r1.17 -r1.18 pkgsrc/security/mozilla-rootcerts/Makefile
diff -r1.8 -r1.9 pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh
cvs diff -r1.17 -r1.18 pkgsrc/security/mozilla-rootcerts/Makefile (expand / switch to unified diff)

--- pkgsrc/security/mozilla-rootcerts/Makefile 2015/02/16 13:09:10 1.17
+++ pkgsrc/security/mozilla-rootcerts/Makefile 2015/04/18 20:11:35 1.18
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2015/02/16 13:09:10 tnn Exp $ 1# $NetBSD: Makefile,v 1.18 2015/04/18 20:11:35 dholland Exp $
2 2
3DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE} 3DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE}
 4PKGREVISION= 1
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= -https://hg.mozilla.org/mozilla-central/raw-file/7f6a55544bb3/security/nss/lib/ckfw/builtins/certdata.txt 6MASTER_SITES= -https://hg.mozilla.org/mozilla-central/raw-file/7f6a55544bb3/security/nss/lib/ckfw/builtins/certdata.txt
6DISTFILES= ${CERTDATA} 7DISTFILES= ${CERTDATA}
7EXTRACT_SUFX= # empty 8EXTRACT_SUFX= # empty
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt 11HOMEPAGE= https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt
11COMMENT= Root CA certificates from the Mozilla Project 12COMMENT= Root CA certificates from the Mozilla Project
12LICENSE= mpl-2.0 13LICENSE= mpl-2.0
13 14
14USE_TOOLS= awk:run echo:run expr:run ln:run ls:run openssl:run rm:run mkdir:run 15USE_TOOLS= awk:run echo:run expr:run ln:run ls:run openssl:run rm:run mkdir:run
15 16
16CERTDATA_DATE= 20141117 17CERTDATA_DATE= 20141117
cvs diff -r1.8 -r1.9 pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh (expand / switch to unified diff)

--- pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh 2015/01/27 13:54:10 1.8
+++ pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh 2015/04/18 20:11:35 1.9
@@ -1,46 +1,48 @@ @@ -1,46 +1,48 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: mozilla-rootcerts.sh,v 1.8 2015/01/27 13:54:10 jperkin Exp $ 3# $NetBSD: mozilla-rootcerts.sh,v 1.9 2015/04/18 20:11:35 dholland Exp $
4# 4#
5# This script is meant to be used as follows: 5# This script is meant to be used as follows:
6# 6#
7# # cd /etc/openssl/certs 7# # cd /etc/openssl/certs
8# # mozilla-rootcerts extract 8# # mozilla-rootcerts extract
9# # mozilla-rootcerts rehash 9# # mozilla-rootcerts rehash
10# 10#
11 11
12: ${AWK=@AWK@} 12: ${AWK=@AWK@}
13: ${ECHO=@ECHO@} 13: ${ECHO=@ECHO@}
14: ${EXPR=@EXPR@} 14: ${EXPR=@EXPR@}
15: ${LN=@LN@} 15: ${LN=@LN@}
16: ${LS=@LS@} 16: ${LS=@LS@}
17: ${MKDIR=@MKDIR@} 17: ${MKDIR=@MKDIR@}
18: ${OPENSSL=@OPENSSL@} 18: ${OPENSSL=@OPENSSL@}
19: ${SSLDIR=@SSLDIR@} 19: ${SSLDIR=@SSLDIR@}
20: ${RM=@RM@} 20: ${RM=@RM@}
21 21
22self="@LOCALBASE@/sbin/mozilla-rootcerts" 22self="@LOCALBASE@/sbin/mozilla-rootcerts"
23certfile="@DATADIR@/certdata.txt" 23certfile="@DATADIR@/certdata.txt"
24certdir="/etc/ssl/certs" 24certdir="/etc/ssl/certs"
 25destdir=
25 26
26usage() 27usage()
27{ 28{
28 ${ECHO} 1>&2 "usage: $self [-f certfile] extract|rehash|install" 29 ${ECHO} 1>&2 "usage: $self [-d destdir] [-f certfile] extract|rehash|install"
29 exit $1 30 exit $1
30} 31}
31 32
32while [ $# -gt 0 ]; do 33while [ $# -gt 0 ]; do
33 case "$1" in 34 case "$1" in
 35 -d) destdir="$2"; shift 2;;
34 -f) certfile="$2"; shift 2 ;; 36 -f) certfile="$2"; shift 2 ;;
35 --) shift; break ;; 37 --) shift; break ;;
36 -*) ${ECHO} 1>&2 "$self: unknown option -- $1" 38 -*) ${ECHO} 1>&2 "$self: unknown option -- $1"
37 usage 128 ;; 39 usage 128 ;;
38 *) break ;; 40 *) break ;;
39 esac 41 esac
40done 42done
41 43
42[ $# -eq 1 ] || usage 128 44[ $# -eq 1 ] || usage 128
43 45
44action="$1"; shift 46action="$1"; shift
45 47
46# 48#
@@ -171,34 +173,34 @@ extract) @@ -171,34 +173,34 @@ extract)
171 if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NSS_NOT_TRUSTED$/) 173 if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NSS_NOT_TRUSTED$/)
172 untrusted = 1 174 untrusted = 1
173 if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NETSCAPE_UNTRUSTED$/) 175 if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NETSCAPE_UNTRUSTED$/)
174 untrusted = 1 176 untrusted = 1
175 177
176 if (untrusted) { 178 if (untrusted) {
177 print filename " untrusted" 179 print filename " untrusted"
178 system("rm -f " filename) 180 system("rm -f " filename)
179 } 181 }
180 } 182 }
181 }' 183 }'
182 ;; 184 ;;
183install) 185install)
184 if [ ! -d $SSLDIR ]; then 186 if [ ! -d $destdir$SSLDIR ]; then
185 ${ECHO} 1>&2 "ERROR: $SSLDIR does not exist, aborting." 187 ${ECHO} 1>&2 "ERROR: $destdir$SSLDIR does not exist, aborting."
186 exit 1 188 exit 1
187 fi 189 fi
188 cd $SSLDIR 190 cd $destdir$SSLDIR
189 if [ -n "`${LS}`" ]; then 191 if [ -n "`${LS}`" ]; then
190 ${ECHO} 1>&2 "ERROR: $SSLDIR already contains certificates, aborting." 192 ${ECHO} 1>&2 "ERROR: $destdir$SSLDIR already contains certificates, aborting."
191 exit 1 193 exit 1
192 fi 194 fi
193 set -e 195 set -e
194 $self extract 196 $self extract
195 $self rehash 197 $self rehash
196 set +e 198 set +e
197 if [ -d $certdir ]; then 199 if [ -d $destdir$certdir ]; then
198 ${ECHO} 1>&2 "ERROR: $certdir already exists, aborting." 200 ${ECHO} 1>&2 "ERROR: $destdir$certdir already exists, aborting."
199 exit 1 201 exit 1
200 fi 202 fi
201 set -e 203 set -e
202 $MKDIR $certdir 204 $MKDIR $destdir$certdir
203 cat $SSLDIR/*.pem > $certdir/ca-certificates.crt 205 cat $destdir$SSLDIR/*.pem > $destdir$certdir/ca-certificates.crt
204esac 206esac