rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.156, 1.157 policycoreutils.spec, 1.226, 1.227

Thu Jan 26 17:22:08 UTC 2006

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Jan 25 2006 Dan Walsh <dwalsh at redhat.com> 1.29.11-3
- Cleanup of the patch


policycoreutils-rhat.patch:
 restorecon/restorecon.c |    8 +-
 scripts/chcat           |    2 
 semanage/semanage       |  148 ++++++++++--------------------------------------
 semanage/semanage.8     |   26 ++++----
 4 files changed, 52 insertions(+), 132 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157

--- policycoreutils-rhat.patch	25 Jan 2006 19:07:56 -0000	1.156
+++ policycoreutils-rhat.patch	26 Jan 2006 17:22:04 -0000	1.157
@@ -45,7 +45,7 @@
      if delete_ind:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.11/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2006-01-20 10:37:37.000000000 -0500
-+++ policycoreutils-1.29.11/semanage/semanage	2006-01-25 11:13:33.000000000 -0500
++++ policycoreutils-1.29.11/semanage/semanage	2006-01-26 12:17:30.000000000 -0500
 @@ -30,28 +30,27 @@
  
  	def usage(message = ""):
@@ -80,7 +80,7 @@
  '
  		print message
  		sys.exit(1)
-@@ -62,35 +61,29 @@
+@@ -62,35 +61,27 @@
  		sys.stderr.flush()
  		sys.exit(1)
  
@@ -116,15 +116,13 @@
 +		valid_option["user"] = []
 +		valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles' ] 
 +		valid_option["port"] = []
-+		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range'] 
-+		valid_option["port"] = []
 +		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--protocol' ] 
 +		valid_option["interface"] = []
 +		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] 
 +		valid_option["fcontext"] = []
 +		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
 +		valid_option["translation"] = []
-+		valid_option["fcontext"] += valid_everyone + [ '-T', '--trans' ] 
++		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
 +		return valid_option
 +
  	#
@@ -135,7 +133,7 @@
  		input = sys.stdin
  		output = sys.stdout
  		serange = ""
-@@ -112,12 +105,14 @@
+@@ -112,12 +103,14 @@
  			usage("Requires 2 or more arguments")
  			
  		object = sys.argv[1]
@@ -148,11 +146,11 @@
 +
  		gopts, cmds = getopt.getopt(args,
 -					    'adf:lhmnp:P:s:R:L:r:t:vT:',
-+					    'adf:lhmnp:s:R:L:r:t:vT:',
++					    'adf:lhmnp:s:R:L:r:t:T:',
  					    ['add',
  					     'delete',
  					     'ftype=',
-@@ -125,16 +120,18 @@
+@@ -125,16 +118,18 @@
  					     'list', 
  					     'modify',
  					     'noheading',
@@ -174,7 +172,7 @@
  		for o,a in gopts:
  			if o == "-a" or o == "--add":
  				if modify or delete:
-@@ -167,11 +164,11 @@
+@@ -167,7 +162,7 @@
  			if o == "-L" or o == '--level':
  				selevel = a
  
@@ -183,15 +181,13 @@
  				proto = a
  
  			if o == "-R" or o == '--roles':
--				roles = roles + " " + a
-+				roles = a
- 
- 			if o == "-s" or o == "--seuser":
- 				seuser = a
-@@ -185,91 +182,25 @@
- 			if o == "-v" or o == "--verbose":
- 				verbose = 1
- 
+@@ -182,94 +177,25 @@
+ 			if o == "-T" or o == "--trans":
+ 				setrans = a
+ 
+-			if o == "-v" or o == "--verbose":
+-				verbose = 1
+-
 -# Note in this section I intentionally leave the unwanted_*() functions for
 -# variabled which are wanted commented out and don't delete those lines.  This
 -# will make it easier to modify the code when the list of wanted variables
@@ -280,7 +276,7 @@
  			OBJECT.list(heading)
  			sys.exit(0);
  			
-@@ -324,16 +255,6 @@
+@@ -324,16 +250,6 @@
  			sys.exit(0);
  
  		if delete:
@@ -299,7 +295,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.11/semanage/semanage.8
 --- nsapolicycoreutils/semanage/semanage.8	2006-01-20 10:37:37.000000000 -0500
-+++ policycoreutils-1.29.11/semanage/semanage.8	2006-01-25 11:13:33.000000000 -0500
++++ policycoreutils-1.29.11/semanage/semanage.8	2006-01-26 12:13:43.000000000 -0500
 @@ -3,19 +3,19 @@
  semanage \- SELinux Policy Management tool
  
@@ -363,7 +359,7 @@
  MLS/MCS Security Range
  .TP
 +.I                \-R, \-\-role
-+SELinux Roles.  You must inclose multiple roles within quotes, separate by spaces.
++SELinux Roles.  You must inclose multiple roles within quotes, separate by spaces. Or specify \-R multiple times.
 +.TP
  .I                \-s, \-\-seuser     
  SELinux user name


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- policycoreutils.spec	25 Jan 2006 19:07:56 -0000	1.226
+++ policycoreutils.spec	26 Jan 2006 17:22:04 -0000	1.227
@@ -4,7 +4,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.29.11
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -97,6 +97,9 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Wed Jan 25 2006 Dan Walsh <dwalsh at redhat.com> 1.29.11-3
+- Cleanup of the patch
+
 * Wed Jan 25 2006 Dan Walsh <dwalsh at redhat.com> 1.29.11-2
 - Correct handling of symbolic links in restorecon
 


