From 0c8af77822e24da0eec12823342550512463e707 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@eng.windriver.com>
Date: Tue, 25 Apr 2023 17:46:19 +0800
Subject: setools: upgrade 4.1 -> 4.2

ChangeLog:
https://github.com/SELinuxProject/setools/releases/tag/4.4.2

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

diff --git a/recipes-security/setools/setools_4.4.1.bb b/recipes-security/setools/setools_4.4.1.bb
deleted file mode 100644
index 8ed8f19..0000000
--- a/recipes-security/setools/setools_4.4.1.bb
+++ /dev/null
@@ -1,38 +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."
-SECTION = "base"
-LICENSE = "GPL-2.0-only & LGPL-2.1-only"
-
-SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.4;protocol=https \
-           file://setools4-fixes-for-cross-compiling.patch \
-          "
-SRCREV = "bec5c81d4fc41c45c63f0ba19f132fab94f8d2e5"
-
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=69a7b68f0a4a570d7c0c43465333ecbc \
-                    file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://${S}/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "python3-cython-native libsepol libselinux"
-
-RDEPENDS:${PN} = "python3-networkx python3-setuptools \
-                  python3-logging libselinux-python"
-
-RPROVIDES:${PN} = "${PN}-console"
-
-inherit setuptools3
-
-do_install:prepend() {
-    sed -i -e 's:${RECIPE_SYSROOT}::g' ${S}/setools/policyrep.c
-}
-
-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.2.bb b/recipes-security/setools/setools_4.4.2.bb
new file mode 100644
index 0000000..4e41c69
--- /dev/null
+++ b/recipes-security/setools/setools_4.4.2.bb
@@ -0,0 +1,38 @@
+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."
+SECTION = "base"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+
+SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.4;protocol=https \
+           file://setools4-fixes-for-cross-compiling.patch \
+          "
+SRCREV = "d8d0dcc4c70c858784b56c5400203d52dfe01755"
+
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=69a7b68f0a4a570d7c0c43465333ecbc \
+                    file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://${S}/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "python3-cython-native libsepol libselinux"
+
+RDEPENDS:${PN} = "python3-networkx python3-setuptools \
+                  python3-logging libselinux-python"
+
+RPROVIDES:${PN} = "${PN}-console"
+
+inherit setuptools3
+
+do_install:prepend() {
+    sed -i -e 's:${RECIPE_SYSROOT}::g' ${S}/setools/policyrep.c
+}
+
+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