rpms/policycoreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Fri Sep 12 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-9

Browse Source 
- Fix semanage help display
This commit is contained in:
Daniel J Walsh 2008-09-12 15:45:19 +00:00
parent 8bd2afcec2
commit 77ffddfa2c
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
policycoreutils-rhat.patch
View File

@ -92,7 +92,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po
} }
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2008-08-28 09:34:24.000000000 -0400 --- nsapolicycoreutils/semanage/semanage 2008-08-28 09:34:24.000000000 -0400
+++ policycoreutils-2.0.55/semanage/semanage 2008-09-08 14:46:57.000000000 -0400 +++ policycoreutils-2.0.55/semanage/semanage 2008-09-12 11:43:28.000000000 -0400
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
# 02111-1307 USA # 02111-1307 USA
# #
@ -107,7 +107,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po
def usage(message = ""): def usage(message = ""):
- print _(""" - print _("""
+ raise ValueError(_(""" + text = _("""
+semanage [ -S store ] -i [ input_file | - ] +semanage [ -S store ] -i [ input_file | - ]
+ +
semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n] semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
@ -121,15 +121,16 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po
-l, --list List the OBJECTS -l, --list List the OBJECTS
-C, --locallist List OBJECTS local customizations -C, --locallist List OBJECTS local customizations
-D, --deleteall Remove all OBJECTS local customizations -D, --deleteall Remove all OBJECTS local customizations
@@ -91,9 +94,8 @@ @@ -90,10 +93,9 @@
-s, --seuser SELinux User Name -s, --seuser SELinux User Name
-t, --type SELinux Type for the object -t, --type SELinux Type for the object
-r, --range MLS/MCS Security Range (MLS/MCS Systems only) - -r, --range MLS/MCS Security Range (MLS/MCS Systems only)
-""") + -r, --range MLS/MCS Security Range (MLS/MCS Systems only
""")
- print message - print message
- sys.exit(1) - sys.exit(1)
+%s + raise ValueError("%s\n%s" % (text, message))
+""") % message)
def errorExit(error): def errorExit(error):
sys.stderr.write("%s: " % sys.argv[0]) sys.stderr.write("%s: " % sys.argv[0])
@ -204,7 +205,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po
+ object = argv[0] + object = argv[0]
option_dict=get_options() option_dict=get_options()
if object not in option_dict.keys(): if object not in option_dict.keys():
usage(_("%s not defined") % object) - usage(_("%s not defined") % object)
+ usage(_("Invalid parameter %s not defined") % object)
- args = sys.argv[2:] - args = sys.argv[2:]
+ args = argv[1:] + args = argv[1:]

5
policycoreutils.spec
View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.0.55 Version: 2.0.55
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -192,6 +192,9 @@ if [ "$1" -ge "1" ]; then
fi fi
%changelog %changelog
* Fri Sep 12 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-9
- Fix semanage help display
* Thu Sep 11 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-8 * Thu Sep 11 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-8
- Only call gen_requires once in sepolgen - Only call gen_requires once in sepolgen