summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shuler <michael@pbandjelly.org>2015-12-14 19:30:04 -0600
committerMichael Shuler <michael@pbandjelly.org>2015-12-14 19:30:04 -0600
commit8cef7fc39d51b3fbc943312f36215ba286613741 (patch)
tree37b89f0378c72f6b4ce6655d2b15cd37c92fcecf
parent00c8e0275aa134675625a3740a65e7d2f14ef5a4 (diff)
downloadca-certificates-8cef7fc39d51b3fbc943312f36215ba286613741.tar.gz
Update local certificates directory when calling --fresh
-rw-r--r--debian/changelog2
-rwxr-xr-xsbin/update-ca-certificates2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3f0ffac..e8b5d44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ca-certificates (20151214) UNRELEASED; urgency=medium
* mozilla/certdata2pem.py:
Add Python 3 support to ca-certificates.
Thanks to Andrew Wilcox and Richard Ipsum for the patch! Closes: #789753
+ * sbin/update-ca-certificates:
+ Update local certificates directory when calling --fresh. Closes: #783615
* mozilla/{certdata.txt,nssckbi.h}:
Update Mozilla certificate authority bundle to version 2.6.
The following certificate authorities were added (+):
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index d3e8f8b..ac59ae9 100755
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -117,7 +117,7 @@ if [ "$fresh" = 1 ]; then
find . -type l -print | while read symlink
do
case $(readlink "$symlink") in
- $CERTSDIR*) rm -f "$symlink";;
+ $CERTSDIR*|$LOCALCERTSDIR*) rm -f $symlink;;
esac
done
find . -type l -print | while read symlink