[yocto] [meta-selinux][PATCH 6/9] policycoreutils: uprev to 2.6 (20161014)

[wenzong.fan at windriver.com]

From: Wenzong Fan <wenzong.fan at windriver.com>

* rebase patch:
  - policycoreutils-process-ValueError-for-sepolicy-seobject.patch

Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
---
 ...-process-ValueError-for-sepolicy-seobject.patch | 34 ++++++++++++----------
 ...licycoreutils_2.5.bb => policycoreutils_2.6.bb} |  7 ++---
 2 files changed, 21 insertions(+), 20 deletions(-)
 rename recipes-security/selinux/{policycoreutils_2.5.bb => policycoreutils_2.6.bb} (68%)

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 <wenzong.fan at windriver.com>
 ---
- 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
+
diff --git a/recipes-security/selinux/policycoreutils_2.5.bb b/recipes-security/selinux/policycoreutils_2.6.bb
similarity index 68%
rename from recipes-security/selinux/policycoreutils_2.5.bb
rename to recipes-security/selinux/policycoreutils_2.6.bb
index 37d3870..6a625b3 100644
--- a/recipes-security/selinux/policycoreutils_2.5.bb
+++ b/recipes-security/selinux/policycoreutils_2.6.bb
@@ -1,10 +1,10 @@
-include selinux_20160223.inc
+include selinux_20161014.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
-SRC_URI[md5sum] = "9ad9331b2133262fb3f774359a7f4761"
-SRC_URI[sha256sum] = "329382cfe9fa977678abf541dcd8fe3847cf0c83b24654c8f7322343907078a1"
+SRC_URI[md5sum] = "0358f0136e2dd9a8c9e99f181aaab1b2"
+SRC_URI[sha256sum] = "68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29"
 
 SRC_URI += "\
 	file://policycoreutils-fix-sepolicy-install-path.patch \
@@ -14,5 +14,4 @@ SRC_URI += "\
 	file://policycoreutils-fix-TypeError-for-seobject.py.patch \
 	file://0001-mcstrans-fix-the-init-script.patch \
 	file://enable-mcstrans.patch \
-	file://policycoreutils-fts_flags-FTS_NOCHDIR.patch \
 	"
-- 
2.7.4