From 89fb392b5ff649e7dc1e55bb7466a927adc1cb75 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Thu, 5 Jan 2017 00:23:23 -0800 Subject: policycoreutils: uprev to 2.6 (20161014) * rebase patch: - policycoreutils-process-ValueError-for-sepolicy-seobject.patch Signed-off-by: Wenzong Fan Signed-off-by: Joe MacDonald --- ...-process-ValueError-for-sepolicy-seobject.patch | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'recipes-security/selinux/policycoreutils') diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-process-ValueError-for-sepolicy-seobject.patch b/recipes-security/selinux/policycoreutils/policycoreutils-process-ValueError-for-sepolicy-seobject.patch index e52e1d3..1929aa5 100644 --- a/recipes-security/selinux/policycoreutils/policycoreutils-process-ValueError-for-sepolicy-seobject.patch +++ b/recipes-security/selinux/policycoreutils/policycoreutils-process-ValueError-for-sepolicy-seobject.patch @@ -11,32 +11,31 @@ Uptream-Status: pending Signed-off-by: Wenzong Fan --- - semanage/semanage | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + semanage/semanage | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) -Index: policycoreutils-2.5/semanage/semanage -=================================================================== ---- policycoreutils-2.5.orig/semanage/semanage 2016-02-25 13:38:39.947975015 -0500 -+++ policycoreutils-2.5/semanage/semanage 2016-02-25 13:40:50.627974607 -0500 -@@ -24,9 +24,15 @@ - # +diff --git a/semanage/semanage b/semanage/semanage +index 19a6c51..c0083c6 100644 +--- a/semanage/semanage ++++ b/semanage/semanage +@@ -25,8 +25,14 @@ + import traceback import argparse -import seobject import sys - import gettext +try: -+ import seobject -+ import sepolicy ++ import seobject ++ import sepolicy +except ValueError, e: -+ print "Error: %s\n" % e -+ sys.exit(1) ++ print "Error: %s\n" % e ++ sys.exit(1) + PROGNAME = "policycoreutils" try: - kwargs = {} -@@ -66,9 +72,6 @@ - usage_boolean = "semanage boolean [-h] [-n] [-N] [-s STORE] [" + import gettext +@@ -67,9 +73,6 @@ usage_interface_dict = {' --add': ('-t TYPE', '-r RANGE', 'interface'), ' --modi + usage_boolean = "semanage boolean [-h] [-n] [-N] [-S STORE] [" usage_boolean_dict = {' --modify': ('(', '--on', '|', '--off', ')', 'boolean'), ' --list': ('-C',), ' --extract': ('',), ' --deleteall': ('',)} -import sepolicy @@ -45,3 +44,6 @@ Index: policycoreutils-2.5/semanage/semanage class CheckRole(argparse.Action): def __call__(self, parser, namespace, value, option_string=None): +-- +2.7.4 + -- cgit v1.2.3-54-g00ecf