rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.352, 1.353 policycoreutils-sepolgen.patch, 1.9, 1.10

[Daniel J Walsh (dwalsh)]

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils-sepolgen.patch 
Log Message:
* Wed Jan 23 2008 Dan Walsh <dwalsh at redhat.com> 2.0.37-1
- Update to upstream
  * Merged replacement for audit2why from Dan Walsh.


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- policycoreutils-rhat.patch	23 Jan 2008 22:11:23 -0000	1.352
+++ policycoreutils-rhat.patch	23 Jan 2008 22:18:29 -0000	1.353
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.36/audit2allow/audit2allow
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.37/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2008-01-23 16:47:07.000000000 -0500
-+++ policycoreutils-2.0.36/audit2allow/audit2allow	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/audit2allow/audit2allow	2008-01-23 17:15:21.000000000 -0500
 @@ -19,7 +19,6 @@
  #
  
@@ -47,12 +47,9 @@
                  if rc == audit2why.ALLOW:
                      print "\t\tUnknown - would be allowed by active policy\n",
                      print "\t\tPossible mismatch between this policy and the one under which the audit message was generated.\n"
-@@ -249,18 +249,20 @@
-                     continue
-                 if rc == audit2why.BOOLEAN:
+@@ -251,12 +251,14 @@
                      if len(bools) > 1:
--                        print "\tOne of the following booleans was set incorrectly."
-+                        print "\tOne of the following booleans being set incorrectly."
+                         print "\tOne of the following booleans was set incorrectly."
                          for b in bools:
 -                            print "\n\tBoolean %s is %d. Allow access by executing:" % (b[0], not b[1])
 -                            print "\t# setsebool -P %s %d"  % (b[0], b[1])
@@ -70,23 +67,18 @@
                      continue
  
                  if rc == audit2why.TERULE:
--                    print "\t\tMissing or disabled type enforcing (TE) allow rule.\n"
-+                    print "\t\tMissing or disabled type enforcingment (TE) allow rule.\n"
-                     print "\t\tYou can use audit2allow to generate the missing allow rules and/or load policy to allow this access.\n"
-                     continue
- 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.36/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.37/Makefile
 --- nsapolicycoreutils/Makefile	2007-12-19 06:02:52.000000000 -0500
-+++ policycoreutils-2.0.36/Makefile	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/Makefile	2008-01-23 17:13:45.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.36/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.37/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.36/restorecond/restorecond.c	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/restorecond/restorecond.c	2008-01-23 17:13:45.000000000 -0500
 @@ -210,9 +210,10 @@
  			}
  
@@ -113,9 +105,9 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.36/scripts/fixfiles
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.37/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2008-01-23 14:36:28.000000000 -0500
-+++ policycoreutils-2.0.36/scripts/fixfiles	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/scripts/fixfiles	2008-01-23 17:13:45.000000000 -0500
 @@ -36,8 +36,8 @@
  LOGGER=/usr/sbin/logger
  SETFILES=/sbin/setfiles
@@ -154,9 +146,9 @@
      else
  	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
      fi
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.36/scripts/fixfiles.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.37/scripts/fixfiles.8
 --- nsapolicycoreutils/scripts/fixfiles.8	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.36/scripts/fixfiles.8	2008-01-23 15:48:52.000000000 -0500
++++ policycoreutils-2.0.37/scripts/fixfiles.8	2008-01-23 17:13:45.000000000 -0500
 @@ -35,7 +35,7 @@
  
  .TP 
@@ -166,9 +158,9 @@
  
  .TP 
  .B -R rpmpackagename[,rpmpackagename...]
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.36/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.37/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-01-23 14:36:28.000000000 -0500
-+++ policycoreutils-2.0.36/semanage/semanage	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/semanage/semanage	2008-01-23 17:13:45.000000000 -0500
 @@ -111,7 +111,7 @@
  		valid_option["translation"] = []
  		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
@@ -217,9 +209,9 @@
  		if object == "login":
  			OBJECT = seobject.loginRecords(store)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.36/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.37/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-12-10 21:42:27.000000000 -0500
-+++ policycoreutils-2.0.36/semanage/seobject.py	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/semanage/seobject.py	2008-01-23 17:13:45.000000000 -0500
 @@ -117,6 +117,12 @@
         #print _("Failed to translate booleans.\n%s") % e
         pass
@@ -245,9 +237,9 @@
  
          def get_category(self, boolean):
                 if boolean in booleans_dict:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.36/setfiles/setfiles.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.37/setfiles/setfiles.8
 --- nsapolicycoreutils/setfiles/setfiles.8	2007-07-16 14:20:43.000000000 -0400
-+++ policycoreutils-2.0.36/setfiles/setfiles.8	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/setfiles/setfiles.8	2008-01-23 17:13:45.000000000 -0500
 @@ -59,6 +59,9 @@
  .TP 
  .B \-W
@@ -258,9 +250,9 @@
  
  .SH "ARGUMENTS"
  .B spec_file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.36/setfiles/setfiles.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.37/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2008-01-11 10:52:37.000000000 -0500
-+++ policycoreutils-2.0.36/setfiles/setfiles.c	2008-01-23 15:47:45.000000000 -0500
++++ policycoreutils-2.0.37/setfiles/setfiles.c	2008-01-23 17:13:45.000000000 -0500
 @@ -55,6 +55,7 @@
  static int verbose = 0;
  static int logging = 0;

policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policycoreutils-sepolgen.patch	23 Jan 2008 20:23:24 -0000	1.9
+++ policycoreutils-sepolgen.patch	23 Jan 2008 22:18:29 -0000	1.10
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.35/sepolgen-1.0.10/src/sepolgen/refparser.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.35/sepolgen-1.0.11/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-01-23 14:36:29.000000000 -0500
-+++ policycoreutils-2.0.35/sepolgen-1.0.10/src/sepolgen/refparser.py	2008-01-11 11:17:50.000000000 -0500
++++ policycoreutils-2.0.35/sepolgen-1.0.11/src/sepolgen/refparser.py	2008-01-11 11:17:50.000000000 -0500
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []