Import of pkgsrc-2016Q3

security/mozilla-rootcerts/Makefile

@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.20 2015/09/12 13:06:13 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2016/07/21 12:37:43 wiz Exp $
 
 DISTNAME=	mozilla-rootcerts-1.0.${CERTDATA_DATE}
 CATEGORIES=	security
-MASTER_SITES=	-https://hg.mozilla.org/mozilla-central/raw-file/2f1a37cb43ac/security/nss/lib/ckfw/builtins/certdata.txt
+MASTER_SITES=	-https://hg.mozilla.org/mozilla-central/raw-file/d224fc999cb6/security/nss/lib/ckfw/builtins/certdata.txt
 DISTFILES=	${CERTDATA}
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt
+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=	20150804
+CERTDATA_DATE=	20160610
 CERTDATA=	certdata-${CERTDATA_DATE}.txt
 
 WRKSRC=		${WRKDIR}
-BUILD_DIRS=	# empty
 DATADIR=	${PREFIX}/share/${PKGBASE}
 
 CHECK_BUILTIN.openssl=	yes
@@ -30,22 +29,31 @@ SSLDIR=		/etc/openssl/certs
 SSLDIR=		${PKG_SYSCONFDIR}/openssl/certs
 .endif
 
+CERT_SCRIPT=		mozilla-rootcerts.sh
+
 SUBST_CLASSES=		paths
 SUBST_MESSAGE.paths=	Replacing hard-coded paths.
 SUBST_STAGE.paths=	post-configure
-SUBST_FILES.paths=	mozilla-rootcerts.sh
+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}
 
 do-extract:
-	${CP} ${FILESDIR}/mozilla-rootcerts.sh ${WRKSRC}
+	${CP} ${FILESDIR}/${CERT_SCRIPT} ${WRKSRC}
 	${CP} ${DISTDIR}/${CERTDATA} ${WRKSRC}
 
+do-build:
+	${MKDIR} ${WRKSRC}/certs
+	cd ${WRKSRC}/certs && \
+	${SH} ${WRKSRC}/${CERT_SCRIPT} -f ${WRKSRC}/${CERTDATA} extract
+	${LS} -rt ${WRKSRC}/certs/*.pem | ${XARGS} ${CAT} >${WRKSRC}/cacert.pem
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mozilla-rootcerts.sh \
+	${INSTALL_SCRIPT} ${WRKSRC}/${CERT_SCRIPT} \
 		${DESTDIR}${PREFIX}/sbin/mozilla-rootcerts
 	${INSTALL_DATA} ${WRKSRC}/${CERTDATA} ${DESTDIR}${DATADIR}/certdata.txt
+	${INSTALL_DATA} ${WRKSRC}/cacert.pem ${DESTDIR}${DATADIR}/cacert.pem
 
 .include "../../mk/bsd.pkg.mk"

security/mozilla-rootcerts/PLIST

@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/02/06 10:22:54 tron Exp $
 sbin/mozilla-rootcerts
+share/mozilla-rootcerts/cacert.pem
 share/mozilla-rootcerts/certdata.txt

security/mozilla-rootcerts/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/09/11 20:32:33 tnn Exp $
+$NetBSD: distinfo,v 1.11 2016/07/21 12:37:43 wiz Exp $
 
-SHA1 (certdata-20150804.txt) = 6d7d2f0a4fae587e7431be191a081ac1257d300a
-RMD160 (certdata-20150804.txt) = d174b4ec457289b20f4319300db0a3b65477a318
-Size (certdata-20150804.txt) = 1700182 bytes
+SHA1 (certdata-20160610.txt) = 36aebbcc910dcab8838e6e721523d84f0ed20589
+RMD160 (certdata-20160610.txt) = bcd7338074b038830e33af24809cc3e39d914268
+SHA512 (certdata-20160610.txt) = 0738d677a6ec69a048f76ee69898546ff0dc2dc477c20f11adae574e2b919b9dbb5e1fa99521606ca5c0afae18e12033320e4571b640bd26d8390e2c2c05f6b5
+Size (certdata-20160610.txt) = 1633400 bytes

security/mozilla-rootcerts/files/mozilla-rootcerts.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mozilla-rootcerts.sh,v 1.9 2015/04/18 20:11:35 dholland Exp $
+# $NetBSD: mozilla-rootcerts.sh,v 1.10 2016/03/03 03:02:21 dsainty Exp $
 #
 # This script is meant to be used as follows:
 #
@@ -130,7 +130,10 @@ extract)
 	# The resulting PEM format certificates are saved as
 	# "mozilla-rootcert-<n>.pem" in the current working directory.
 	#
-	cat "$certfile" | ${AWK} -v OPENSSL=${OPENSSL} '
+	# gawk will corrupt the output data stream in multibyte locales,
+	# so force the locale to "C".
+	#
+	cat "$certfile" | LANG=C ${AWK} -v OPENSSL=${OPENSSL} '
 	function base8to10(o,	octal, decimal, power, i, n) {
 		decimal = 0
 		n = split(o, octal, "")