Fri Nov 27 16:18:35 2020 UTC ()
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.


(gdt)
diff -r1.6 -r1.7 pkgsrc/security/mozilla-rootcerts/DESCR
diff -r1.5 -r0 pkgsrc/security/mozilla-rootcerts/MESSAGE
diff -r1.39 -r1.40 pkgsrc/security/mozilla-rootcerts/Makefile
diff -r1.3 -r1.4 pkgsrc/security/mozilla-rootcerts/PLIST
diff -r0 -r1.1 pkgsrc/security/mozilla-rootcerts/files/gnupg2
cvs diff -r1.6 -r1.7 pkgsrc/security/mozilla-rootcerts/DESCR (expand / switch to unified diff)

--- pkgsrc/security/mozilla-rootcerts/DESCR 2020/06/12 10:37:18 1.6
+++ pkgsrc/security/mozilla-rootcerts/DESCR 2020/11/27 16:18:35 1.7
@@ -3,13 +3,16 @@ Project, with the exception of any certi @@ -3,13 +3,16 @@ Project, with the exception of any certi
3 3
4It also provides a script, mozilla-rootcerts, which can be used to 4It also provides a script, mozilla-rootcerts, which can be used to
5install the root CA certificates distributed by the Mozilla Project 5install the root CA certificates distributed by the Mozilla Project
6into a location that makes them usable by TLS implementations, extract 6into a location that makes them usable by TLS implementations, extract
7them to the current working directory, or rehash the existing 7them to the current working directory, or rehash the existing
8certificates. 8certificates.
9 9
10NB: This package provides certificates, but does not as a consequence 10NB: This package provides certificates, but does not as a consequence
11of installation place them in a location that makes them immediately 11of installation place them in a location that makes them immediately
12usable by SSL/TLS implementations. 12usable by SSL/TLS implementations.
13 13
14Use the 'mozilla-rootcerts install' script or mozilla-rootcerts-openssl 14Use the 'mozilla-rootcerts install' script or mozilla-rootcerts-openssl
15package if you want to use these certificates. 15package if you want to use these certificates.
 16
 17This package includes instructions for configuring gnupg2 to use the
 18certificates.
File Deleted: pkgsrc/security/mozilla-rootcerts/Attic/MESSAGE
cvs diff -r1.39 -r1.40 pkgsrc/security/mozilla-rootcerts/Makefile (expand / switch to unified diff)

