update from bachradsusi/selinux branch 2.4

policycoreutils-2.4-0.7
- Fix typo in semanage args for minimum policy store
This commit is contained in:
Petr Lautrbach 2015-07-15 16:11:56 +02:00
parent 4ec76c511d
commit 5f7a92e79b
2 changed files with 15 additions and 3 deletions

View File

@ -654686,7 +654686,7 @@ index 0000000..e2befdb
+ packages=["policycoreutils"],
+)
diff --git a/policycoreutils-2.4/semanage/semanage b/policycoreutils-2.4/semanage/semanage
index dd63010..9a33702 100644
index dd63010..7f32b40 100644
--- a/policycoreutils-2.4/semanage/semanage
+++ b/policycoreutils-2.4/semanage/semanage
@@ -18,24 +18,34 @@
@ -654942,6 +654942,15 @@ index dd63010..9a33702 100644
#To add a new subcommand define the parser for it in a function above and call it here.
subparsers = commandParser.add_subparsers(dest='subcommand')
setupImportParser(subparsers)
@@ -788,7 +798,7 @@ def createCommandParser():
def make_io_args(args):
# import/export backward compability
- args_origin = ["-S", "-o", "-i", "targeted", "minumum", "mls"]
+ args_origin = ["-S", "-o", "-i", "targeted", "minimum", "mls"]
args_file = []
args_ie = []
args_subcommand = []
@@ -808,6 +818,8 @@ def make_io_args(args):
return args_subcommand+args_ie+args_file

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.4
Release: 0%{?dist}.6
Release: 0%{?dist}.7
License: GPLv2
Group: System Environment/Base
# https://github.com/SELinuxProject/selinux/wiki/Releases
@ -18,7 +18,7 @@ Source2: policycoreutils_man_ru2.tar.bz2
Source3: system-config-selinux.png
Source4: sepolicy-icons.tgz
# use make-rhat-patches.sh to create following patches
# HEAD https://github.com/bachradsusi/selinux/commit/0eb3ecad178187fda63f5ecb0f8f661f87a9647f
# HEAD https://github.com/bachradsusi/selinux/commit/3cc9b4cd11d53e68656d371b9856a50c01257a04
Patch: policycoreutils-rhat.patch
Patch1: sepolgen-rhat.patch
Obsoletes: policycoreutils < 2.0.61-2
@ -387,6 +387,9 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service
%changelog
* Wed Jul 15 2015 Petr Lautrbach <plautrba@redhat.com> 2.4-0.7
- Fix typo in semanage args for minimum policy store
* Fri Jul 03 2015 Petr Lautrbach <plautrba@redhat.com> 2.4-0.6
- policycoreutils: semanage: update to new source policy infrastructure
- semanage: move permissive module creation to /tmp