diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index bd9d5a0..e058b73 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.18/scripts/fixfiles +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.19/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2005-02-08 13:27:03.000000000 -0500 -+++ policycoreutils-1.21.18/scripts/fixfiles 2005-02-21 10:25:46.000000000 -0500 ++++ policycoreutils-1.21.19/scripts/fixfiles 2005-02-23 09:31:45.000000000 -0500 @@ -78,8 +78,8 @@ esac; \ fi; \ @@ -12,9 +12,25 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc rm -f ${TEMPFILE} fi } -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.18/scripts/genhomedircon +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.19/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2005-02-17 14:28:23.000000000 -0500 -+++ policycoreutils-1.21.18/scripts/genhomedircon 2005-02-21 10:25:46.000000000 -0500 ++++ policycoreutils-1.21.19/scripts/genhomedircon 2005-02-23 09:33:26.000000000 -0500 +@@ -154,13 +154,13 @@ + def getDefaultHomeDir(): + rc=commands.getstatusoutput("grep ^HOME= /etc/default/useradd | tail -1") + if rc[0]==0: +- return rc[1].split("=")[-1] ++ return rc[1].split("=")[-1].strip() + return "/home" + + def getSELinuxType(directory): + rc=commands.getstatusoutput("grep ^SELINUXTYPE= %s/config | tail -1" % directory) + if rc[0]==0: +- return rc[1].split("=")[-1] ++ return rc[1].split("=")[-1].strip() + return "targeted" + + def usage(error = ""): @@ -203,7 +203,7 @@ def getHomeRootContext(self, homedir): rc=commands.getstatusoutput("grep HOME_ROOT %s | sed -e \"s|^HOME_ROOT|%s|\"" % ( self.getHomeDirTemplate(), homedir)) diff --git a/policycoreutils.spec b/policycoreutils.spec index b4db4f9..12f80b6 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -3,7 +3,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.21.19 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -82,6 +82,9 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Wed Feb 23 2005 Dan Walsh 1.21.19-2 +- Fix genhomedircon to handle spaces in SELINUXPOLICYTYPE + * Tue Feb 22 2005 Dan Walsh 1.21.19-1 - Update to latest from NSA * Merged several fixes from Ulrich Drepper.