diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 6e18e36..285b324 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -655466,7 +655466,7 @@ index 0000000..e2befdb + packages=["policycoreutils"], +) diff --git a/policycoreutils-2.4/semanage/semanage b/policycoreutils-2.4/semanage/semanage -index dd63010..7fd02ed 100644 +index dd63010..69b9c49 100644 --- a/policycoreutils-2.4/semanage/semanage +++ b/policycoreutils-2.4/semanage/semanage @@ -1,4 +1,4 @@ @@ -655688,6 +655688,15 @@ index dd63010..7fd02ed 100644 def setupBooleanParser(subparsers): generated_usage = generate_custom_usage(usage_boolean, usage_boolean_dict) +@@ -652,7 +666,7 @@ def setupPermissiveParser(subparsers): + parser_add_noheading(permissiveParser, "permissive") + parser_add_noreload(permissiveParser, "permissive") + parser_add_store(permissiveParser, "permissive") +- permissiveParser.add_argument('type', nargs='?', default=None, help=_('type')) ++ permissiveParser.add_argument('type', nargs='+', default=None, help=_('type')) + permissiveParser.set_defaults(func=handlePermissive) + + def handleDontaudit(args): @@ -670,11 +684,11 @@ def setupDontauditParser(subparsers): def handleExport(args): manageditems=[ "boolean", "login", "interface", "user", "port", "node", "fcontext", "module"] diff --git a/policycoreutils.spec b/policycoreutils.spec index ba07ac7..04ef4af 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.4 -Release: 18%{?dist} +Release: 19%{?dist} 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 from https://github.com/fedora-selinux/selinux/ -# HEAD https://github.com/fedora-selinux/selinux/commit/ea4e1e35ce8a9150128484f8da20087fc01c71bb +# HEAD https://github.com/fedora-selinux/selinux/commit/d0f3cdcf325dc08aae2a2884c9cdcb35d82baf19 Patch: policycoreutils-rhat.patch Patch1: sepolgen-rhat.patch Patch100: policycoreutils-fix-semanage-python3.patch @@ -404,6 +404,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Tue Nov 17 2015 Petr Lautrbach 2.4-19 +- Require at least one argument for 'semanage permissive -d' (#1255676) + * Mon Nov 16 2015 Petr Lautrbach 2.4-18 - Improve sepolicy command line interface - Fix sandbox to propagate specified MCS/MLS Security Level. (#1279006)