From 5c0e7b63862827c7dff16e1350c15dc31dfcf25f Mon Sep 17 00:00:00 2001 From: volcanodragon Date: Mon, 24 Jan 2022 11:44:14 +0800 Subject: [PATCH 1/3] dont skip security.evm when copy xattr (cherry picked from commit 54324ff3ae5d7b391e6acdea2be4c8985a9cf7be) --- ...nt-skip-security.evm-when-copy-xattr.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 0002-dont-skip-security.evm-when-copy-xattr.patch diff --git a/0002-dont-skip-security.evm-when-copy-xattr.patch b/0002-dont-skip-security.evm-when-copy-xattr.patch new file mode 100644 index 0000000..c0ce82b --- /dev/null +++ b/0002-dont-skip-security.evm-when-copy-xattr.patch @@ -0,0 +1,27 @@ +From 0aa9a1568fc318345c4123fc19f825933f8dcb66 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 1affac5..07d3403 100644 +--- a/xattr.conf ++++ b/xattr.conf +@@ -18,5 +18,5 @@ 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 + afs.* skip # AFS metadata and ACLs +-- +1.8.3.1 + -- Gitee From fbaf9db78b87e321e0f249c7b60d77e7b85b0a02 Mon Sep 17 00:00:00 2001 From: linfeilong835 Date: Mon, 24 Jan 2022 04:00:43 +0000 Subject: [PATCH 2/3] update attr.spec. (cherry picked from commit e7ae0c483e6cebfcb872dac80e9a883fc53fabce) --- attr.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/attr.spec b/attr.spec index 8f9d591..d7599ca 100644 --- a/attr.spec +++ b/attr.spec @@ -1,7 +1,7 @@ %{!?_licensedir:%global license %%doc} Name: attr Version: 2.5.1 -Release: 1 +Release: 2 Summary: Commands for Manipulating Filesystem Extended Attributes License: GPLv2+ AND LGPLv2+ URL: https://savannah.nongnu.org/projects/attr @@ -9,6 +9,7 @@ Source0: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}. # fix test-suite failure with perl-5.26.0 (#1473853) Patch1: 0001-bypass-wrong-output-when-enabled-selinux.patch +Patch2： 0002-dont-skip-security.evm-when-copy-xattr.patch BuildRequires: gettext, libtool, chrpath, gcc, Provides: libattr @@ -95,6 +96,9 @@ fi %{_mandir}/man3/* %changelog +* Mon Jan 24 2022 volcanodragon - 2.5.1-2 +- dont skip security.evm copy for ima + * Tue Nov 16 2021 Wenchao Hao - 2.5.1-1 - Update to attr-2.5.1 -- Gitee From b9638992c49ec5f88c94dca71ae5259eb57ed2f8 Mon Sep 17 00:00:00 2001 From: linfeilong835 Date: Sat, 29 Jan 2022 09:02:30 +0000 Subject: [PATCH 3/3] update attr.spec. (cherry picked from commit 6b983d67df8cb5c79930f563d454516f837dfedf) --- attr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attr.spec b/attr.spec index d7599ca..ab96d46 100644 --- a/attr.spec +++ b/attr.spec @@ -9,7 +9,7 @@ Source0: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}. # fix test-suite failure with perl-5.26.0 (#1473853) Patch1: 0001-bypass-wrong-output-when-enabled-selinux.patch -Patch2： 0002-dont-skip-security.evm-when-copy-xattr.patch +Patch2: 0002-dont-skip-security.evm-when-copy-xattr.patch BuildRequires: gettext, libtool, chrpath, gcc, Provides: libattr -- Gitee