From 5d5bca455edf0157d5989a35cf9e002fe65ace53 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Nov 13 2013 12:34:01 +0000 Subject: ecryptfs-migrate-home did not restore selinux labels (#1017402) --- diff --git a/ecryptfs-utils-99-selinux.patch b/ecryptfs-utils-99-selinux.patch index 5859ae0..cdad277 100644 --- a/ecryptfs-utils-99-selinux.patch +++ b/ecryptfs-utils-99-selinux.patch @@ -1,6 +1,6 @@ -diff -up ecryptfs-utils-99/src/utils/ecryptfs-migrate-home.selinux ecryptfs-utils-99/src/utils/ecryptfs-migrate-home ---- ecryptfs-utils-99/src/utils/ecryptfs-migrate-home.selinux 2012-07-24 14:35:28.428669924 +0200 -+++ ecryptfs-utils-99/src/utils/ecryptfs-migrate-home 2012-07-24 14:48:22.656139924 +0200 +diff -up ecryptfs-utils-103/src/utils/ecryptfs-migrate-home.selinux ecryptfs-utils-103/src/utils/ecryptfs-migrate-home +--- ecryptfs-utils-103/src/utils/ecryptfs-migrate-home.selinux 2013-11-13 13:29:25.676878706 +0100 ++++ ecryptfs-utils-103/src/utils/ecryptfs-migrate-home 2013-11-13 13:30:16.557552704 +0100 @@ -136,6 +136,7 @@ encrypt_dir () { error "Cannot proceed." fi @@ -9,12 +9,16 @@ diff -up ecryptfs-utils-99/src/utils/ecryptfs-migrate-home.selinux ecryptfs-util orig=$(mktemp /home/$USER_NAME.XXXXXXXX) rm "$orig" && mv "$USER_HOME" "$orig" chmod 700 "$orig" -@@ -158,6 +159,8 @@ encrypt_dir () { +@@ -158,8 +159,12 @@ encrypt_dir () { fi info "Encrypted home has been set up, encrypting files now...this may take a while." # Show progress, but on stderr, in case the user wants to filter that out + semanage fcontext -a -e /home /home/.ecryptfs >/dev/null 2>&1 ||: -+ restorecon -R $HOME/.ecryptfs/$USER >/dev/null 2>&1 ||: ++ restorecon /home/.ecryptfs/ /home/.ecryptfs/$USER_NAME >/dev/null 2>&1 ||: rsync -aP "$orig/" "$USER_HOME/" 1>&2 ++ restorecon -R /home/.ecryptfs/$USER_NAME >/dev/null 2>&1 ||: umount "$USER_HOME/" ++ restorecon -R "$USER_HOME" >/dev/null 2>&1 ||: echo + echo "========================================================================" + echo "Some Important Notes!" diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 9673a5d..6aefdef 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -5,7 +5,7 @@ Name: ecryptfs-utils Version: 103 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Wed Nov 13 2013 Michal Hlavinka - 103-4 +- ecryptfs-migrate-home did not restore selinux labels (#1017402) + * Sat Aug 03 2013 Fedora Release Engineering - 103-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild