diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 3bc2929..f7367ec 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,8 +1,14 @@ --- policycoreutils-1.13/scripts/fixfiles.rhat 2004-05-21 14:26:51.000000000 -0400 -+++ policycoreutils-1.13/scripts/fixfiles 2004-05-21 15:00:08.069273944 -0400 -@@ -22,21 +22,38 @@ - - FC=/etc/security/selinux/file_contexts ++++ policycoreutils-1.13/scripts/fixfiles 2004-05-25 15:06:03.586866792 -0400 +@@ -19,24 +19,42 @@ + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- +-FC=/etc/security/selinux/file_contexts ++SELINUXTYPE="targeted" ++. /etc/sysconfig/selinux ++FC=/etc/selinux/${SELINUXTYPE}/contexts/file_contexts LOGFILE=`mktemp /var/tmp/fixfiles.XXXXXXXXXX` || exit 1 -echo "logging to $LOGFILE" SETFILES=/usr/sbin/setfiles @@ -41,7 +47,7 @@ } # See how we were called. -@@ -48,10 +65,15 @@ +@@ -48,10 +66,15 @@ restoreLabels ;; relabel) diff --git a/policycoreutils.spec b/policycoreutils.spec index 85259f8..6797957 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,7 +1,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.13 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -72,6 +72,9 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Tue May 25 2004 Dan Walsh 1.13-2 +- Change to use /etc/sysconfig/selinux to determine location of policy files + * Fri May 21 2004 Dan Walsh 1.13-1 - Update to latest from NSA - Change fixfiles to prompt before deleteing /tmp files