rpms/policycoreutils/devel policycoreutils-rhat.patch,1.123,1.124

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Nov 30 20:07:43 UTC 2005


Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6788

Modified Files:
	policycoreutils-rhat.patch 
Log Message:


policycoreutils-rhat.patch:
 audit2allow/audit2allow             |  213 ++++++++++++++++++++++++++----------
 audit2allow/audit2allow.1           |   35 +++--
 scripts/genhomedircon               |    4 
 semodule/Makefile                   |    2 
 semodule/semodule.8                 |   53 ++++++++
 semodule_expand/Makefile            |    3 
 semodule_expand/semodule_expand.8   |   26 ++++
 semodule_link/Makefile              |    3 
 semodule_link/semodule_link.8       |   27 ++++
 semodule_package/Makefile           |    3 
 semodule_package/semodule_package.8 |   29 ++++
 11 files changed, 325 insertions(+), 73 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- policycoreutils-rhat.patch	30 Nov 2005 19:32:20 -0000	1.123
+++ policycoreutils-rhat.patch	30 Nov 2005 20:07:41 -0000	1.124
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.27.30/audit2allow/audit2allow
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.27.31/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2005-11-29 13:43:42.000000000 -0500
-+++ policycoreutils-1.27.30/audit2allow/audit2allow	2005-11-30 13:40:16.000000000 -0500
++++ policycoreutils-1.27.31/audit2allow/audit2allow	2005-11-30 14:51:35.000000000 -0500
 @@ -25,8 +25,9 @@
  #
  #  
@@ -338,8 +338,9 @@
 +		out=seruleRecords(input, last_reload, verbose, te_ind)
 +
  		if auditlogs:
- 			input=open("/var/log/audit/audit.log", "r")
+-			input=open("/var/log/audit/audit.log", "r")
 -		out.load(input)
++			input=os.popen("ausearch -m avc")
 +			out.load(input)
 +
  		if buildPP:
@@ -361,9 +362,9 @@
  				if rc[0]==0:
  					print ("\n******************** IMPORTANT ***********************\n")
  					print ("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n" % module)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.27.30/audit2allow/audit2allow.1
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.27.31/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2005-11-29 13:43:42.000000000 -0500
-+++ policycoreutils-1.27.30/audit2allow/audit2allow.1	2005-11-30 13:45:15.000000000 -0500
++++ policycoreutils-1.27.31/audit2allow/audit2allow.1	2005-11-30 14:53:31.000000000 -0500
 @@ -33,37 +33,44 @@
  .B "\-a" | "\-\-all"
  Read input from audit and message log, conflicts with -i
@@ -374,8 +375,10 @@
  .B "\-d" | "\-\-dmesg"
  Read input from output of 
  .I /bin/dmesg.
- Note that audit messages are not available via dmesg when
- auditd is running; use -i /var/log/audit/audit.log instead.
+-Note that audit messages are not available via dmesg when
+-auditd is running; use -i /var/log/audit/audit.log instead.
++Note that all audit messages are not available via dmesg when
++auditd is running; use "ausearch -m avc | audit2allow"  or "-a" instead.
  .TP
 -.B "\-v" | "\-\-verbose"
 -Turn on verbose output
@@ -421,9 +424,9 @@
  .SH DESCRIPTION
  .PP
  This utility scans the logs for messages logged when the system denied
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.27.30/scripts/genhomedircon
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.27.31/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2005-11-30 13:59:30.000000000 -0500
-+++ policycoreutils-1.27.30/scripts/genhomedircon	2005-11-30 10:35:24.000000000 -0500
++++ policycoreutils-1.27.31/scripts/genhomedircon	2005-11-30 14:31:26.000000000 -0500
 @@ -32,6 +32,8 @@
  fd=open("/etc/shells", 'r')
  VALID_SHELLS=fd.read().split('\n')
@@ -433,7 +436,7 @@
  
  def getStartingUID():
  	starting_uid = sys.maxint
-@@ -266,7 +271,7 @@
+@@ -266,7 +268,7 @@
  				homedir = u[5][:string.rfind(u[5], "/")]
  				if not homedir in homedirs:
  					if self.checkExists(homedir)==0:
@@ -442,9 +445,9 @@
  					else:
  						homedirs.append(homedir)
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule/Makefile policycoreutils-1.27.30/semodule/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule/Makefile policycoreutils-1.27.31/semodule/Makefile
 --- nsapolicycoreutils/semodule/Makefile	2005-10-10 09:02:48.000000000 -0400
-+++ policycoreutils-1.27.30/semodule/Makefile	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule/Makefile	2005-11-30 14:31:26.000000000 -0500
 @@ -17,6 +17,8 @@
  install: all
  	-mkdir -p $(SBINDIR)
