From 9c2c4da554a71308551815bb2d117c5b0eebafb9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 6 Jul 2007 13:47:43 +0000 Subject: [PATCH] * Fri Jul 7 2007 Dan Walsh 2.0.22-4 - Fix checking for conflicting directory specification in genhomedircon --- policycoreutils-rhat.patch | 12 ++++++++++++ policycoreutils.spec | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 66fdd5b..4a43e59 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -77,6 +77,18 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po new_serange = "%s-%s" % (serange[0], top[0]) if add_ind: +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.22/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2007-06-11 14:37:17.000000000 -0400 ++++ policycoreutils-2.0.22/scripts/genhomedircon 2007-07-06 09:45:34.000000000 -0400 +@@ -302,7 +302,7 @@ + + regex = re.sub("\(\/\.\*\)\?", "", regex) + regex = regex + "/*$" +- if re.search(regex,home, 0): ++ if re.match(regex,home): + return 1 + except: + continue diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.22/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2007-05-04 09:14:39.000000000 -0400 +++ policycoreutils-2.0.22/semanage/semanage 2007-06-22 09:31:53.000000000 -0400 diff --git a/policycoreutils.spec b/policycoreutils.spec index 702e937..927f7ee 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 2.0.22 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* Fri Jul 7 2007 Dan Walsh 2.0.22-4 +- Fix checking for conflicting directory specification in genhomedircon + * Mon Jun 25 2007 Dan Walsh 2.0.22-3 - Fix spelling mistakes in GUI