CVS commit: pkgsrc/security/mozilla-rootcerts

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 15 10:35:01 UTC 2024

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

Log Message:
mozilla-rootcerts: fix trust handling

Suggested and reviewed by riastradh.

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/security/mozilla-rootcerts/Makefile
cvs rdiff -u -r1.21 -r1.22 \
    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.56 pkgsrc/security/mozilla-rootcerts/Makefile:1.57
--- pkgsrc/security/mozilla-rootcerts/Makefile:1.56     Sat Aug 31 18:41:27 2024
+++ pkgsrc/security/mozilla-rootcerts/Makefile  Sun Sep 15 10:35:00 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2024/08/31 18:41:27 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2024/09/15 10:35:00 wiz Exp $
 #
 # Please also update the dependency pattern in mozilla-rootcerts-openssl
 # and bump its version when updating this package.
 
-DISTNAME=      mozilla-rootcerts-1.0.${CERTDATA_DATE}
+DISTNAME=      mozilla-rootcerts-1.1.${CERTDATA_DATE}
 CATEGORIES=    security
 MASTER_SITES=  -https://hg.mozilla.org/mozilla-central/raw-file/${CERTDATA_COMMIT}/security/nss/lib/ckfw/builtins/certdata.txt
 EXTRACT_SUFX=  # empty

Index: pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh
diff -u pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.21 pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.22
--- pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.21   Tue Jun  2 22:32:02 2020
+++ pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh        Sun Sep 15 10:35:01 2024
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: mozilla-rootcerts.sh,v 1.21 2020/06/02 22:32:02 jperkin Exp $
+# $NetBSD: mozilla-rootcerts.sh,v 1.22 2024/09/15 10:35:01 wiz Exp $
 #
 # This script is meant to be used as follows:
 #
@@ -178,6 +178,12 @@ extract)
                        # Test the result for untrusted status
                        if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NSS_NOT_TRUSTED$/)
                                untrusted = 1
+                       if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NSS_MUST_VERIFY_TRUST$/)
+                               untrusted = 1
+                       # deprecated version of CKT_NSS_MUST_VERIFY_TRUST
+                       if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NSS_UNTRUSTED$/)
+                               untrusted = 1
+                       # even more deprecated version of CKT_NSS_UNTRUSTED (which really is CKT_NSS_MUST_VERIFY_TRUST)
                        if ($0 ~ /^CKA_TRUST_SERVER_AUTH.*CK_TRUST.*CKT_NETSCAPE_UNTRUSTED$/)
                                untrusted = 1