rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.416, 1.417 policycoreutils-sepolgen.patch, 1.22, 1.23 policycoreutils.spec, 1.604, 1.605

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29566

Modified Files:
	policycoreutils-rhat.patch policycoreutils-sepolgen.patch 
	policycoreutils.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.1
- Fix audit2allow -a to read /var/log/messages


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- policycoreutils-rhat.patch	16 Apr 2009 18:56:02 -0000	1.416
+++ policycoreutils-rhat.patch	24 Apr 2009 17:57:46 -0000	1.417
@@ -1,3 +1,14 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.62/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.62/audit2allow/audit2allow	2009-04-24 13:18:45.000000000 -0400
+@@ -126,6 +126,7 @@
+         elif self.__options.audit:
+             try:
+                 messages = audit.get_audit_msgs()
++                messages += audit.get_log_msgs()
+             except OSError, e:
+                 sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
+                 sys.exit(1)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-2.0.62/debugfiles.list
 --- nsapolicycoreutils/debugfiles.list	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.62/debugfiles.list	2009-04-03 14:13:23.000000000 -0400

policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-sepolgen.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policycoreutils-sepolgen.patch	9 Apr 2009 02:05:30 -0000	1.22
+++ policycoreutils-sepolgen.patch	24 Apr 2009 17:57:47 -0000	1.23
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py
 --- nsasepolgen/src/sepolgen/access.py	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py	2009-04-01 10:03:43.000000000 -0400
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py	2009-04-21 14:54:12.000000000 -0400
 @@ -313,7 +313,7 @@
  
      def __len__(self):
@@ -10,9 +10,30 @@
  
      def add(self, role, type):
          if self.role_types.has_key(role):
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py
+--- nsasepolgen/src/sepolgen/audit.py	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py	2009-04-24 13:19:39.000000000 -0400
+@@ -47,6 +47,17 @@
+                               stdout=subprocess.PIPE).communicate()[0]
+     return output
+ 
++def get_log_msgs():
++    """Obtain all of the avc and policy load messages from /var/log/messages.
++
++    Returns:
++       string contain all of the audit messages returned by /var/log/messages.
++    """
++    import subprocess
++    output = subprocess.Popen(["/bin/grep", "avc",  "/var/log/messages"],
++                              stdout=subprocess.PIPE).communicate()[0]
++    return output
++
+ # Classes representing audit messages
+ 
+ class AuditMessage:
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-02-18 16:52:27.000000000 -0500
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-04-21 14:54:12.000000000 -0400
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.604
retrieving revision 1.605
diff -u -r1.604 -r1.605
--- policycoreutils.spec	16 Apr 2009 19:06:07 -0000	1.604
+++ policycoreutils.spec	24 Apr 2009 17:57:47 -0000	1.605
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 12%{?dist}
+Release: 12.1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
 fi
 
 %changelog
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.1
+- Fix audit2allow -a to read /var/log/messages
+
 * Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12
 - Add semanage module support