diff --git a/backport-libcap-Ensure-the-XATTR_NAME_CAPS-is-define.patch b/backport-libcap-Ensure-the-XATTR_NAME_CAPS-is-define.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c60c823ccc611289a64f9457fffd8733cbe4935 --- /dev/null +++ b/backport-libcap-Ensure-the-XATTR_NAME_CAPS-is-define.patch @@ -0,0 +1,38 @@ +From 41997af6891658ab511c014e20f7846945c11742 Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Mon, 9 Aug 2021 17:32:20 +0800 +Subject: [PATCH] [Backport] libcap: Ensure the XATTR_NAME_CAPS is defined when + it is used + +VFS_CAP_U32 can not ensure that XATTR_NAME_CAPS is defined, and failed to build +libcap-native in old release, like CentOS release 6.7 (Final), with the blow +error: + cap_file.c: In function ‘cap_get_fd’: + cap_file.c:199: error: ‘XATTR_NAME_CAPS’ undeclared (first use in this function) + cap_file.c:199: error: (Each undeclared identifier is reported only once +Reference: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch + +Signed-off-by: Roy Li +Signed-off-by: lichi +Signed-off-by: luchangkun +Signed-off-by: huangyaojun +--- + libcap/cap_file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libcap/cap_file.c b/libcap/cap_file.c +index 4178705..1e6a28e 100644 +--- a/libcap/cap_file.c ++++ b/libcap/cap_file.c +@@ -45,7 +45,7 @@ extern int fremovexattr(int, const char *); + + #include "libcap.h" + +-#ifdef VFS_CAP_U32 ++#if defined (VFS_CAP_U32) && defined (XATTR_NAME_CAPS) + + #if VFS_CAP_U32 != __CAP_BLKS + # error VFS representation of capabilities is not the same size as kernel +-- +2.27.0 + diff --git a/libcap.spec b/libcap.spec index c9e4d68799270ed06aa318bc2b97d35f8c0bfa36..1105e40c52a27679fee767051e41c2b43bc80730 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.32 -Release: 6 +Release: 7 Summary: A library for getting and setting POSIX.1e draft 15 capabilities License: GPLv2 URL: https://sites.google.com/site/fullycapable @@ -14,6 +14,7 @@ Patch4: backport-If-needed-search-PATH-for-capsh-self-execution.patch Patch5: backport-Guarantee-sufficient-memory-for-scratch-pathname.patch Patch6: backport-getpcaps-catch-PID-parsing-errors.patch Patch7: backport-Large-strings-can-confuse-libcap-s-internal-strdup-c.patch +Patch8: backport-libcap-Ensure-the-XATTR_NAME_CAPS-is-define.patch BuildRequires: libattr-devel pam-devel perl-interpreter gcc @@ -74,6 +75,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_mandir}/man8/*.gz %changelog +* Mon Jul 3 2023 wangyunjia - 2.32-7 +- VFS_CAP_U32 can not ensure that XATTR_NAME_CAPS is defined, and failed to build + * Wed May 31 2023 wangyunjia - 2.32-6 - fix CVE-2023-2603