From 190e13219ea079e08cb4e13394df8c5560744d70 Mon Sep 17 00:00:00 2001 From: Michael Shuler Date: Thu, 20 Dec 2018 17:41:01 -0600 Subject: Revert "Remove all orphan symlinks found in /etc/ssl/certs" This reverts commit 1ef0fd15cc77c854e79a4f599d5228a67548ab87. While this worked great to fix the error, it also broke the counting on upgrade for how many certificates were removed.. (-_-) --- debian/changelog | 3 --- sbin/update-ca-certificates | 8 -------- 2 files changed, 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 45af3cf..bec0b2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,6 @@ ca-certificates (20181220) UNRELEASED; urgency=medium * debian/ca-certificates.postinst: Fix permissions on /usr/local/share/ca-certificates when using symlinks. Closes: #916833 - * sbin/update-ca-certificates: - Remove orphaned symlinks found in /etc/ssl/certs, to prevent `openssl - rehash` from exiting with an error. Closes: #895482, #895473 * mozilla/{certdata.txt,nssckbi.h}: Update Mozilla certificate authority bundle to version 2.28. The following certificate authorities were added (+): diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates index 175035a..bdf5b27 100755 --- a/sbin/update-ca-certificates +++ b/sbin/update-ca-certificates @@ -111,14 +111,6 @@ remove() { fi } -# Remove all orphan symlinks found in ETCCERTSDIR, to prevent -# `openssl rehash` from exiting with an error. See #895482, #895473. -find $ETCCERTSDIR -type l ! -exec test -e {} \; -print | while read orphan -do - rm -f "$orphan" - echo "Removed orphan symlink $orphan" -done - cd "$ETCCERTSDIR" if [ "$fresh" = 1 ]; then echo "Clearing symlinks in $ETCCERTSDIR..." -- cgit v1.2.1