CVS commit: pkgsrc/security/mozilla-rootcerts

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Nov 27 16:18:35 UTC 2020

Modified Files:
        pkgsrc/security/mozilla-rootcerts: DESCR Makefile PLIST
Added Files:
        pkgsrc/security/mozilla-rootcerts/files: gnupg2
Removed Files:
        pkgsrc/security/mozilla-rootcerts: MESSAGE

Log Message:
mozilla-rootcerts: Move MESSAGE content into documentation

Drop MESSAGE content pointing out mozilla-rootcerts-openssl that is
duplicative with DESCR.

Move MESSAGE content about installation for gnupg2 into a
documentation file; this is simply normal documentation about how to
use an installed package.  Mention this documentation in DESCR, so
that prospective users get the right sense of what the package can do.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/mozilla-rootcerts/DESCR
cvs rdiff -u -r1.5 -r0 pkgsrc/security/mozilla-rootcerts/MESSAGE
cvs rdiff -u -r1.39 -r1.40 pkgsrc/security/mozilla-rootcerts/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/mozilla-rootcerts/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/security/mozilla-rootcerts/files/gnupg2

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/DESCR
diff -u pkgsrc/security/mozilla-rootcerts/DESCR:1.6 pkgsrc/security/mozilla-rootcerts/DESCR:1.7
--- pkgsrc/security/mozilla-rootcerts/DESCR:1.6 Fri Jun 12 10:37:18 2020
+++ pkgsrc/security/mozilla-rootcerts/DESCR     Fri Nov 27 16:18:35 2020
@@ -13,3 +13,6 @@ usable by SSL/TLS implementations.
 
 Use the 'mozilla-rootcerts install' script or mozilla-rootcerts-openssl
 package if you want to use these certificates.
+
+This package includes instructions for configuring gnupg2 to use the
+certificates.

Index: pkgsrc/security/mozilla-rootcerts/Makefile
diff -u pkgsrc/security/mozilla-rootcerts/Makefile:1.39 pkgsrc/security/mozilla-rootcerts/Makefile:1.40
--- pkgsrc/security/mozilla-rootcerts/Makefile:1.39     Fri Jun 12 10:35:11 2020
+++ pkgsrc/security/mozilla-rootcerts/Makefile  Fri Nov 27 16:18:35 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2020/06/12 10:35:11 maya Exp $
+# $NetBSD: Makefile,v 1.40 2020/11/27 16:18:35 gdt Exp $
 
 DISTNAME=      mozilla-rootcerts-1.0.${CERTDATA_DATE}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  -https://hg.mozilla.org/mozilla-central/raw-file/4f0b2cc28b1482e285bcfceec472a568f3843299/security/nss/lib/ckfw/builtins/certdata.txt
 EXTRACT_SUFX=  # empty
@@ -43,7 +43,7 @@ SUBST_FILES.paths=    ${CERT_SCRIPT}
 SUBST_VARS.paths=      AWK DATADIR ECHO EXPR LN LS MKDIR PREFIX RM SH SSLDIR
 SUBST_SED.paths=       -e 's,@OPENSSL@,${TOOLS_PATH.openssl},g'
 
-INSTALLATION_DIRS=     sbin ${DATADIR}
+INSTALLATION_DIRS=     sbin ${DATADIR} share/doc/${PKGBASE}
 
 do-extract:
        ${CP} ${FILESDIR}/${CERT_SCRIPT} ${WRKSRC}
@@ -60,5 +60,6 @@ do-install:
                ${DESTDIR}${PREFIX}/sbin/mozilla-rootcerts
        ${INSTALL_DATA} ${WRKSRC}/certdata.txt ${DESTDIR}${DATADIR}/certdata.txt
        ${INSTALL_DATA} ${WRKSRC}/cacert.pem ${DESTDIR}${DATADIR}/cacert.pem
+       ${INSTALL_DATA} files/gnupg2 ${DESTDIR}/${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/mozilla-rootcerts/PLIST
diff -u pkgsrc/security/mozilla-rootcerts/PLIST:1.3 pkgsrc/security/mozilla-rootcerts/PLIST:1.4
--- pkgsrc/security/mozilla-rootcerts/PLIST:1.3 Sat Feb  6 10:22:54 2016
+++ pkgsrc/security/mozilla-rootcerts/PLIST     Fri Nov 27 16:18:35 2020
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2016/02/06 10:22:54 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/11/27 16:18:35 gdt Exp $
 sbin/mozilla-rootcerts
+share/doc/mozilla-rootcerts/gnupg2
 share/mozilla-rootcerts/cacert.pem
 share/mozilla-rootcerts/certdata.txt

Added files:

Index: pkgsrc/security/mozilla-rootcerts/files/gnupg2
diff -u /dev/null pkgsrc/security/mozilla-rootcerts/files/gnupg2:1.1
--- /dev/null   Fri Nov 27 16:18:35 2020
+++ pkgsrc/security/mozilla-rootcerts/files/gnupg2      Fri Nov 27 16:18:35 2020
@@ -0,0 +1,11 @@
+$NetBSD: gnupg2,v 1.1 2020/11/27 16:18:35 gdt Exp $
+
+To configure the mozilla-rootcerts certificates as trusted for users
+of gnupg2, do the following (assuming default PKG_SYSCONFBASE and a
+Bourne shell):
+
+  # mkdir -p /usr/pkg/etc/gnupg
+  # cd /usr/pkg/etc/gnupg
+  # for c in /etc/openssl/certs/*.pem; do
+  > openssl x509 -in $c -noout -fingerprint|sed 's|^.*=\(.*\)|\1 S|'
+  > done > trustlist.txt