 @@ -1,43 +1,44 @@
-# $NetBSD: Makefile,v 1.26 2017/03/15 18:52:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2017/06/19 00:10:21 gdt Exp $
 DISTNAME=	mozilla-rootcerts-1.0.${CERTDATA_DATE}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	-https://hg.mozilla.org/mozilla-central/raw-file/052b90b5414f/security/nss/lib/ckfw/builtins/certdata.txt
 DISTFILES=	${CERTDATA}
 EXTRACT_SUFX=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://hg.mozilla.org/mozilla-central/log/tip/security/nss/lib/ckfw/builtins/certdata.txt
 COMMENT=	Root CA certificates from the Mozilla Project
 LICENSE=	mpl-2.0
 USE_TOOLS=	awk:run echo:run expr:run ln:run ls:run openssl:run rm:run mkdir:run
 # This must be kept in sync with security/mozilla-rootcerts-openssl
 CERTDATA_DATE=	20170121
 CERTDATA=	certdata-${CERTDATA_DATE}.txt
 WRKSRC=		${WRKDIR}
 DATADIR=	${PREFIX}/share/${PKGBASE}
 # Set paths depending on whether we depend on builtin or pkgsrc openssl.
 CHECK_BUILTIN.openssl=	yes
 .include "../../security/openssl/builtin.mk"
 CHECK_BUILTIN.openssl=	no
 .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
-SSLDIR=		/etc/openssl/certs
+SSLDIR=		/etc/openssl
 .else
-SSLDIR=		${PKG_SYSCONFDIR}/openssl/certs
+SSLDIR=		${PKG_SYSCONFDIR}/openssl
 .endif
 CERT_SCRIPT=		mozilla-rootcerts.sh
 SUBST_CLASSES=		paths
 SUBST_MESSAGE.paths=	Replacing hard-coded paths.
 SUBST_STAGE.paths=	post-configure
 SUBST_FILES.paths=	${CERT_SCRIPT}
 SUBST_VARS.paths=	AWK ECHO EXPR LN LOCALBASE LS RM DATADIR MKDIR SSLDIR
 SUBST_SED.paths=	-e 's,@OPENSSL@,${TOOLS_PATH.openssl},g'
 INSTALLATION_DIRS=	sbin ${DATADIR}

 @@ -1,39 +1,39 @@
 #!/bin/sh
+#
-# $NetBSD: mozilla-rootcerts.sh,v 1.13 2017/03/15 18:52:56 jperkin Exp $
+# $NetBSD: mozilla-rootcerts.sh,v 1.14 2017/06/19 00:10:21 gdt Exp $
+#
 # This script is meant to be used as follows:
+#
 #	# cd /etc/openssl/certs
 #	# mozilla-rootcerts extract
 #	# mozilla-rootcerts rehash
+#
 : ${AWK=@AWK@}
 : ${ECHO=@ECHO@}
 : ${EXPR=@EXPR@}
 : ${LN=@LN@}
 : ${LS=@LS@}
 : ${MKDIR=@MKDIR@}
 : ${OPENSSL=@OPENSSL@}
 : ${SSLDIR=@SSLDIR@}
 : ${RM=@RM@}
 self="@LOCALBASE@/sbin/mozilla-rootcerts"
 certfile="@DATADIR@/certdata.txt"
-certdir="/etc/ssl/certs"
+certdir=${SSLDIR}/certs
 destdir=
-conffile="/etc/openssl/openssl.cnf"
+conffile="@SSLDIR@/openssl.cnf"
 usage()
+{
 	${ECHO} 1>&2 "usage: $self [-d destdir] [-f certfile] extract|rehash|install"
 	exit $1
+}
 while [ $# -gt 0 ]; do
 	case "$1" in
 	-d)	destdir="$2"; shift 2;;
 	-f)	certfile="$2"; shift 2 ;;
 	--)	shift; break ;;
 	-*)	${ECHO} 1>&2 "$self: unknown option -- $1"
 @@ -182,34 +182,34 @@ extract)
 			if (untrusted) {
 				print filename " untrusted"
 				system("rm -f " filename)
+			}
+		}
 	}'
 	;;
 install)
 	if [ `uname -s` = "NetBSD" ]; then
 		# quell warnings for a missing config file
 		touch $destdir$conffile
 	fi
-	if [ ! -d $destdir$SSLDIR ]; then
+	if [ ! -d $destdir$certdir ]; then
-		${ECHO} 1>&2 "ERROR: $destdir$SSLDIR does not exist, aborting."
+		${ECHO} 1>&2 "ERROR: $destdir$certdir does not exist, aborting."
 		exit 1
 	fi
-	cd $destdir$SSLDIR
+	cd $destdir$certdir
 	if [ -n "`${LS}`" ]; then
-		${ECHO} 1>&2 "ERROR: $destdir$SSLDIR already contains certificates, aborting."
+		${ECHO} 1>&2 "ERROR: $destdir$certdir already contains certificates, aborting."
 		exit 1
 	fi
 	set -e
 	$self extract
 	$self rehash
 	set +e
 	if [ -d $destdir$certdir ]; then
 		${ECHO} 1>&2 "ERROR: $destdir$certdir already exists, aborting."
 		exit 1
 	fi
 	set -e
 	$MKDIR $destdir$certdir
-	cat $destdir$SSLDIR/*.pem > $destdir$certdir/ca-certificates.crt
+	cat $destdir$certdir/*.pem > $destdir$certdir/ca-certificates.crt
 esac