rpms/policycoreutils/F-13 policycoreutils-sepolgen.patch, 1.42, 1.43 policycoreutils.spec, 1.717, 1.718

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9894

Modified Files:
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Wed Jun 2 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-26
- Fix listing of booleans from audit2allow


policycoreutils-sepolgen.patch:
 sepolgen/access.py     |   13 ++++++--
 sepolgen/audit.py      |   46 ++++++++++++++++++++++++++++--
 sepolgen/defaults.py   |    3 ++
 sepolgen/interfaces.py |   73 +++++++++++++++++++++++++++++++++++++++++++------
 sepolgen/matching.py   |    9 +++---
 sepolgen/policygen.py  |   38 ++++++++++++++++++++++++-
 sepolgen/refparser.py  |    2 -
 share/perm_map         |   51 +++++++++++++++++++---------------
 8 files changed, 192 insertions(+), 43 deletions(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils-sepolgen.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- policycoreutils-sepolgen.patch	2 Jun 2010 13:24:18 -0000	1.42
+++ policycoreutils-sepolgen.patch	2 Jun 2010 15:48:41 -0000	1.43
@@ -295,7 +295,7 @@ diff --exclude-from=exclude -N -u -r nsa
          return iter(self.children)
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.82/sepolgen-1.0.23/src/sepolgen/policygen.py
 --- nsasepolgen/src/sepolgen/policygen.py	2010-05-19 14:45:51.000000000 -0400
-+++ policycoreutils-2.0.82/sepolgen-1.0.23/src/sepolgen/policygen.py	2010-06-02 09:06:31.000000000 -0400
++++ policycoreutils-2.0.82/sepolgen-1.0.23/src/sepolgen/policygen.py	2010-06-02 11:45:17.000000000 -0400
 @@ -29,6 +29,8 @@
  import access
  import interfaces
@@ -328,7 +328,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +            if av.type == audit2why.BOOLEAN:
 +                if len(av.bools) > 1:
-+                    rule.comment += "#!!!! This avc can be allowed using one of the these booleans:\n#     %s\n" % ", ".join(map(lambda x: av.bools[0][0], av.bools))
++                    rule.comment += "#!!!! This avc can be allowed using one of the these booleans:\n#     %s\n" % ", ".join(map(lambda x: x[0], av.bools))
 +                else:
 +                    rule.comment += "#!!!! This avc can be allowed using the boolean '%s'\n" % av.bools[0][0]
 +


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils.spec,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -p -r1.717 -r1.718
--- policycoreutils.spec	2 Jun 2010 13:24:18 -0000	1.717
+++ policycoreutils.spec	2 Jun 2010 15:48:41 -0000	1.718
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.82
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -313,6 +313,9 @@ fi
 exit 0
 
 %changelog
+* Wed Jun 2 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-26
+- Fix listing of booleans from audit2allow
+
 * Wed Jun 2 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-25
 - Fix audit2allow to output if the current policy has avc
 - Update translations