From 982ef9ddeb40f2f27107c1cbe7360b57bd377d83 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 22 May 2025 16:15:10 +0800 Subject: libcap: upgrade 2.75 -> 2.76 ChangeLog: https://sites.google.com/site/fullycapable/release-notes-for-libcap#h.wqnp1zp1o8bm Refresh local patch. (From OE-Core rev: cf409e0c2d5e90af9ad7cbb389c37f5f3a7a4b4e) Signed-off-by: Yi Zhao Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...ibcap-Raise-the-size-of-arrays-containing.patch | 10 ++-- meta/recipes-support/libcap/libcap_2.75.bb | 70 ---------------------- meta/recipes-support/libcap/libcap_2.76.bb | 70 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 meta/recipes-support/libcap/libcap_2.75.bb create mode 100644 meta/recipes-support/libcap/libcap_2.76.bb 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 f2d11b2983..2cec20b4b1 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 1343e4ee17bb3f72e6b244706cacbeb16463c5d7 Mon Sep 17 00:00:00 2001 +From 969d21aa2bf474d9c5c80a64de1a9fe0e17e31b2 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 @@ -19,12 +19,12 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcap/execable.h b/libcap/execable.h -index 89e61a3..22518dd 100644 +index a68ea24..60d3853 100644 --- a/libcap/execable.h +++ b/libcap/execable.h -@@ -23,7 +23,7 @@ - #endif - #define __EXECABLE_H +@@ -34,7 +34,7 @@ extern const int _IO_stdin_used; + const int _IO_stdin_used __attribute__((weak)) = 131073; + #endif /* def __GLIBC__ */ -const char __execable_dl_loader[] __attribute((section(".interp"))) = +const char __execable_dl_loader[4096] __attribute((section(".interp"))) = diff --git a/meta/recipes-support/libcap/libcap_2.75.bb b/meta/recipes-support/libcap/libcap_2.75.bb deleted file mode 100644 index 8530f13295..0000000000 --- a/meta/recipes-support/libcap/libcap_2.75.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "Library for getting/setting POSIX.1e capabilities" -DESCRIPTION = "A library providing the API to access POSIX capabilities. \ -These allow giving various kinds of specific privileges to individual \ -users, without giving them full root permissions." -HOMEPAGE = "http://sites.google.com/site/fullycapable/" - -# The library is BSD | GPLv2, the PAM module is BSD | LGPLv2+ -LICENSE = "(BSD-3-Clause | GPL-2.0-only) & (BSD-3-Clause | LGPL-2.0-or-later)" -LIC_FILES_CHKSUM = "file://License;md5=2965a646645b72ecee859b43c592dcaa \ - file://pam_cap/License;md5=905326f41d3d1f8df21943f9a4ed6b50 \ - " - -DEPENDS = "hostperl-runtime-native gperf-native" - -SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz" -SRC_URI:append:class-nativesdk = " \ - file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \ - " -SRC_URI[sha256sum] = "de4e7e064c9ba451d5234dd46e897d7c71c96a9ebf9a0c445bc04f4742d83632" - -UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" - -inherit lib_package - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" - -EXTRA_OEMAKE = " \ - ${PACKAGECONFIG_CONFARGS} \ - INDENT= \ - lib='${baselib}' \ - RAISE_SETFCAP=no \ - DYNAMIC=yes \ - USE_GPERF=yes \ -" - -do_compile() { - oe_runmake \ - AR="${AR}" \ - CC="${CC}" \ - RANLIB="${RANLIB}" \ - OBJCOPY="${OBJCOPY}" -} - -do_install() { - oe_runmake install \ - DESTDIR="${D}" \ - prefix="${prefix}" \ - SBINDIR="${sbindir}" -} - -do_install:append() { - # Move the library to base_libdir - install -d ${D}${base_libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${libdir}/libcap* ${D}${base_libdir} - if [ -d ${D}${libdir}/security ]; then - mv ${D}${libdir}/security ${D}${base_libdir} - fi - fi -} - -# pam files -FILES:${PN} += "${base_libdir}/security/*.so" - -# The license of the main package depends on whether PAM is enabled or not -LICENSE:${PN} = "(BSD-3-Clause | GPL-2.0-only)${@bb.utils.contains('PACKAGECONFIG', 'pam', ' & (BSD-3-Clause | LGPL-2.0-or-later)', '', d)}" -LICENSE:${PN}-dev = "(BSD-3-Clause | GPL-2.0-only)" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libcap/libcap_2.76.bb b/meta/recipes-support/libcap/libcap_2.76.bb new file mode 100644 index 0000000000..c842246fc0 --- /dev/null +++ b/meta/recipes-support/libcap/libcap_2.76.bb @@ -0,0 +1,70 @@ +SUMMARY = "Library for getting/setting POSIX.1e capabilities" +DESCRIPTION = "A library providing the API to access POSIX capabilities. \ +These allow giving various kinds of specific privileges to individual \ +users, without giving them full root permissions." +HOMEPAGE = "http://sites.google.com/site/fullycapable/" + +# The library is BSD | GPLv2, the PAM module is BSD | LGPLv2+ +LICENSE = "(BSD-3-Clause | GPL-2.0-only) & (BSD-3-Clause | LGPL-2.0-or-later)" +LIC_FILES_CHKSUM = "file://License;md5=2965a646645b72ecee859b43c592dcaa \ + file://pam_cap/License;md5=905326f41d3d1f8df21943f9a4ed6b50 \ + " + +DEPENDS = "hostperl-runtime-native gperf-native" + +SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz" +SRC_URI:append:class-nativesdk = " \ + file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \ + " +SRC_URI[sha256sum] = "629da4ab29900d0f7fcc36227073743119925fd711c99a1689bbf5c9b40c8e6f" + +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" + +inherit lib_package + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" + +EXTRA_OEMAKE = " \ + ${PACKAGECONFIG_CONFARGS} \ + INDENT= \ + lib='${baselib}' \ + RAISE_SETFCAP=no \ + DYNAMIC=yes \ + USE_GPERF=yes \ +" + +do_compile() { + oe_runmake \ + AR="${AR}" \ + CC="${CC}" \ + RANLIB="${RANLIB}" \ + OBJCOPY="${OBJCOPY}" +} + +do_install() { + oe_runmake install \ + DESTDIR="${D}" \ + prefix="${prefix}" \ + SBINDIR="${sbindir}" +} + +do_install:append() { + # Move the library to base_libdir + install -d ${D}${base_libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${libdir}/libcap* ${D}${base_libdir} + if [ -d ${D}${libdir}/security ]; then + mv ${D}${libdir}/security ${D}${base_libdir} + fi + fi +} + +# pam files +FILES:${PN} += "${base_libdir}/security/*.so" + +# The license of the main package depends on whether PAM is enabled or not +LICENSE:${PN} = "(BSD-3-Clause | GPL-2.0-only)${@bb.utils.contains('PACKAGECONFIG', 'pam', ' & (BSD-3-Clause | LGPL-2.0-or-later)', '', d)}" +LICENSE:${PN}-dev = "(BSD-3-Clause | GPL-2.0-only)" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf