From 1117c2c252344c092e4cbf16599699bce55770de Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 3 Jun 2024 18:32:59 +0800 Subject: [PATCH] libcap: upgrade 2.69 -> 2.70 Release notes for 2.70 * setcap changes to make it harder to set invalid file capabilities * Lots of documentation fixes * Fix c89 compilation syntax for the C code in the libraries * libpam has deprecated providing the _pam_overwrite() function, so use memset() instead Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- ...ATTR_NAME_CAPS-is-defined-when-it-is-use.patch | 15 +++++++++------ ...bcap-Raise-the-size-of-arrays-containing.patch | 5 ++--- ...0002-tests-do-not-run-target-executables.patch | 3 +-- .../libcap/{libcap_2.69.bb => libcap_2.70.bb} | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) rename meta/recipes-support/libcap/{libcap_2.69.bb => libcap_2.70.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 05c771ac105..e77d0c8c51c 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,10 @@ -Ensure the XATTR_NAME_CAPS is defined when it is used +From 2261f47bac78aa77934ca03980ed54d1d86116b9 Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Thu, 23 Jun 2016 16:26:43 +0800 +Subject: [PATCH] Ensure the XATTR_NAME_CAPS is defined when it is used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Upstream-Status: Pending @@ -15,10 +21,10 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcap/cap_file.c b/libcap/cap_file.c -index 40756ea..e27ca80 100644 +index 0bc07f7..37bc34e 100644 --- a/libcap/cap_file.c +++ b/libcap/cap_file.c -@@ -25,7 +25,7 @@ extern int fremovexattr(int, const char *); +@@ -44,7 +44,7 @@ extern int fremovexattr(int, const char *); #include "libcap.h" @@ -27,6 +33,3 @@ index 40756ea..e27ca80 100644 #if VFS_CAP_U32 != __CAP_BLKS # error VFS representation of capabilities is not the same size as kernel --- -2.8.1 - 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 2ac1e6e5602..ecbdd22099a 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 709aa8e156415215b0bb034d05b2aa2f44be044e Mon Sep 17 00:00:00 2001 +From fcb0166c5e991fcf62797b19bea39983214289cb Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 14 Oct 2021 15:57:36 +0800 Subject: [PATCH] nativesdk-libcap: Raise the size of arrays containing dl @@ -14,13 +14,12 @@ the strings in a certain path. Upstream-Status: Inappropriate [SDK specific] Signed-off-by: Hongxu Jia - --- libcap/execable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcap/execable.h b/libcap/execable.h -index fee17b4..5bb0c55 100644 +index 7a2d247..682e0ee 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 20346cf2fb2..31f27e914fe 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,11 +1,10 @@ -From 10212b6d4e8843feffbeab5336342d97f3a46bb2 Mon Sep 17 00:00:00 2001 +From a3368b38abfb703e730fc5462f42cc5d177d864d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 20 Dec 2019 16:54:05 +0100 Subject: [PATCH] tests: do not run target executables Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin - --- tests/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-support/libcap/libcap_2.69.bb b/meta/recipes-support/libcap/libcap_2.70.bb similarity index 96% rename from meta/recipes-support/libcap/libcap_2.69.bb rename to meta/recipes-support/libcap/libcap_2.70.bb index 92fa766d377..6e2fd728e20 100644 --- a/meta/recipes-support/libcap/libcap_2.69.bb +++ b/meta/recipes-support/libcap/libcap_2.70.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] = "f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb" +SRC_URI[sha256sum] = "23a6ef8aadaf1e3e875f633bb2d116cfef8952dba7bc7c569b13458e1952b30f" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" -- 2.47.3