!34 [sync] PR-30: att: rename one patch for uniform format and donot skip security.evm for ima

Merge pull request !34 from openeuler-sync-bot/sync-pr30-openEuler-20.03-LTS-SP1-to-openEuler-20.03-LTS-SP3

0003-dont-skip-security.evm-when-copy-xattr.patch

@@ -0,0 +1,26 @@
+From 1da7c41a8df5649ba8996b0d446e0e9bd5b0a2d3 Mon Sep 17 00:00:00 2001
+From: zhangtianxing3 <zhangtianxing3@huawei.com>
+Date: Mon, 24 Jan 2022 11:39:36 +0800
+Subject: [PATCH] dont skip security.evm when copy xattr
+
+IMA feature need to use security.evm, so we should not skip
+
+Signed-off-by: lixiaokeng <lixiaokeng@huawei.com>
+Signed-off-by: volcanodragon <linfeilong@huawei.com>
+---
+ xattr.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xattr.conf b/xattr.conf
+index dcbc12c..125fd18 100644
+--- a/xattr.conf
++++ b/xattr.conf
+@@ -18,4 +18,4 @@ trusted.SGI_DMI_*		skip		# xfs specific
+ trusted.SGI_MAC_FILE		skip		# xfs specific
+ xfsroot.*			skip		# xfs specific; obsolete
+ user.Beagle.*			skip		# ignore Beagle index data
+-security.evm			skip		# may only be written by kernel
++#security.evm			skip		# may only be written by kernel
+-- 
+1.8.3.1
+

attr.spec

@@ -1,7 +1,7 @@
 %{!?_licensedir:%global license %%doc}
 Name:    attr
 Version: 2.4.48
-Release: 7
+Release: 15
 Summary: Commands for Manipulating Filesystem Extended Attributes
 License: GPLv2+ AND LGPLv2+
 URL:     https://savannah.nongnu.org/projects/attr
@@ -10,10 +10,11 @@ Source0: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.
 # fix test-suite failure with perl-5.26.0 (#1473853)
 Patch0000:  0000-attr-2.4.48-test-suite-perl.patch
 Patch0001:  0001-bypass-wrong-output-when-enabled-selinux.patch
-Patch6000:  6000-Switch-back-to-syscall.patch
+Patch0002:  0002-Switch-back-to-syscall.patch
+Patch0003:  0003-dont-skip-security.evm-when-copy-xattr.patch
 
 
-BuildRequires: gettext, libtool, chrpath, gcc, git
+BuildRequires: gettext, libtool, chrpath, gcc, git, gdb
 Provides:      libattr
 Obsoletes:     libattr
 Conflicts:     xfsdump < 3.1.8
@@ -28,7 +29,6 @@ with the SGI IRIX tool of the same name.
 %package -n libattr-devel
 License: LGPLv2+
 Summary: Header files for libattr
-Obsoletes: libattr
 Requires: glibc-headers
 
 %description -n libattr-devel
@@ -69,7 +69,12 @@ ln -fs ../sys/xattr.h $RPM_BUILD_ROOT%{_includedir}/attr/xattr.h
 %find_lang %{name}
 
 %check
-make %{?_smp_mflags} check
+if ./setfattr -n user.name -v value .; then
+    make check || exit $?
+else
+    echo '*** xattrs are probably not supported by the file system,' \
+         'the test-suite will NOT run ***'
+fi
 
 %post -n %{name} -p /sbin/ldconfig
 %postun -n %{name} -p /sbin/ldconfig
@@ -93,6 +98,24 @@ make %{?_smp_mflags} check
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 30 2022 Zhiqiang Liu <liuzhiqiang26@huawei.com> -2.4.48-15
+- rename one patch for uniform format and donot skip security.evm copy for ima
+
+* Sat Nov 20 2021 yanglongkang <yanglongkang@huawei.com> -2.4.48-14
+- make check add judgment condition
+
+* Tue Feb 9 2021 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 2.4.48-13
+- fix dependency problem and set release num to 13 for CI
+
+* Tue Aug 18 2020 chenyaqiang <chenyaqiang@huawei.com> - 2.4.48-9
+- rebuild for package build
+
+* Fri Mar 20 2020 hy-euler <eulerstoragemt@huawei.com> - 2.4.48-8
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: the building requires the gdb
+
 * Mon Mar 16 2020 Shijie Luo<luoshijie1@huawei.com> - 2.4.48-7
 - Type:bugfix
 - ID:NA