!23 兼容ima特性,默认情况下不跳过security.evm的拷贝

Merge pull request !23 from linfeilong835/master
This commit is contained in:
openeuler-ci-bot 2022-01-30 01:35:00 +00:00 committed by Gitee
commit 318e96a6e5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 0aa9a1568fc318345c4123fc19f825933f8dcb66 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 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

View File

@ -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 <linfeilong@huawei.com> - 2.5.1-2
- dont skip security.evm copy for ima
* Tue Nov 16 2021 Wenchao Hao <haowenchao@huawei.com> - 2.5.1-1
- Update to attr-2.5.1