Tue Jun 2 22:32:02 2020 UTC ()
mozilla-rootcerts: Ensure script uses correct SH.


(jperkin)
diff -r1.37 -r1.38 pkgsrc/security/mozilla-rootcerts/Makefile
diff -r1.20 -r1.21 pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh
cvs diff -r1.37 -r1.38 pkgsrc/security/mozilla-rootcerts/Makefile (expand / switch to unified diff)

--- pkgsrc/security/mozilla-rootcerts/Makefile 2020/05/30 22:39:08 1.37
+++ pkgsrc/security/mozilla-rootcerts/Makefile 2020/06/02 22:32:02 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2020/05/30 22:39:08 tnn Exp $ 1# $NetBSD: Makefile,v 1.38 2020/06/02 22:32:02 jperkin Exp $
2 2
3DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE} 3DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE}
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= -https://hg.mozilla.org/mozilla-central/raw-file/4f0b2cc28b1482e285bcfceec472a568f3843299/security/nss/lib/ckfw/builtins/certdata.txt 5MASTER_SITES= -https://hg.mozilla.org/mozilla-central/raw-file/4f0b2cc28b1482e285bcfceec472a568f3843299/security/nss/lib/ckfw/builtins/certdata.txt
6EXTRACT_SUFX= # empty 6EXTRACT_SUFX= # empty
7DISTFILES= ${CERTDATA} 7DISTFILES= ${CERTDATA}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://hg.mozilla.org/mozilla-central/log/tip/security/nss/lib/ckfw/builtins/certdata.txt 10HOMEPAGE= https://hg.mozilla.org/mozilla-central/log/tip/security/nss/lib/ckfw/builtins/certdata.txt
11COMMENT= Root CA certificates from the Mozilla Project 11COMMENT= Root CA certificates from the Mozilla Project
12LICENSE= mpl-2.0 12LICENSE= mpl-2.0
13 13
14USE_TOOLS= awk:run echo:run expr:run ln:run ls:run openssl:run rm:run mkdir:run 14USE_TOOLS= awk:run echo:run expr:run ln:run ls:run openssl:run rm:run mkdir:run
@@ -29,27 +29,27 @@ CHECK_BUILTIN.openssl= yes @@ -29,27 +29,27 @@ CHECK_BUILTIN.openssl= yes
29CHECK_BUILTIN.openssl= no 29CHECK_BUILTIN.openssl= no
30.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) 30.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
31SSLDIR= /etc/openssl 31SSLDIR= /etc/openssl
32.else 32.else
33SSLDIR= ${PKG_SYSCONFDIR}/openssl 33SSLDIR= ${PKG_SYSCONFDIR}/openssl
34.endif 34.endif
35 35
36CERT_SCRIPT= mozilla-rootcerts.sh 36CERT_SCRIPT= mozilla-rootcerts.sh
37 37
38SUBST_CLASSES= paths 38SUBST_CLASSES= paths
39SUBST_MESSAGE.paths= Replacing hard-coded paths. 39SUBST_MESSAGE.paths= Replacing hard-coded paths.
40SUBST_STAGE.paths= post-configure 40SUBST_STAGE.paths= post-configure
41SUBST_FILES.paths= ${CERT_SCRIPT} 41SUBST_FILES.paths= ${CERT_SCRIPT}
42SUBST_VARS.paths= AWK DATADIR ECHO EXPR LN LS MKDIR PREFIX SSLDIR RM 42SUBST_VARS.paths= AWK DATADIR ECHO EXPR LN LS MKDIR PREFIX RM SH SSLDIR
43SUBST_SED.paths= -e 's,@OPENSSL@,${TOOLS_PATH.openssl},g' 43SUBST_SED.paths= -e 's,@OPENSSL@,${TOOLS_PATH.openssl},g'
44 44
45INSTALLATION_DIRS= sbin ${DATADIR} 45INSTALLATION_DIRS= sbin ${DATADIR}
46 46
47do-extract: 47do-extract:
48 ${CP} ${FILESDIR}/${CERT_SCRIPT} ${WRKSRC} 48 ${CP} ${FILESDIR}/${CERT_SCRIPT} ${WRKSRC}
49 ${CP} ${DISTDIR}/${CERTDATA} ${WRKSRC}/certdata.txt 49 ${CP} ${DISTDIR}/${CERTDATA} ${WRKSRC}/certdata.txt
50 50
51do-build: 51do-build:
52 ${MKDIR} ${WRKSRC}/certs 52 ${MKDIR} ${WRKSRC}/certs
53 cd ${WRKSRC}/certs && \ 53 cd ${WRKSRC}/certs && \
54 ${SH} ${WRKSRC}/${CERT_SCRIPT} -f ${WRKSRC}/certdata.txt extract 54 ${SH} ${WRKSRC}/${CERT_SCRIPT} -f ${WRKSRC}/certdata.txt extract
55 ${LS} -rt ${WRKSRC}/certs/*.pem | ${XARGS} ${CAT} >${WRKSRC}/cacert.pem 55 ${LS} -rt ${WRKSRC}/certs/*.pem | ${XARGS} ${CAT} >${WRKSRC}/cacert.pem
cvs diff -r1.20 -r1.21 pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh (expand / switch to unified diff)

--- pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh 2020/03/30 16:38:03 1.20
+++ pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh 2020/06/02 22:32:02 1.21
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!@SH@
2# 2#
3# $NetBSD: mozilla-rootcerts.sh,v 1.20 2020/03/30 16:38:03 gdt Exp $ 3# $NetBSD: mozilla-rootcerts.sh,v 1.21 2020/06/02 22:32:02 jperkin 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: ${DATADIR=@DATADIR@} 13: ${DATADIR=@DATADIR@}
14: ${ECHO=@ECHO@} 14: ${ECHO=@ECHO@}
15: ${EXPR=@EXPR@} 15: ${EXPR=@EXPR@}
16: ${LN=@LN@} 16: ${LN=@LN@}