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

Fix handing of semanage with no args

Browse Source
This commit is contained in:
Dan Walsh 2013-06-05 13:26:26 -04:00
parent 4f084e9fcd
commit ad349ef1ad
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
policycoreutils-semanage.patch
View File

@ -1,6 +1,6 @@
diff -up policycoreutils-2.1.14/semanage/semanage.semanage policycoreutils-2.1.14/semanage/semanage diff -up policycoreutils-2.1.14/semanage/semanage.semanage policycoreutils-2.1.14/semanage/semanage
--- policycoreutils-2.1.14/semanage/semanage.semanage 2013-05-28 11:04:07.196665120 -0400 --- policycoreutils-2.1.14/semanage/semanage.semanage 2013-06-05 13:24:34.958339017 -0400
+++ policycoreutils-2.1.14/semanage/semanage 2013-05-28 11:04:21.122726993 -0400 +++ policycoreutils-2.1.14/semanage/semanage 2013-06-05 13:24:53.591429169 -0400
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
#! /usr/bin/python -Es #! /usr/bin/python -Es
-# Copyright (C) 2005-2012 Red Hat -# Copyright (C) 2005-2012 Red Hat
@ -10,7 +10,7 @@ diff -up policycoreutils-2.1.14/semanage/semanage.semanage policycoreutils-2.1.1
# see file 'COPYING' for use and warranty information # see file 'COPYING' for use and warranty information
# #
# semanage is a tool for managing SELinux configuration files # semanage is a tool for managing SELinux configuration files
@@ -19,567 +21,705 @@ @@ -19,567 +21,702 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA # 02111-1307 USA
# #
@ -696,18 +696,15 @@ diff -up policycoreutils-2.1.14/semanage/semanage.semanage policycoreutils-2.1.1
+ return commandParser + return commandParser
+ +
+def make_args(sys_args): +def make_args(sys_args):
+ args = None + args = []
+ + for i in sys_args:
+ # handle old '-o' and '-i" options for semanage + if i == '-o':
+ if sys_args[1] == "-o" and len(sys_args) == 3: + args += [ "export", "-f" ]
+ args = [ "export", "-f", sys_args[2] ] + continue
+ if sys_args[1] == "-S" and sys_args[3] == "-o" and len(sys_args) == 5: + if i == '-i':
+ args = [ "export", "-S", sys_args[2], "-f", sys_args[4] ] + args += [ "import", "-f" ]
+ if sys_args[1] == "-i" and len(sys_args) == 3: + continue
+ args = [ "import", "-f", sys.argv[2] ] + args.append(i)
+ if sys_args[1] == "-S" and sys_args[3] == "-i" and len(sys_args) == 5:
+ args = [ "import", "-S", sys_args[2], "-f", sys_args[4] ]
+
+ return args + return args
+ +
+def do_parser(): +def do_parser():

5
policycoreutils.spec
View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.1.14 Version: 2.1.14
Release: 48%{?dist} Release: 49%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
# Based on git repository with tag 20101221 # Based on git repository with tag 20101221
@ -311,6 +311,9 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service %systemd_postun_with_restart restorecond.service
%changelog %changelog
* Wed Jun 5 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-49
- Fix handing of semanage with no args
* Tue Jun 4 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-48 * Tue Jun 4 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-48
- Fix audit2allow -o to open file for append - Fix audit2allow -o to open file for append
- Fix the name of the spec file generated in the build script - Fix the name of the spec file generated in the build script