diff options
| author | Michael Shuler <michael@pbandjelly.org> | 2016-11-02 20:37:22 -0500 |
|---|---|---|
| committer | Michael Shuler <michael@pbandjelly.org> | 2016-11-02 20:37:56 -0500 |
| commit | 479f3f70b6328dd98112a9c408db192a14fabd32 (patch) | |
| tree | 5259aab0af607e72dfe4fe8e0393300176c6ddb7 | |
| parent | e1af279f81a2fefbd8e3ab39a0de72280482224d (diff) | |
| download | ca-certificates-479f3f70b6328dd98112a9c408db192a14fabd32.tar.gz | |
Run update-certificates without hooks initially #825730
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/postinst | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index da88cf4..ead9830 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ ca-certificates (20161102) UNRELEASED; urgency=medium + [ Michael Shuler ] * debian/control: Update to Standards-Version: 3.9.8 Update to Vcs-Browser/Vcs-Git: https URLs * mozilla/{certdata.txt,nssckbi.h}: Update Mozilla certificate authority bundle to version 2.9. - Thanks for the 2.7 patch, Jonathan Wiltshire. Closes: #828845 + Thanks for the initial 2.7 patch, Jonathan Wiltshire. Closes: #828845 The following certificate authorities were added (+): + "Certplus Root CA G1" + "Certplus Root CA G2" @@ -29,6 +30,12 @@ ca-certificates (20161102) UNRELEASED; urgency=medium - "Verisign Class 3 Public Primary Certification Authority" - "Verisign Class 3 Public Primary Certification Authority - G2" + [ Andreas Beckmann ] + * debian/postinst: + Run update-certificates without hooks to initially populate + /etc/ssl/certs. (The hooks are deferred to the noawait trigger.) + Closes: #825730 + -- Michael Shuler <michael@pbandjelly.org> Wed, 02 Nov 2016 20:16:57 -0500 ca-certificates (20160104) unstable; urgency=medium diff --git a/debian/postinst b/debian/postinst index f7ef7f4..21586bb 100644 --- a/debian/postinst +++ b/debian/postinst @@ -138,13 +138,16 @@ EOF -e 's/^[[:space:]]*1[[:space:]]*/!/' \ >> /etc/ca-certificates.conf fi + # update /etc/ssl/certs without running the hooks # fix bogus symlink to ca-certificates.crt on upgrades; see # Debian #643667; drop after wheezy if dpkg --compare-versions "$2" lt-nl 20111025; then - dpkg-trigger --no-await update-ca-certificates-fresh + update-ca-certificates --hooksdir "" --fresh else - dpkg-trigger --no-await update-ca-certificates + update-ca-certificates --hooksdir "" fi + # deferred update of /etc/ssl/certs including running the hooks + dpkg-trigger --no-await update-ca-certificates ;; triggered) |