From 37d3778a2aea892236ee0861fd22443910a82b1c Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Sun, 30 Jan 2022 10:50:44 +0800 Subject: [PATCH] att: rename one patch for uniform format and donot skip security.evm copy for ima rename one patch for uniform format and donot skip security.evm copy for ima Fix issue: https://gitee.com/src-openeuler/attr/issues/I4RYVQ Signed-off-by: Zhiqiang Liu (cherry picked from commit 37869d3d43ca252ba4376641cde82e7003843ecb) --- ...patch => 0002-Switch-back-to-syscall.patch | 0 ...nt-skip-security.evm-when-copy-xattr.patch | 26 +++++++++++++++++++ attr.spec | 8 ++++-- 3 files changed, 32 insertions(+), 2 deletions(-) rename 6000-Switch-back-to-syscall.patch => 0002-Switch-back-to-syscall.patch (100%) create mode 100644 0003-dont-skip-security.evm-when-copy-xattr.patch diff --git a/6000-Switch-back-to-syscall.patch b/0002-Switch-back-to-syscall.patch similarity index 100% rename from 6000-Switch-back-to-syscall.patch rename to 0002-Switch-back-to-syscall.patch diff --git a/0003-dont-skip-security.evm-when-copy-xattr.patch b/0003-dont-skip-security.evm-when-copy-xattr.patch new file mode 100644 index 0000000..9930d8b --- /dev/null +++ b/0003-dont-skip-security.evm-when-copy-xattr.patch @@ -0,0 +1,26 @@ +From 1da7c41a8df5649ba8996b0d446e0e9bd5b0a2d3 Mon Sep 17 00:00:00 2001 +From: zhangtianxing3 +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 +Signed-off-by: volcanodragon +--- + 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 + diff --git a/attr.spec b/attr.spec index 0be3144..1905f9d 100644 --- a/attr.spec +++ b/attr.spec @@ -1,7 +1,7 @@ %{!?_licensedir:%global license %%doc} Name: attr Version: 2.4.48 -Release: 14 +Release: 15 Summary: Commands for Manipulating Filesystem Extended Attributes License: GPLv2+ AND LGPLv2+ URL: https://savannah.nongnu.org/projects/attr @@ -10,7 +10,8 @@ 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, gdb @@ -97,6 +98,9 @@ fi %{_mandir}/man3/* %changelog +* Sun Jan 30 2022 Zhiqiang Liu -2.4.48-15 +- rename one patch for uniform format and donot skip security.evm copy for ima + * Sat Nov 20 2021 yanglongkang -2.4.48-14 - make check add judgment condition -- Gitee