From 6b87622198053a7f1e12aa4be3e60d186733165f Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 22 Sep 2025 15:02:09 +0800 Subject: [PATCH] setools: upgrade 4.5.1 -> 4.6.0 ChangeLog: https://github.com/SELinuxProject/setools/releases/tag/4.6.0 Signed-off-by: Yi Zhao --- .../setools4-fixes-for-cross-compiling.patch | 16 ++++++++-------- .../{setools_4.5.1.bb => setools_4.6.0.bb} | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) rename recipes-security/setools/{setools_4.5.1.bb => setools_4.6.0.bb} (90%) 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 cdaa45c..bc4cc1a 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 673bac44ce13f475845e0b69dc73bfaa5a0866aa Mon Sep 17 00:00:00 2001 +From fedbd32adb2a9ef2ce3cf9424791f6ca3dd84d88 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Tue, 14 Feb 2017 06:32:35 +0000 Subject: [PATCH] setools4: fixes for cross compiling @@ -15,18 +15,18 @@ Signed-off-by: Yi Zhao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 5584e55..057bbb5 100644 +index 0b8e3e9..a1ce872 100644 --- a/setup.py +++ b/setup.py -@@ -79,7 +79,7 @@ class QtHelpCommand(Command): +@@ -10,7 +10,7 @@ from Cython.Build import cythonize # Library linkage --lib_dirs = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib'] -+lib_dirs = [os.environ["STAGING_LIBDIR"]] - include_dirs = [] +-lib_dirs: list[str] = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib'] ++lib_dirs: list[str] = [os.environ["STAGING_LIBDIR"]] + include_dirs: list[str] = [] - with suppress(KeyError): + userspace_src = os.getenv("USERSPACE_SRC", "") -- -2.25.1 +2.34.1 diff --git a/recipes-security/setools/setools_4.5.1.bb b/recipes-security/setools/setools_4.6.0.bb similarity index 90% rename from recipes-security/setools/setools_4.5.1.bb rename to recipes-security/setools/setools_4.6.0.bb index aaaace5..1c8bc79 100644 --- a/recipes-security/setools/setools_4.5.1.bb +++ b/recipes-security/setools/setools_4.6.0.bb @@ -5,10 +5,10 @@ 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.5;protocol=https \ +SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.6;protocol=https \ file://setools4-fixes-for-cross-compiling.patch \ " -SRCREV = "659ec47aba0126e3a198362ed1659bf600c067eb" +SRCREV = "dfb95f338264f2d7ecab46b39479e4c29e44c09e" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=69a7b68f0a4a570d7c0c43465333ecbc \ file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \