setools 4.4.0-1 update

3 files changed, 12 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16a8bf0a84e7..dee97c804829 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = setools
 	pkgdesc = Policy analysis tools for SELinux
-	pkgver = 4.3.0
-	pkgrel = 2
+	pkgver = 4.4.0
+	pkgrel = 1
 	url = https://github.com/SELinuxProject/setools/wiki
 	arch = i686
 	arch = x86_64
@@ -11,19 +11,17 @@ pkgbase = setools
 	checkdepends = checkpolicy
 	makedepends = cython
 	makedepends = python-tox
-	depends = libsepol>=2.8
-	depends = libselinux>=2.8
+	depends = libsepol>=3.2
+	depends = libselinux>=3.2
 	depends = python
 	depends = python-networkx>=2.0
 	depends = python-setuptools
 	optdepends = python-pyqt5: needed for graphical tools
 	optdepends = qt5-tools: display apol help with Qt Assistant
-	provides = selinux-setools=4.3.0-2
+	provides = selinux-setools=4.4.0-1
 	conflicts = selinux-setools
-	source = https://github.com/SELinuxProject/setools/releases/download/4.3.0/setools-4.3.0.tar.bz2
-	source = 0001-Disable-deprecated-function-warnings-to-fix-build-wi.patch
-	sha256sums = 315df3ae0eb29b399123c5e3330480c5d1c0da038671c9fd62a439c49a6f9105
-	sha256sums = 95973be9faf3380986b0cf5969b9e28d1ba4d8eea7d78e24786c49871977cd40
+	source = https://github.com/SELinuxProject/setools/releases/download/4.4.0/setools-4.4.0.tar.bz2
+	sha256sums = f3786677e40b7f16a226f48f233dcf835e700739614a7dbed2ff61cc9607814e
 
 pkgname = setools
 
diff --git a/0001-Disable-deprecated-function-warnings-to-fix-build-wi.patch b/0001-Disable-deprecated-function-warnings-to-fix-build-wi.patch
deleted file mode 100644
index b2c55ffd37de..000000000000
--- a/0001-Disable-deprecated-function-warnings-to-fix-build-wi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6c7238fcd0eca358686076d4db940d67a509e303 Mon Sep 17 00:00:00 2001
-From: Nicolas Iooss <nicolas.iooss@m4x.org>
-Date: Sat, 5 Dec 2020 17:24:51 +0100
-Subject: [PATCH 1/1] Disable deprecated function warnings to fix build with
- Cython 0.29.21 and Python 3.9
-
-Fixes: https://github.com/SELinuxProject/setools/issues/54
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index 457c83049ca5..0f717c5a1d0b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -126,6 +126,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'],
-                                              '-Wno-unreachable-code',
-                                              '-Wno-implicit-fallthrough',
-                                              '-Wno-cast-function-type',
-+                                             '-Wno-error=deprecated-declarations',
-                                              '-fno-exceptions'])]
- 
- installed_data = [('share/man/man1', glob.glob("man/*.1"))]
--- 
-2.29.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 0a4e2ccfb6ff..8021f5c5da69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,31 +18,22 @@
 #   - replace setools 3.3.8 with setools3-libs and install setools then.
 
 pkgname=setools
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.4.0
+pkgrel=1
 pkgdesc="Policy analysis tools for SELinux"
 groups=('selinux')
 arch=('i686' 'x86_64')
 url="https://github.com/SELinuxProject/setools/wiki"
 license=('GPL' 'LGPL')
-depends=('libsepol>=2.8' 'libselinux>=2.8' 'python' 'python-networkx>=2.0' 'python-setuptools')
+depends=('libsepol>=3.2' 'libselinux>=3.2' 'python' 'python-networkx>=2.0' 'python-setuptools')
 optdepends=('python-pyqt5: needed for graphical tools'
             'qt5-tools: display apol help with Qt Assistant')
 makedepends=('cython' 'python-tox')
 checkdepends=('checkpolicy')
 conflicts=("selinux-${pkgname}")
 provides=("selinux-${pkgname}=${pkgver}-${pkgrel}")
-source=("https://github.com/SELinuxProject/setools/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        '0001-Disable-deprecated-function-warnings-to-fix-build-wi.patch')
-sha256sums=('315df3ae0eb29b399123c5e3330480c5d1c0da038671c9fd62a439c49a6f9105'
-            '95973be9faf3380986b0cf5969b9e28d1ba4d8eea7d78e24786c49871977cd40')
-
-prepare() {
-  cd "${pkgname}"
-  # Fix compatibility issues with Cython 0.29.21 and Python 3.9
-  # https://github.com/SELinuxProject/setools/issues/54
-  patch -Np1 -i ../0001-Disable-deprecated-function-warnings-to-fix-build-wi.patch
-}
+source=("https://github.com/SELinuxProject/setools/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('f3786677e40b7f16a226f48f233dcf835e700739614a7dbed2ff61cc9607814e')
 
 build() {
   cd "${pkgname}"