tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

proposed mozilla-rootcerts fix



Currently mozilla-rootcerts insists on the certs dir existing.  While it
should, there is currently a bug where uninstalling
mozilla-rootcerts-openssl deletes the certs dir.

This patch causes "mozilla-rootcerts install" to just create the
directory.

I have no idea why this failure case was ever coded, other than just
general precondition-checking paranoia.

jperkin@: OK to commit during freeze?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/mozilla-rootcerts/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile	7 Dec 2019 18:29:31 -0000	1.34
+++ Makefile	27 Mar 2020 17:46:45 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.34 2019/12/07 18:29:31 sevan Exp $
 
 DISTNAME=	mozilla-rootcerts-1.0.${CERTDATA_DATE}
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	-https://hg.mozilla.org/mozilla-central/raw-file/491b05117886ece80b94c88f7107e6e12c1394be/security/nss/lib/ckfw/builtins/certdata.txt
 DISTFILES=	${CERTDATA}
Index: files/mozilla-rootcerts.sh
===================================================================
RCS file: /cvsroot/pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh,v
retrieving revision 1.19
diff -u -p -r1.19 mozilla-rootcerts.sh
--- files/mozilla-rootcerts.sh	6 Jul 2017 00:58:35 -0000	1.19
+++ files/mozilla-rootcerts.sh	27 Mar 2020 17:46:45 -0000
@@ -189,10 +189,11 @@ extract)
 	}'
 	;;
 install)
-	# Insist on e.g. /etc/openssl/certs existing.
+	# ${WHATEVER}/etc/openssl/certs should exist, but an
+	# install/removal cycle of mozilla-rootcerts-openssl might have removed it.
 	if [ ! -d $destdir$certdir ]; then
-		${ECHO} 1>&2 "ERROR: $destdir$certdir does not exist, aborting."
-		exit 1
+		${ECHO} 1>&2 "WARNING: $destdir$certdir does not exist.  Creating it."
+		${MKDIR} -p $destdir$certdir
 	fi
 	cd $destdir$certdir
 	if [ -n "`${LS}`" ]; then


Home | Main Index | Thread Index | Old Index