selinux-python 2.9-1 update

3 files changed, 9 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23377f94b79c..8d57c8323145 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = selinux-python
 	pkgdesc = SELinux python tools and libraries
-	pkgver = 2.8
-	pkgrel = 3
+	pkgver = 2.9
+	pkgrel = 1
 	url = https://github.com/SELinuxProject/selinux/wiki
 	arch = i686
 	arch = x86_64
@@ -12,13 +12,11 @@ pkgbase = selinux-python
 	makedepends = python-ipy
 	makedepends = libsemanage>=2.8
 	makedepends = setools>=4.0.0
-	provides = sepolgen=2.8-3
+	provides = sepolgen=2.9-1
 	conflicts = sepolgen<2.7
 	conflicts = policycoreutils<2.7
-	source = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/selinux-python-2.8.tar.gz
-	source = 0001-python-sepolicy-Update-to-work-with-setools-4.2.0.patch
-	sha256sums = e69f5e24820cb247a3d881a9c90efba1e64d76af863c82fb81bc3b87ed71e238
-	sha256sums = f95c0bb79f86c79abdbc1f3ec3bcb13294f2e10181df15d8ab5a8b54569918f1
+	source = https://github.com/SELinuxProject/selinux/releases/download/20190315/selinux-python-2.9.tar.gz
+	sha256sums = 3650b5393b0d1790cac66db00e34f059aa91c23cfe3c2559676594e295d75fde
 
 pkgname = selinux-python
 	depends = python
diff --git a/0001-python-sepolicy-Update-to-work-with-setools-4.2.0.patch b/0001-python-sepolicy-Update-to-work-with-setools-4.2.0.patch
deleted file mode 100644
index da57fa563b7b..000000000000
--- a/0001-python-sepolicy-Update-to-work-with-setools-4.2.0.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From e5f312667b8301b013533fd768e24d944b84c4b1 Mon Sep 17 00:00:00 2001
-From: Vit Mojzis <vmojzis@redhat.com>
-Date: Mon, 24 Sep 2018 11:05:49 +0200
-Subject: [PATCH 1/1] python/sepolicy: Update to work with setools-4.2.0
-
-Change in internal setools API causes sepolicy to crash when processing
-AVRules.
-
-    File "python/sepolicy/sepolicy/__init__.py", line 277, in _setools_rule_to_dict
-        if isinstance(rule, setools.policyrep.terule.AVRule):
-    AttributeError: module 'setools.policyrep' has no attribute 'terule'
-
-See https://github.com/SELinuxProject/setools/issues/8 for more details.
-
-Stop using internal setools API:
-
-- use AttributeError instead of setools specific exceptions
-- evaluate conditional expressions using conditional.evaluate() instead
-of qpol_symbol.is_enabled()
-
-Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
-Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
----
- python/sepolicy/sepolicy/__init__.py | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
-index 89346aba0b15..5d0535b9dd28 100644
---- a/python/sepolicy/sepolicy/__init__.py
-+++ b/python/sepolicy/sepolicy/__init__.py
-@@ -272,34 +272,38 @@ def _setools_rule_to_dict(rule):
-         'class': str(rule.tclass),
-     }
- 
-+    # Evaluate boolean expression associated with given rule (if there is any)
-     try:
--        enabled = bool(rule.qpol_symbol.is_enabled(rule.policy))
-+        # Get state of all booleans in the conditional expression
-+        boolstate = {}
-+        for boolean in rule.conditional.booleans:
-+            boolstate[str(boolean)] = boolean.state
-+        # evaluate if the rule is enabled
-+        enabled = rule.conditional.evaluate(**boolstate) == rule.conditional_block
-     except AttributeError:
-+        # non-conditional rules are always enabled
-         enabled = True
- 
--    if isinstance(rule, setools.policyrep.terule.AVRule):
--        d['enabled'] = enabled
-+    d['enabled'] = enabled
- 
-     try:
-         d['permlist'] = list(map(str, rule.perms))
--    except setools.policyrep.exception.RuleUseError:
-+    except AttributeError:
-         pass
- 
-     try:
-         d['transtype'] = str(rule.default)
--    except setools.policyrep.exception.RuleUseError:
-+    except AttributeError:
-         pass
- 
-     try:
-         d['boolean'] = [(str(rule.conditional), enabled)]
--    except (AttributeError, setools.policyrep.exception.RuleNotConditional):
-+    except AttributeError:
-         pass
- 
-     try:
-         d['filename'] = rule.filename
--    except (AttributeError,
--            setools.policyrep.exception.RuleNotConditional,
--            setools.policyrep.exception.TERuleNoFilename):
-+    except AttributeError:
-         pass
- 
-     return d
--- 
-2.19.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 0e84a70ad2fb..f33f9b28416e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgbase=selinux-python
 pkgname=(selinux-python selinux-python2)
-pkgver=2.8
-pkgrel=3
+pkgver=2.9
+pkgrel=1
 pkgdesc="SELinux python tools and libraries"
 groups=('selinux')
 arch=('i686' 'x86_64')
@@ -15,15 +15,8 @@ license=('GPL2')
 makedepends=('python2' 'python' 'python-ipy' 'libsemanage>=2.8' 'setools>=4.0.0')
 conflicts=('sepolgen<2.7' 'policycoreutils<2.7')
 provides=("sepolgen=${pkgver}-${pkgrel}")
-source=("https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/${pkgname}-${pkgver}.tar.gz"
-        '0001-python-sepolicy-Update-to-work-with-setools-4.2.0.patch')
-sha256sums=('e69f5e24820cb247a3d881a9c90efba1e64d76af863c82fb81bc3b87ed71e238'
-            'f95c0bb79f86c79abdbc1f3ec3bcb13294f2e10181df15d8ab5a8b54569918f1')
-
-prepare() {
-  cd "${pkgbase}-${pkgver}"
-  patch -p2 -i "$srcdir/0001-python-sepolicy-Update-to-work-with-setools-4.2.0.patch"
-}
+source=("https://github.com/SELinuxProject/selinux/releases/download/20190315/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('3650b5393b0d1790cac66db00e34f059aa91c23cfe3c2559676594e295d75fde')
 
 build() {
   cd "${pkgbase}-${pkgver}"