rpms/policycoreutils/F-7 policycoreutils-rhat.patch, 1.306, 1.307 policycoreutils.spec, 1.419, 1.420

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23959

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


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils-rhat.patch,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- policycoreutils-rhat.patch	22 Jun 2007 13:36:24 -0000	1.306
+++ policycoreutils-rhat.patch	6 Jul 2007 13:49:35 -0000	1.307
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.16/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/audit2allow/Makefile	2007-06-13 09:13:09.000000000 -0400
++++ policycoreutils-2.0.16/audit2allow/Makefile	2007-07-06 09:47:59.000000000 -0400
 @@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -20,7 +20,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.16/Makefile
 --- nsapolicycoreutils/Makefile	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/Makefile	2007-06-13 09:13:09.000000000 -0400
++++ policycoreutils-2.0.16/Makefile	2007-07-06 09:47:59.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -29,7 +29,7 @@
  	@for subdir in $(SUBDIRS); do \
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.16/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/restorecon/restorecon.c	2007-06-13 09:13:09.000000000 -0400
++++ policycoreutils-2.0.16/restorecon/restorecon.c	2007-07-06 09:47:59.000000000 -0400
 @@ -16,6 +16,7 @@
   * -v	Show changes in file labels.  
   * -o	filename save list of files with incorrect context
@@ -87,7 +87,7 @@
  			break;
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.16/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-05-04 09:14:47.000000000 -0400
-+++ policycoreutils-2.0.16/restorecond/restorecond.c	2007-06-13 09:13:09.000000000 -0400
++++ policycoreutils-2.0.16/restorecond/restorecond.c	2007-07-06 09:47:59.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -116,7 +116,7 @@
  	close(fd);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.16/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/chcat	2007-06-22 09:34:36.000000000 -0400
++++ policycoreutils-2.0.16/scripts/chcat	2007-07-06 09:47:59.000000000 -0400
 @@ -77,7 +77,7 @@
              
          if len(cats) > 0:
@@ -137,7 +137,7 @@
          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.16/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/genhomedircon	2007-06-13 09:13:09.000000000 -0400
++++ policycoreutils-2.0.16/scripts/genhomedircon	2007-07-06 09:48:36.000000000 -0400
 @@ -193,7 +193,7 @@
  		return prefix
  		
@@ -161,13 +161,13 @@
  			    regex = re.sub("\(\/\.\*\)\?", "", regex)
  			    regex = regex + "/*$"
 -			    if re.search(home, regex, 0):
-+			    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/seobject.py policycoreutils-2.0.16/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/semanage/seobject.py	2007-06-13 09:13:09.000000000 -0400
++++ policycoreutils-2.0.16/semanage/seobject.py	2007-07-06 09:47:59.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -194,7 +194,7 @@
  			
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-2.0.16/setsebool/setsebool.c
 --- nsapolicycoreutils/setsebool/setsebool.c	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/setsebool/setsebool.c	2007-06-13 09:13:58.000000000 -0400
++++ policycoreutils-2.0.16/setsebool/setsebool.c	2007-07-06 09:47:59.000000000 -0400
 @@ -160,6 +160,8 @@
  		goto err;
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- policycoreutils.spec	25 Jun 2007 10:12:43 -0000	1.419
+++ policycoreutils.spec	6 Jul 2007 13:49:35 -0000	1.420
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.16
-Release: 9%{?dist}
+Release: 10%{?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.16-10
+- Fix checking for conflicting directory specification in genhomedircon
+
 * Mon Jun 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-9
 - Clean up spelling mistakes in gui