diff mbox series

[meta-selinux,15/15] setools: upgrade 4.4.3 -> 4.4.4

Message ID 20231216082142.198501-15-yi.zhao@windriver.com
State New
Headers show
Series [[meta-selinux] PATCH 02/15] libsepol: upgrade 3.5 -> 3.6 | expand

Commit Message

Yi Zhao Dec. 16, 2023, 8:21 a.m. UTC 
ChangeLog:
https://github.com/SELinuxProject/setools/releases/tag/4.4.4

* Refresh local patch

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../setools/setools4-fixes-for-cross-compiling.patch      | 8 ++++----
 .../setools/{setools_4.4.3.bb => setools_4.4.4.bb}        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename recipes-security/setools/{setools_4.4.3.bb => setools_4.4.4.bb} (96%)
diff mbox series

Patch

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.4.bb
similarity index 96%
rename from recipes-security/setools/setools_4.4.3.bb
rename to recipes-security/setools/setools_4.4.4.bb
index 313dd0b..37bb86a 100644
--- a/recipes-security/setools/setools_4.4.3.bb
+++ b/recipes-security/setools/setools_4.4.4.bb
@@ -8,7 +8,7 @@  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"
+SRCREV = "a04b015459512d0460ff6bc50f28d746861f4a0b"
 
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=69a7b68f0a4a570d7c0c43465333ecbc \
                     file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \