From 7d5dc44b356d16290a36f0399f2d175b88eba83e Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sat, 16 Dec 2023 16:21:42 +0800
Subject: setools: upgrade 4.4.3 -> 4.4.4

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

* Refresh local patch

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
---
 .../setools4-fixes-for-cross-compiling.patch       |  8 ++---
 recipes-security/setools/setools_4.4.3.bb          | 38 ----------------------
 recipes-security/setools/setools_4.4.4.bb          | 38 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 recipes-security/setools/setools_4.4.3.bb
 create mode 100644 recipes-security/setools/setools_4.4.4.bb

diff --git a/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch b/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch
index 51c7603..cdaa45c 100644
--- a/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch
+++ b/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch
@@ -1,4 +1,4 @@
-From e0a112874d10dbf741c27b107edddedd86d51529 Mon Sep 17 00:00:00 2001
+From 673bac44ce13f475845e0b69dc73bfaa5a0866aa Mon Sep 17 00:00:00 2001
 From: Wenzong Fan <wenzong.fan@windriver.com>
 Date: Tue, 14 Feb 2017 06:32:35 +0000
 Subject: [PATCH] setools4: fixes for cross compiling
@@ -15,10 +15,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index ac8a876..df7ebbc 100644
+index 5584e55..057bbb5 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -78,7 +78,7 @@ class QtHelpCommand(Command):
+@@ -79,7 +79,7 @@ class QtHelpCommand(Command):
  
  
  # Library linkage
@@ -28,5 +28,5 @@ index ac8a876..df7ebbc 100644
  
  with suppress(KeyError):
 -- 
-2.7.4
+2.25.1
 
diff --git a/recipes-security/setools/setools_4.4.3.bb b/recipes-security/setools/setools_4.4.3.bb
deleted file mode 100644
index 313dd0b..0000000
--- a/recipes-security/setools/setools_4.4.3.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 = "d3dbddb4e162dda3a25c419d10afe042a3dff7fa"
-
-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.4.bb b/recipes-security/setools/setools_4.4.4.bb
new file mode 100644
index 0000000..37bb86a
--- /dev/null
+++ b/recipes-security/setools/setools_4.4.4.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 = "a04b015459512d0460ff6bc50f28d746861f4a0b"
+
+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