From 4f3589d70e65b63a78828594f79f4e4381b636b1 Mon Sep 17 00:00:00 2001 From: nettingsisyphus Date: Mon, 31 May 2021 12:41:13 +0800 Subject: [PATCH] fix make check issue in LTS-Next --- ...e-command-and-support-IMA-digest-list.patch | 18 +++++------------- ima-evm-utils.spec | 7 +++++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/add-save-command-and-support-IMA-digest-list.patch b/add-save-command-and-support-IMA-digest-list.patch index 6d528f1..ef0ec19 100644 --- a/add-save-command-and-support-IMA-digest-list.patch +++ b/add-save-command-and-support-IMA-digest-list.patch @@ -1,15 +1,15 @@ -From 67684a72e4d62880efd6800f281929a989de8d06 Mon Sep 17 00:00:00 2001 +From 6f1777200a9ffe74272f74e6bbb98c6291b782ea Mon Sep 17 00:00:00 2001 From: Roberto Sassu Date: Thu, 2 Jul 2020 22:19:00 -0400 Subject: [PATCH] add save command and support IMA digest list Signed-off-by: Anakin Zhang --- - src/evmctl.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 61 insertions(+), 7 deletions(-) + src/evmctl.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/src/evmctl.c b/src/evmctl.c -index 7ad1150..5bf8bf4 100644 +index 7ad1150..6433ccc 100644 --- a/src/evmctl.c +++ b/src/evmctl.c @@ -115,6 +115,7 @@ static int sigdump; @@ -184,14 +184,6 @@ index 7ad1150..5bf8bf4 100644 {"verify", cmd_verify_evm, 0, "file", "Verify EVM signature (for debugging).\n"}, {"ima_sign", cmd_sign_ima, 0, "[--sigfile] [--key key] [--pass [password] file", "Make file content signature.\n"}, {"ima_verify", cmd_verify_ima, 0, "file", "Verify IMA signature (for debugging).\n"}, -@@ -2614,6 +2667,7 @@ int main(int argc, char *argv[]) - imaevm_params.keypass = get_password(); - break; - case 'f': -+ xattr = 0; - sigfile = 1; - break; - case 'u': -- -2.23.0.windows.1 +2.23.0 diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index a9fc8c4..672394b 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,6 +1,6 @@ Name: ima-evm-utils Version: 1.3.1 -Release: 4 +Release: 5 Summary: IMA/EVM control utilities Group: System/Libraries License: GPLv2 @@ -10,7 +10,7 @@ Source0: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{na Patch9000: add-save-command-and-support-IMA-digest-list.patch BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel -BuildRequires: keyutils-libs-devel git ima-evm-utils +BuildRequires: keyutils-libs-devel git ima-evm-utils vim-common Requires: %{name}-libs = %{version}-%{release} %description @@ -81,6 +81,9 @@ make check %doc %{_mandir}/*/* %changelog +* Mon May 31 2020 Anakin Zhang - 1.3.1-5 +- fix make check issue in LTS-Next + * Tue Dec 22 2020 openEuler Buildteam - 1.3.1-4 - Type:enhancement - ID:NA -- Gitee