CVS commit: pkgsrc/security/mozilla-rootcerts

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar 30 16:38:03 UTC 2020

Modified Files:
        pkgsrc/security/mozilla-rootcerts: Makefile
        pkgsrc/security/mozilla-rootcerts/files: mozilla-rootcerts.sh

Log Message:
mozilla-rootcerts: Cope with missing certs dir

While the certs dir should exist, pkg_delete of
mozilla-rootcerts-openssl currently removes it, despite it not having
been created by the corresponding pkg_add.  Instead of failing if the
directory does not exist, simply emit a warning and create it.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/security/mozilla-rootcerts/Makefile
cvs rdiff -u -r1.19 -r1.20 \
    pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/mozilla-rootcerts/Makefile
diff -u pkgsrc/security/mozilla-rootcerts/Makefile:1.34 pkgsrc/security/mozilla-rootcerts/Makefile:1.35
--- pkgsrc/security/mozilla-rootcerts/Makefile:1.34     Sat Dec  7 18:29:31 2019
+++ pkgsrc/security/mozilla-rootcerts/Makefile  Mon Mar 30 16:38:03 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2019/12/07 18:29:31 sevan Exp $
+# $NetBSD: Makefile,v 1.35 2020/03/30 16:38:03 gdt 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: pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh
diff -u pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.19 pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.20
--- pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.19   Thu Jul  6 00:58:35 2017
+++ pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh        Mon Mar 30 16:38:03 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mozilla-rootcerts.sh,v 1.19 2017/07/06 00:58:35 gdt Exp $
+# $NetBSD: mozilla-rootcerts.sh,v 1.20 2020/03/30 16:38:03 gdt Exp $
 #
 # This script is meant to be used as follows:
 #
@@ -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