summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shuler <michael@pbandjelly.org>2014-10-06 15:30:16 -0500
committerMichael Shuler <michael@pbandjelly.org>2014-10-06 15:30:16 -0500
commit07a789e709a59be96ac8958ae8b5fa6688c62a11 (patch)
tree78315753ab78f29b57e9510a2e952e28d9a70916
parent60256869acfffb92f1f54bb7eb4635ebfb2b5b4e (diff)
downloadca-certificates-07a789e709a59be96ac8958ae8b5fa6688c62a11.tar.gz
Restore SELinux label after generating ca-certificates.crt file. #742957
-rw-r--r--debian/changelog2
-rwxr-xr-xsbin/update-ca-certificates2
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 64cddfb..a8188bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ca-certificates (20141006) UNRELEASED; urgency=medium
file-without-copyright-information warning.
* debian/source/lintian-overrides:
Add file-without-copyright-information override for SPI certificate file.
+ * Restore SELinux label after generating ca-certificates.crt file.
+ Thanks to Laurent Bigonville for the patch. Closes: #742957
-- Michael Shuler <michael@pbandjelly.org> Mon, 06 Oct 2014 15:05:15 -0500
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index 021a3c7..b8f16b4 100755
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -146,6 +146,8 @@ fi
chmod 0644 "$TEMPBUNDLE"
mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
+# Restore proper SELinux label after moving the file
+[ -x /sbin/restorecon ] && /sbin/restorecon "$CERTBUNDLE"
echo "$ADDED_CNT added, $REMOVED_CNT removed; done."