From ac47a5e32567301433f088a233bde100da0d9916 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sat, 13 Mar 2021 13:50:44 +0800
Subject: setools: upgrade 4.3.0 -> 4.4.0

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
---
 recipes-security/setools/setools_4.3.0.bb | 45 -------------------------------
 recipes-security/setools/setools_4.4.0.bb | 43 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 45 deletions(-)
 delete mode 100644 recipes-security/setools/setools_4.3.0.bb
 create mode 100644 recipes-security/setools/setools_4.4.0.bb

diff --git a/recipes-security/setools/setools_4.3.0.bb b/recipes-security/setools/setools_4.3.0.bb
deleted file mode 100644
index 0f166c8..0000000
--- a/recipes-security/setools/setools_4.3.0.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Policy analysis tools for SELinux"
-DESCRIPTION = "\
-SETools is a collection of graphical tools, command-line tools, and \
-libraries designed to facilitate SELinux policy analysis. \
-\n\
-This meta-package depends upon the main packages necessary to run \
-SETools."
-SECTION = "base"
-LICENSE = "GPLv2 & LGPLv2.1"
-
-BBCLASSEXTEND = "native nativesdk "
-
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.3 \
-           file://setools4-fixes-for-cross-compiling.patch \
-"
-
-SRCREV = "a57ad3cdb669a39f785c4e85d63416a469c8d445"
-
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=83a5eb6974c11f30785e90d0eeccf40c \
-                    file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://${S}/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS += "bison-native flex-native swig-native python3 python3-cython-native libsepol libselinux"
-
-DEPENDS_class-native += "libselinux python3-setuptools python3-cython python3-networkx"
-
-RDEPENDS_${PN} += "python3-networkx python3-decorator python3-setuptools \
-                   python3-logging python3-json libselinux-python"
-
-RDEPENDS_${PN}_class-native = ""
-
-CFLAGS_append = " -Wno-deprecated-declarations"
-
-RPROVIDES_${PN} += "${PN}-console"
-
-inherit setuptools3
-
-do_install_append() {
-	# Need PyQt5 support, disable gui tools
-	rm -f ${D}${bindir}/apol
-	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setoolsgui
-	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setools/__pycache__
-	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setools/*/__pycache__
-}
diff --git a/recipes-security/setools/setools_4.4.0.bb b/recipes-security/setools/setools_4.4.0.bb
new file mode 100644
index 0000000..4dd094f
--- /dev/null
+++ b/recipes-security/setools/setools_4.4.0.bb
@@ -0,0 +1,43 @@
+SUMMARY = "Policy analysis tools for SELinux"
+DESCRIPTION = "\
+SETools is a collection of graphical tools, command-line tools, and \
+libraries designed to facilitate SELinux policy analysis. \
+\n\
+This meta-package depends upon the main packages necessary to run \
+SETools."
+SECTION = "base"
+LICENSE = "GPLv2 & LGPLv2.1"
+
+BBCLASSEXTEND = "native nativesdk "
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.4 \
+           file://setools4-fixes-for-cross-compiling.patch \
+"
+
+SRCREV = "4758cdf803d93274f49cb6445cb2bab527d6549f"
+
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=83a5eb6974c11f30785e90d0eeccf40c \
+                    file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://${S}/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS += "bison-native flex-native swig-native python3 python3-cython-native libsepol libselinux"
+
+DEPENDS_class-native += "libselinux python3-setuptools python3-cython python3-networkx"
+
+RDEPENDS_${PN} += "python3-networkx python3-decorator python3-setuptools \
+                   python3-logging python3-json libselinux-python"
+
+RDEPENDS_${PN}_class-native = ""
+
+RPROVIDES_${PN} += "${PN}-console"
+
+inherit setuptools3
+
+do_install_append() {
+	# Need PyQt5 support, disable gui tools
+	rm -f ${D}${bindir}/apol
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setoolsgui
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setools/__pycache__
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setools/*/__pycache__
+}
-- 
cgit v1.2.3-54-g00ecf