From 5e0b9272b3afe8a9275fb61e947e12a9de4fa4c4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 11 Feb 2005 13:31:34 +0000 Subject: [PATCH] * Fri Feb 11 2005 Dan Walsh 1.21.15-6 - Fix genhomedircon regular expression --- policycoreutils-rhat.patch | 4 ++-- policycoreutils.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index fe0ec37..ded25fc 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.15/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2005-01-28 11:16:36.000000000 -0500 -+++ policycoreutils-1.21.15/scripts/genhomedircon 2005-02-11 00:54:56.000000000 -0500 ++++ policycoreutils-1.21.15/scripts/genhomedircon 2005-02-11 08:22:00.000000000 -0500 @@ -13,38 +13,109 @@ # # ASSUMPTIONS: @@ -235,7 +235,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po + ret= self.heading() + ret += self.getHomeRootContext() + for h in self.getHomeDirs(): -+ ret += self.getHomeDirContext ("user_u" , h+'/[A-z0-9]*', "user") ++ ret += self.getHomeDirContext ("user_u" , h+'/[^/]*', "user") + ret += self.genHomeDirContext() + return ret + diff --git a/policycoreutils.spec b/policycoreutils.spec index d180f05..0752ba5 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -2,7 +2,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.21.15 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Fri Feb 11 2005 Dan Walsh 1.21.15-6 +- Fix genhomedircon regular expression + * Thu Feb 10 2005 Dan Walsh 1.21.15-5 - Trap failure on write - Rewrite genhomedircon to generate file_context.homedirs