* Wed Jan 25 2006 Dan Walsh <dwalsh@redhat.com> 1.29.11-3
- Cleanup of the patch
This commit is contained in:
Daniel J Walsh
parent
a1b21192f2
commit
a336777890
@ -45,7 +45,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycore
|
||||
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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy
|
||||
'
|
||||
print message
|
||||
sys.exit(1)
|
||||
@@ -62,35 +61,29 @@
|
||||
@@ -62,35 +61,27 @@
|
||||
sys.stderr.flush()
|
||||
sys.exit(1)
|
||||
|
||||
@ -116,15 +116,13 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy
|
||||
+ 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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy
|
||||
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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy
|
||||
+
|
||||
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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy
|
||||
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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy
|
||||
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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy
|
||||
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 policy
|
||||
|
||||
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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 poli
|
||||
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
|
||||
|
||||
@ -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 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%{_libdir}/python2.4/site-packages/seobject.py*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 25 2006 Dan Walsh <dwalsh@redhat.com> 1.29.11-3
|
||||
- Cleanup of the patch
|
||||
|
||||
* Wed Jan 25 2006 Dan Walsh <dwalsh@redhat.com> 1.29.11-2
|
||||
- Correct handling of symbolic links in restorecon
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user