--- pkgsrc/security/mozilla-rootcerts/Makefile 2020/06/12 10:35:11 1.39
+++ pkgsrc/security/mozilla-rootcerts/Makefile 2020/11/27 16:18:35 1.40
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.39 2020/06/12 10:35:11 maya Exp $ 1# $NetBSD: Makefile,v 1.40 2020/11/27 16:18:35 gdt Exp $
2 2
3DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE} 3DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE}
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= -https://hg.mozilla.org/mozilla-central/raw-file/4f0b2cc28b1482e285bcfceec472a568f3843299/security/nss/lib/ckfw/builtins/certdata.txt 6MASTER_SITES= -https://hg.mozilla.org/mozilla-central/raw-file/4f0b2cc28b1482e285bcfceec472a568f3843299/security/nss/lib/ckfw/builtins/certdata.txt
7EXTRACT_SUFX= # empty 7EXTRACT_SUFX= # empty
8DISTFILES= ${CERTDATA} 8DISTFILES= ${CERTDATA}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://hg.mozilla.org/mozilla-central/log/tip/security/nss/lib/ckfw/builtins/certdata.txt 11HOMEPAGE= https://hg.mozilla.org/mozilla-central/log/tip/security/nss/lib/ckfw/builtins/certdata.txt
12COMMENT= Root CA certificates from the Mozilla Project 12COMMENT= Root CA certificates from the Mozilla Project
13LICENSE= mpl-2.0 13LICENSE= mpl-2.0
14 14
15USE_TOOLS= awk:run echo:run expr:run ln:run ls:run openssl:run rm:run mkdir:run 15USE_TOOLS= awk:run echo:run expr:run ln:run ls:run openssl:run rm:run mkdir:run
16 16
17# This must be kept in sync with security/mozilla-rootcerts-openssl 17# This must be kept in sync with security/mozilla-rootcerts-openssl
@@ -33,32 +33,33 @@ SSLDIR= /etc/openssl @@ -33,32 +33,33 @@ SSLDIR= /etc/openssl
33.else 33.else
34SSLDIR= ${PKG_SYSCONFDIR}/openssl 34SSLDIR= ${PKG_SYSCONFDIR}/openssl
35.endif 35.endif
36 36
37CERT_SCRIPT= mozilla-rootcerts.sh 37CERT_SCRIPT= mozilla-rootcerts.sh
38 38
39SUBST_CLASSES= paths 39SUBST_CLASSES= paths
40SUBST_MESSAGE.paths= Replacing hard-coded paths. 40SUBST_MESSAGE.paths= Replacing hard-coded paths.
41SUBST_STAGE.paths= post-configure 41SUBST_STAGE.paths= post-configure
42SUBST_FILES.paths= ${CERT_SCRIPT} 42SUBST_FILES.paths= ${CERT_SCRIPT}
43SUBST_VARS.paths= AWK DATADIR ECHO EXPR LN LS MKDIR PREFIX RM SH SSLDIR 43SUBST_VARS.paths= AWK DATADIR ECHO EXPR LN LS MKDIR PREFIX RM SH SSLDIR
44SUBST_SED.paths= -e 's,@OPENSSL@,${TOOLS_PATH.openssl},g' 44SUBST_SED.paths= -e 's,@OPENSSL@,${TOOLS_PATH.openssl},g'
45 45
46INSTALLATION_DIRS= sbin ${DATADIR} 46INSTALLATION_DIRS= sbin ${DATADIR} share/doc/${PKGBASE}
47 47
48do-extract: 48do-extract:
49 ${CP} ${FILESDIR}/${CERT_SCRIPT} ${WRKSRC} 49 ${CP} ${FILESDIR}/${CERT_SCRIPT} ${WRKSRC}
50 ${CP} ${DISTDIR}/${CERTDATA} ${WRKSRC}/certdata.txt 50 ${CP} ${DISTDIR}/${CERTDATA} ${WRKSRC}/certdata.txt
51 51
52do-build: 52do-build:
53 ${MKDIR} ${WRKSRC}/certs 53 ${MKDIR} ${WRKSRC}/certs
54 cd ${WRKSRC}/certs && \ 54 cd ${WRKSRC}/certs && \
55 ${SH} ${WRKSRC}/${CERT_SCRIPT} -f ${WRKSRC}/certdata.txt extract 55 ${SH} ${WRKSRC}/${CERT_SCRIPT} -f ${WRKSRC}/certdata.txt extract
56 ${LS} -rt ${WRKSRC}/certs/*.pem | ${XARGS} ${CAT} >${WRKSRC}/cacert.pem 56 ${LS} -rt ${WRKSRC}/certs/*.pem | ${XARGS} ${CAT} >${WRKSRC}/cacert.pem
57 57
58do-install: 58do-install:
59 ${INSTALL_SCRIPT} ${WRKSRC}/${CERT_SCRIPT} \ 59 ${INSTALL_SCRIPT} ${WRKSRC}/${CERT_SCRIPT} \
60 ${DESTDIR}${PREFIX}/sbin/mozilla-rootcerts 60 ${DESTDIR}${PREFIX}/sbin/mozilla-rootcerts
61 ${INSTALL_DATA} ${WRKSRC}/certdata.txt ${DESTDIR}${DATADIR}/certdata.txt 61 ${INSTALL_DATA} ${WRKSRC}/certdata.txt ${DESTDIR}${DATADIR}/certdata.txt
62 ${INSTALL_DATA} ${WRKSRC}/cacert.pem ${DESTDIR}${DATADIR}/cacert.pem 62 ${INSTALL_DATA} ${WRKSRC}/cacert.pem ${DESTDIR}${DATADIR}/cacert.pem
 63 ${INSTALL_DATA} files/gnupg2 ${DESTDIR}/${PREFIX}/share/doc/${PKGBASE}
63 64
64.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/security/mozilla-rootcerts/PLIST (expand / switch to unified diff)

--- pkgsrc/security/mozilla-rootcerts/PLIST 2016/02/06 10:22:54 1.3
+++ pkgsrc/security/mozilla-rootcerts/PLIST 2020/11/27 16:18:35 1.4
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
1@comment $NetBSD: PLIST,v 1.3 2016/02/06 10:22:54 tron Exp $ 1@comment $NetBSD: PLIST,v 1.4 2020/11/27 16:18:35 gdt Exp $
2sbin/mozilla-rootcerts 2sbin/mozilla-rootcerts
 3share/doc/mozilla-rootcerts/gnupg2
3share/mozilla-rootcerts/cacert.pem 4share/mozilla-rootcerts/cacert.pem
4share/mozilla-rootcerts/certdata.txt 5share/mozilla-rootcerts/certdata.txt
File Added: pkgsrc/security/mozilla-rootcerts/files/gnupg2
$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