Open Build Service

Changes of Revision 13

_service:tar_scm_kernel_repo:libcap.spec Changed

_service:tar_scm_kernel_repo:backport-libcap-Ensure-the-XATTR_NAME_CAPS-is-define.patch Added

@@ -0,0 +1,38 @@
+From 41997af6891658ab511c014e20f7846945c11742 Mon Sep 17 00:00:00 2001
+From: Roy Li <rongqing.li@windriver.com>
+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 <rongqing.li@windriver.com>
+Signed-off-by: lichi <lichi7@huawei.com>
+Signed-off-by: luchangkun <luchangkun@h-partners.com>
+Signed-off-by: huangyaojun <huangyaojun@huawei.com>
+---
+ 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
+