From 216a1253a4c63b282b8140c60fe911f09ff11a23 Mon Sep 17 00:00:00 2001 From: David Stes <55844484+cstes@users.noreply.github.com> Date: Sun, 06 Mar 2022 14:13:14 +0100 Subject: [PATCH] ca-certificates: update to 3.76 --- components/openindiana/ca-certificates/Makefile | 9 ++++++--- components/openindiana/ca-certificates/ca-certificates.p5m | 4 ++-- components/openindiana/ca-certificates/manifests/sample-manifest.p5m | 4 ++-- components/openindiana/ca-certificates/pkg5 | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/components/openindiana/ca-certificates/Makefile b/components/openindiana/ca-certificates/Makefile index b0e30c2..0653050 100644 --- a/components/openindiana/ca-certificates/Makefile +++ b/components/openindiana/ca-certificates/Makefile @@ -20,13 +20,13 @@ COMPONENT_NAME= ca-certificates COMPONENT_VERSION_MAJOR=3 -COMPONENT_VERSION_MINOR=75 +COMPONENT_VERSION_MINOR=76 COMPONENT_VERSION= $(COMPONENT_VERSION_MAJOR).$(COMPONENT_VERSION_MINOR) COMPONENT_SUMMARY= Common CA certificates COMPONENT_SRC= nss-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 + sha256:1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 COMPONENT_ARCHIVE_URL= \ https://ftp.mozilla.org/pub/security/nss/releases/NSS_$(COMPONENT_VERSION_MAJOR)_$(COMPONENT_VERSION_MINOR)_RTM/src/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS @@ -55,7 +55,10 @@ FILE_LEN=$$(wc -l "$$i" |awk ' { print $$1; }' ); \ BEGIN=$$(grep -n "BEGIN CERT" "$$i" |cut -d : -f 1); \ TAIL=$$(($$FILE_LEN-$$BEGIN+1)); \ - NAME=$$(head -1 "$$i" | tr ' ' '_' | iconv -c -f UTF-8 -t ASCII | tr -d '?'); \ + NAME=$$(head -1 "$$i" | tr ' ' '_' | \ + iconv -c -f UTF-8 -t ASCII | \ + tr -d '?' | tr -d '(' | tr -d ')' \ + ); \ tail -n $$TAIL "$$i" > $(BUILD_DIR_32)/$${NAME}.pem ;\ done $(TOUCH) $@ diff --git a/components/openindiana/ca-certificates/ca-certificates.p5m b/components/openindiana/ca-certificates/ca-certificates.p5m index 22308ce..7a2f78e 100644 --- a/components/openindiana/ca-certificates/ca-certificates.p5m +++ b/components/openindiana/ca-certificates/ca-certificates.p5m @@ -124,7 +124,7 @@ file path=etc/certs/CA/Microsoft_ECC_Root_Certificate_Authority_2017.pem file path=etc/certs/CA/Microsoft_RSA_Root_Certificate_Authority_2017.pem file path=etc/certs/CA/NAVER_Global_Root_Certification_Authority.pem -file path=etc/certs/CA/NetLock_Arany_(Class_Gold)_Ftanstvny.pem +file path=etc/certs/CA/NetLock_Arany_Class_Gold_Ftanstvny.pem file path=etc/certs/CA/Network_Solutions_Certificate_Authority.pem file path=etc/certs/CA/OISTE_WISeKey_Global_Root_GB_CA.pem file path=etc/certs/CA/OISTE_WISeKey_Global_Root_GC_CA.pem @@ -319,7 +319,7 @@ link path=etc/openssl/certs/9482e63a.0 \ target=../../certs/CA/Certum_EC-384_CA.pem link path=etc/openssl/certs/988a38cb.0 \ - target=../../certs/CA/NetLock_Arany_(Class_Gold)_Ftanstvny.pem + target=../../certs/CA/NetLock_Arany_Class_Gold_Ftanstvny.pem link path=etc/openssl/certs/9b5697b0.0 \ target=../../certs/CA/Trustwave_Global_ECC_P256_Certification_Authority.pem link path=etc/openssl/certs/9c8dfbd4.0 \ diff --git a/components/openindiana/ca-certificates/manifests/sample-manifest.p5m b/components/openindiana/ca-certificates/manifests/sample-manifest.p5m index 5d5ba62..c5e0d5d 100644 --- a/components/openindiana/ca-certificates/manifests/sample-manifest.p5m +++ b/components/openindiana/ca-certificates/manifests/sample-manifest.p5m @@ -101,7 +101,7 @@ file path=etc/certs/CA/Microsoft_ECC_Root_Certificate_Authority_2017.pem file path=etc/certs/CA/Microsoft_RSA_Root_Certificate_Authority_2017.pem file path=etc/certs/CA/NAVER_Global_Root_Certification_Authority.pem -file path=etc/certs/CA/NetLock_Arany_(Class_Gold)_Ftanstvny.pem +file path=etc/certs/CA/NetLock_Arany_Class_Gold_Ftanstvny.pem file path=etc/certs/CA/Network_Solutions_Certificate_Authority.pem file path=etc/certs/CA/OISTE_WISeKey_Global_Root_GB_CA.pem file path=etc/certs/CA/OISTE_WISeKey_Global_Root_GC_CA.pem @@ -296,7 +296,7 @@ link path=etc/openssl/certs/9482e63a.0 \ target=../../certs/CA/Certum_EC-384_CA.pem link path=etc/openssl/certs/988a38cb.0 \ - target=../../certs/CA/NetLock_Arany_(Class_Gold)_Ftanstvny.pem + target=../../certs/CA/NetLock_Arany_Class_Gold_Ftanstvny.pem link path=etc/openssl/certs/9b5697b0.0 \ target=../../certs/CA/Trustwave_Global_ECC_P256_Certification_Authority.pem link path=etc/openssl/certs/9c8dfbd4.0 \ diff --git a/components/openindiana/ca-certificates/pkg5 b/components/openindiana/ca-certificates/pkg5 index 3c62926..e085738 100644 --- a/components/openindiana/ca-certificates/pkg5 +++ b/components/openindiana/ca-certificates/pkg5 @@ -7,6 +7,7 @@ "runtime/perl-522", "shell/ksh93", "system/library", + "system/library/iconv/utf-8", "text/gawk", "text/gnu-grep" ], -- Gitblit v1.9.3