From cc313c09a1ab034d4484ccb5420013c162479b82 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Sun, 15 Dec 2024 09:17:12 +0000
Subject: [PATCH] libcap: upgrade 2.71 -> 2.73

---
 ...sure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch | 2 +-
 ...tivesdk-libcap-Raise-the-size-of-arrays-containing.patch | 4 ++--
 .../files/0002-tests-do-not-run-target-executables.patch    | 6 +++---
 .../libcap/{libcap_2.71.bb => libcap_2.73.bb}               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.71.bb => libcap_2.73.bb} (96%)

diff --git a/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch b/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
index e77d0c8c51..f9901d84e4 100644
--- a/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
+++ b/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
@@ -1,4 +1,4 @@
-From 2261f47bac78aa77934ca03980ed54d1d86116b9 Mon Sep 17 00:00:00 2001
+From ad580e3e32ea06125edcabf7b2eb0a536a078ce0 Mon Sep 17 00:00:00 2001
 From: Roy Li <rongqing.li@windriver.com>
 Date: Thu, 23 Jun 2016 16:26:43 +0800
 Subject: [PATCH] Ensure the XATTR_NAME_CAPS is defined when it is used
diff --git a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
index ecbdd22099..85cf6bf866 100644
--- a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
+++ b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
@@ -1,4 +1,4 @@
-From fcb0166c5e991fcf62797b19bea39983214289cb Mon Sep 17 00:00:00 2001
+From a867cb0634c3d68a60957673f55401dd5a338eb4 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 14 Oct 2021 15:57:36 +0800
 Subject: [PATCH] nativesdk-libcap: Raise the size of arrays containing dl
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libcap/execable.h b/libcap/execable.h
-index 7a2d247..682e0ee 100644
+index 89e61a3..22518dd 100644
 --- a/libcap/execable.h
 +++ b/libcap/execable.h
 @@ -23,7 +23,7 @@
diff --git a/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch b/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
index 31f27e914f..47552151b5 100644
--- a/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
+++ b/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
@@ -1,4 +1,4 @@
-From a3368b38abfb703e730fc5462f42cc5d177d864d Mon Sep 17 00:00:00 2001
+From 62138aa85cd14947d6c52250f45139985d18e127 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 20 Dec 2019 16:54:05 +0100
 Subject: [PATCH] tests: do not run target executables
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/tests/Makefile b/tests/Makefile
-index ecb7d1b..8950c73 100644
+index 3d03721..fbb1d78 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -61,13 +61,11 @@ endif
+@@ -69,13 +69,11 @@ endif
  
  # unprivileged
  run_psx_test: psx_test
diff --git a/meta/recipes-support/libcap/libcap_2.71.bb b/meta/recipes-support/libcap/libcap_2.73.bb
similarity index 96%
rename from meta/recipes-support/libcap/libcap_2.71.bb
rename to meta/recipes-support/libcap/libcap_2.73.bb
index 08ee442330..94601c75b3 100644
--- a/meta/recipes-support/libcap/libcap_2.71.bb
+++ b/meta/recipes-support/libcap/libcap_2.73.bb
@@ -19,7 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
 SRC_URI:append:class-nativesdk = " \
            file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
            "
-SRC_URI[sha256sum] = "b7006c9af5168315f35fc734bf1a8d2aa70766bd8b8c4340962e05b19c35b900"
+SRC_URI[sha256sum] = "6405f6089cf4cdd8c271540cd990654d78dd0b1989b2d9bda20f933a75a795a5"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
-- 
2.44.1

