From d4d6ab167ec7fa7e37db43ca36657c3a1f83c60a Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 16 Oct 2021 18:09:43 +0200 Subject: [PATCH] 20211016 (patches unapplied) Imported using git-ubuntu import. --- debian/changelog | 7 +++++++ sbin/update-ca-certificates | 12 ++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a146c2..531e4d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ca-certificates (20211016) unstable; urgency=low + + [ Michael Shuler ] + * Fix error on install when TEMPBUNDLE missing. Closes: #996005 + + -- Julien Cristau Sat, 16 Oct 2021 18:09:43 +0200 + ca-certificates (20211004) unstable; urgency=low [ Debian Janitor ] diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates index 789867f..9a876d7 100755 --- a/sbin/update-ca-certificates +++ b/sbin/update-ca-certificates @@ -187,10 +187,14 @@ then fi fi -chmod 0644 "$TEMPBUNDLE" -mv -f "$TEMPBUNDLE" "$CERTBUNDLE" -# Restore proper SELinux label after moving the file -[ -x /sbin/restorecon ] && /sbin/restorecon "$CERTBUNDLE" >/dev/null 2>&1 +# chmod and mv only if TEMPBUNDLE exists or install may fail, #996005 +if [ -f "$TEMPBUNDLE" ] +then + chmod 0644 "$TEMPBUNDLE" + mv -f "$TEMPBUNDLE" "$CERTBUNDLE" + # Restore proper SELinux label after moving the file + [ -x /sbin/restorecon ] && /sbin/restorecon "$CERTBUNDLE" >/dev/null 2>&1 +fi echo "$ADDED_CNT added, $REMOVED_CNT removed; done."