rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.309, 1.310 policycoreutils.spec, 1.423, 1.424

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23833

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Jul 7 2007 Dan Walsh <dwalsh at redhat.com> 2.0.22-4
- Fix checking for conflicting directory specification in genhomedircon


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- policycoreutils-rhat.patch	22 Jun 2007 13:33:42 -0000	1.309
+++ policycoreutils-rhat.patch	6 Jul 2007 13:47:43 -0000	1.310
@@ -77,6 +77,18 @@
              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


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- policycoreutils.spec	25 Jun 2007 10:10:55 -0000	1.423
+++ policycoreutils.spec	6 Jul 2007 13:47:43 -0000	1.424
@@ -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 @@
 fi
 
 %changelog
+* Fri Jul 7 2007 Dan Walsh <dwalsh at redhat.com> 2.0.22-4
+- Fix checking for conflicting directory specification in genhomedircon
+
 * Mon Jun 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.22-3
 - Fix spelling mistakes in GUI