@@ -454,9 +457,9 @@
  
  relabel:
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-1.27.30/semodule/semodule.8
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-1.27.31/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.27.30/semodule/semodule.8	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule/semodule.8	2005-11-30 14:31:26.000000000 -0500
 @@ -0,0 +1,53 @@
 +.TH SEMODULE "8" "Nov 2005" "Security Enhanced Linux" NSA
 +.SH NAME 
@@ -511,9 +514,9 @@
 +.nf
 +This manual page was written by Dan Walsh <dwalsh at redhat.com>.
 +The program was written by Karl MacMillan <kmacmillan at tresys.com>, Joshua Brindle <jbrindle at tresys.com>, Jason Tang <jtang at tresys.com>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_expand/Makefile policycoreutils-1.27.30/semodule_expand/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_expand/Makefile policycoreutils-1.27.31/semodule_expand/Makefile
 --- nsapolicycoreutils/semodule_expand/Makefile	2005-10-12 15:25:33.000000000 -0400
-+++ policycoreutils-1.27.30/semodule_expand/Makefile	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule_expand/Makefile	2005-11-30 14:31:26.000000000 -0500
 @@ -3,6 +3,7 @@
  INCLUDEDIR ?= $(PREFIX)/include
  BINDIR ?= $(PREFIX)/bin
@@ -531,9 +534,9 @@
  
  relabel:
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_expand/semodule_expand.8 policycoreutils-1.27.30/semodule_expand/semodule_expand.8
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_expand/semodule_expand.8 policycoreutils-1.27.31/semodule_expand/semodule_expand.8
 --- nsapolicycoreutils/semodule_expand/semodule_expand.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.27.30/semodule_expand/semodule_expand.8	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule_expand/semodule_expand.8	2005-11-30 14:31:26.000000000 -0500
 @@ -0,0 +1,26 @@
 +.TH SEMODULE_EXPAND "8" "Nov 2005" "Security Enhanced Linux" NSA
 +.SH NAME 
@@ -561,9 +564,9 @@
 +.nf
 +This manual page was written by Dan Walsh <dwalsh at redhat.com>.
 +The program was written by Karl MacMillan <kmacmillan at tresys.com>, Joshua Brindle <jbrindle at tresys.com>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_link/Makefile policycoreutils-1.27.30/semodule_link/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_link/Makefile policycoreutils-1.27.31/semodule_link/Makefile
 --- nsapolicycoreutils/semodule_link/Makefile	2005-10-12 15:25:33.000000000 -0400
-+++ policycoreutils-1.27.30/semodule_link/Makefile	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule_link/Makefile	2005-11-30 14:31:26.000000000 -0500
 @@ -2,6 +2,7 @@
  PREFIX ?= ${DESTDIR}/usr
  INCLUDEDIR ?= $(PREFIX)/include
@@ -581,9 +584,9 @@
  
  relabel:
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_link/semodule_link.8 policycoreutils-1.27.30/semodule_link/semodule_link.8
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_link/semodule_link.8 policycoreutils-1.27.31/semodule_link/semodule_link.8
 --- nsapolicycoreutils/semodule_link/semodule_link.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.27.30/semodule_link/semodule_link.8	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule_link/semodule_link.8	2005-11-30 14:31:26.000000000 -0500
 @@ -0,0 +1,27 @@
 +.TH SEMODULE_LINK "8" "Nov 2005" "Security Enhanced Linux" NSA
 +.SH NAME 
@@ -612,9 +615,9 @@
 +.nf
 +This manual page was written by Dan Walsh <dwalsh at redhat.com>.
 +The program was written by Karl MacMillan <kmacmillan at tresys.com>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_package/Makefile policycoreutils-1.27.30/semodule_package/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_package/Makefile policycoreutils-1.27.31/semodule_package/Makefile
 --- nsapolicycoreutils/semodule_package/Makefile	2005-10-12 15:25:33.000000000 -0400
-+++ policycoreutils-1.27.30/semodule_package/Makefile	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule_package/Makefile	2005-11-30 14:31:26.000000000 -0500
 @@ -3,6 +3,7 @@
  INCLUDEDIR ?= $(PREFIX)/include
  BINDIR ?= $(PREFIX)/bin
@@ -632,9 +635,9 @@
  
  relabel:
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_package/semodule_package.8 policycoreutils-1.27.30/semodule_package/semodule_package.8
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_package/semodule_package.8 policycoreutils-1.27.31/semodule_package/semodule_package.8
 --- nsapolicycoreutils/semodule_package/semodule_package.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.27.30/semodule_package/semodule_package.8	2005-11-30 10:35:13.000000000 -0500
++++ policycoreutils-1.27.31/semodule_package/semodule_package.8	2005-11-30 14:31:26.000000000 -0500
 @@ -0,0 +1,29 @@
 +.TH SEMODULE_PACKAGE "8" "Nov 2005" "Security Enhanced Linux" NSA
 +.SH NAME 




More information about the fedora-cvs-commits mailing list