summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shuler <michael@pbandjelly.org>2016-11-18 09:06:04 -0600
committerMichael Shuler <michael@pbandjelly.org>2016-11-18 09:14:42 -0600
commit7753e795f2bae7a9fcb966fb13e678b678e0cb66 (patch)
tree8161ba3a135108727fa0dc77ede3be17f906e08a
parent3fe3f1ca658a85b3afe3a24ee292e2df2cc1f4d7 (diff)
downloadca-certificates-debian-jessie/20141019+deb8u2.tar.gz
Run update-certificates without hooks initially #825730debian-jessie/20141019+deb8u2
-rw-r--r--debian/NEWS2
-rw-r--r--debian/changelog9
-rw-r--r--debian/postinst7
3 files changed, 14 insertions, 4 deletions
diff --git a/debian/NEWS b/debian/NEWS
index b06c046..3cffc6b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -24,7 +24,7 @@ ca-certificates (20141019+deb8u2) stable; urgency=medium
- "Verisign Class 3 Public Primary Certification Authority"
- "Verisign Class 3 Public Primary Certification Authority - G2"
- -- Michael Shuler <michael@pbandjelly.org> Wed, 02 Nov 2016 21:15:03 -0500
+ -- Michael Shuler <michael@pbandjelly.org> Fri, 18 Nov 2016 09:09:47 -0600
ca-certificates (20141019+deb8u1) stable; urgency=medium
diff --git a/debian/changelog b/debian/changelog
index 5e741ca..55f2ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
ca-certificates (20141019+deb8u2) stable; urgency=medium
+ [ Michael Shuler ]
* mozilla/{certdata.txt,nssckbi.h}:
Update Mozilla certificate authority bundle to version 2.9.
Thanks for the initial 2.7 patch, Jonathan Wiltshire. Closes: #828845
@@ -26,7 +27,13 @@ ca-certificates (20141019+deb8u2) stable; urgency=medium
- "Verisign Class 3 Public Primary Certification Authority"
- "Verisign Class 3 Public Primary Certification Authority - G2"
- -- Michael Shuler <michael@pbandjelly.org> Wed, 02 Nov 2016 21:15:03 -0500
+ [ 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> Fri, 18 Nov 2016 09:09:47 -0600
ca-certificates (20141019+deb8u1) stable; urgency=medium
diff --git a/debian/postinst b/debian/postinst
index 6b24d9b..13714ab 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -136,13 +136,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)