CVS commit: pkgsrc/security/mozilla-rootcerts

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May 30 22:39:08 UTC 2020

Modified Files:
        pkgsrc/security/mozilla-rootcerts: Makefile distinfo
        pkgsrc/security/mozilla-rootcerts/patches: patch-certdata.txt

Log Message:
mozilla-rootcerts: silence pkglint warning about inconsistent patch name


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/mozilla-rootcerts/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/mozilla-rootcerts/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/mozilla-rootcerts/patches/patch-certdata.txt

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.36 pkgsrc/security/mozilla-rootcerts/Makefile:1.37
--- pkgsrc/security/mozilla-rootcerts/Makefile:1.36     Sat May 30 12:55:46 2020
+++ pkgsrc/security/mozilla-rootcerts/Makefile  Sat May 30 22:39:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2020/05/30 12:55:46 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2020/05/30 22:39:08 tnn Exp $
 
 DISTNAME=      mozilla-rootcerts-1.0.${CERTDATA_DATE}
 CATEGORIES=    security
@@ -46,18 +46,18 @@ INSTALLATION_DIRS=  sbin ${DATADIR}
 
 do-extract:
        ${CP} ${FILESDIR}/${CERT_SCRIPT} ${WRKSRC}
-       ${CP} ${DISTDIR}/${CERTDATA} ${WRKSRC}
+       ${CP} ${DISTDIR}/${CERTDATA} ${WRKSRC}/certdata.txt
 
 do-build:
        ${MKDIR} ${WRKSRC}/certs
        cd ${WRKSRC}/certs && \
-       ${SH} ${WRKSRC}/${CERT_SCRIPT} -f ${WRKSRC}/${CERTDATA} extract
+       ${SH} ${WRKSRC}/${CERT_SCRIPT} -f ${WRKSRC}/certdata.txt extract
        ${LS} -rt ${WRKSRC}/certs/*.pem | ${XARGS} ${CAT} >${WRKSRC}/cacert.pem
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/${CERT_SCRIPT} \
                ${DESTDIR}${PREFIX}/sbin/mozilla-rootcerts
-       ${INSTALL_DATA} ${WRKSRC}/${CERTDATA} ${DESTDIR}${DATADIR}/certdata.txt
+       ${INSTALL_DATA} ${WRKSRC}/certdata.txt ${DESTDIR}${DATADIR}/certdata.txt
        ${INSTALL_DATA} ${WRKSRC}/cacert.pem ${DESTDIR}${DATADIR}/cacert.pem
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/mozilla-rootcerts/distinfo
diff -u pkgsrc/security/mozilla-rootcerts/distinfo:1.16 pkgsrc/security/mozilla-rootcerts/distinfo:1.17
--- pkgsrc/security/mozilla-rootcerts/distinfo:1.16     Sat May 30 12:55:46 2020
+++ pkgsrc/security/mozilla-rootcerts/distinfo  Sat May 30 22:39:08 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2020/05/30 12:55:46 tnn Exp $
+$NetBSD: distinfo,v 1.17 2020/05/30 22:39:08 tnn Exp $
 
 SHA1 (certdata-20200529.txt) = 3707d1ea79b8feba0a97431a39ae27112a1ccfca
 RMD160 (certdata-20200529.txt) = d2359410858af530b960d4157f780d5400a82e0b
 SHA512 (certdata-20200529.txt) = 39383103063dde12962a182f438163be2ff3b53c95da2b8433d6688b8405c36491b862c248d0f7f4ed6a4b67fa3752b75d9e5d6c6761b096cc5363fbacd7682c
 Size (certdata-20200529.txt) = 1271692 bytes
-SHA1 (patch-certdata.txt) = c3c837661268b10e2a44b2027b89d62f3ec969b8
+SHA1 (patch-certdata.txt) = 4d90a8f5126397961d0afe15c0c96c1d7fcf046f

Index: pkgsrc/security/mozilla-rootcerts/patches/patch-certdata.txt
diff -u pkgsrc/security/mozilla-rootcerts/patches/patch-certdata.txt:1.1 pkgsrc/security/mozilla-rootcerts/patches/patch-certdata.txt:1.2
--- pkgsrc/security/mozilla-rootcerts/patches/patch-certdata.txt:1.1    Sat May 30 12:55:46 2020
+++ pkgsrc/security/mozilla-rootcerts/patches/patch-certdata.txt        Sat May 30 22:39:08 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-certdata.txt,v 1.1 2020/05/30 12:55:46 tnn Exp $
+$NetBSD: patch-certdata.txt,v 1.2 2020/05/30 22:39:08 tnn Exp $
 
 Delete the following expired certificates:
 C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root
 C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root
 C = NL, O = Staat der Nederlanden, CN = Staat der Nederlanden Root CA - G2
 
---- certdata-20200529.txt.orig 2020-05-30 12:42:07.645376642 +0000
-+++ certdata-20200529.txt
+--- certdata.txt.orig  2020-05-30 12:42:07.645376642 +0000
++++ certdata.txt
 @@ -1251,305 +1251,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_
  CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE