diff --git a/info.yml b/info.yml index 1edc4f3..516b6c7 100644 --- a/info.yml +++ b/info.yml @@ -1,7 +1,7 @@ name: ca-certificates description: Common CA certificates for SSL/TLS from Mozilla version: "20250419" -revision: 4 +revision: 5 url: https://wiki.mozilla.org/NSS:Root_certs license: GPL2-or-later,MPL2 maintainers: @@ -12,6 +12,7 @@ type: source keep: - etc/ca-certificates.conf depends: + - ca-certificates-mozilla - coreutils - findutils - openssl diff --git a/recipe.sh b/recipe.sh index 738f06d..6b5fede 100644 --- a/recipe.sh +++ b/recipe.sh @@ -35,10 +35,6 @@ package() { cd "$BPM_OUTPUT"/usr/share/ca-certificates find . -name '*.crt' | sort | cut -b3- | install -Dm644 /dev/stdin "$BPM_OUTPUT"/etc/ca-certificates.conf - # Create certificate symlink - install -d "$BPM_OUTPUT"/etc/ssl - ln -s /etc/ssl/certs/ca-certificates.crt "$BPM_OUTPUT"/etc/ssl/certs.pem - # Create trust-source directories install -d "$BPM_OUTPUT"/etc/ca-certificates/trust-source/{anchors,blocklist} install -d "$BPM_OUTPUT"/usr/share/ca-certificates/trust-source/{anchors,blocklist} @@ -47,6 +43,11 @@ package() { install -d "$BPM_OUTPUT"/etc/ssl/certs/java install -d "$BPM_OUTPUT"/etc/ssl/extracted + # Create certificate symlinks + ln -sr "$BPM_OUTPUT"/etc/ca-certificates/extracted/tls-ca-bundle.pem "$BPM_OUTPUT"/etc/ssl/cert.pem + ln -sr "$BPM_OUTPUT"/etc/ca-certificates/extracted/tls-ca-bundle.pem "$BPM_OUTPUT"/etc/ssl/certs/ca-certificates.crt + ln -sr "$BPM_OUTPUT"/etc/ca-certificates/extracted/tls-ca-bundle.pem "$BPM_OUTPUT"/etc/ssl/certs/ca-bundle.crt + # Install bpm hook install -Dm644 "$BPM_WORKDIR"/40-update-ca-trust.bpmhook "$BPM_OUTPUT"/var/lib/bpm/hooks/40-update-ca-trust.bpmhook