update to 1.3.2 #2
This commit is contained in:
parent
9de1d974db
commit
40f3d64283
@ -1,17 +1,17 @@
|
||||
From 84b07036e7d2b609a1fd1cad52b40de905778e86 Mon Sep 17 00:00:00 2001
|
||||
From 6e607f4c5b3a608477bfc10405fb3c1f2ef93024 Mon Sep 17 00:00:00 2001
|
||||
From: Roberto Sassu <roberto.sassu@huawei.com>
|
||||
Date: Fri, 15 Jan 2021 16:56:53 +0800
|
||||
Subject: [PATCH] add save command to support IMA digest list
|
||||
Date: Thu, 21 Jan 2021 08:16:34 +0800
|
||||
Subject: [PATCH] add save command to support digest list building
|
||||
|
||||
This patch adds save command to support IMA digest list.
|
||||
|
||||
Signed-off-by: Tianxing Zhang <zhangtianxing3@huawei.com>
|
||||
Signed-off-by: Tianxing Zhang <benjamin93@163.com>
|
||||
---
|
||||
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 1815f55..c8e749e 100644
|
||||
index 1815f55..439713d 100644
|
||||
--- a/src/evmctl.c
|
||||
+++ b/src/evmctl.c
|
||||
@@ -115,6 +115,7 @@ static int sigdump;
|
||||
@ -186,14 +186,6 @@ index 1815f55..c8e749e 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.25.1
|
||||
|
||||
@ -6,9 +6,10 @@ License: GPLv2
|
||||
URL: http://linux-ima.sourceforge.net/
|
||||
Source0: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0: add-save-command-and-support-IMA-digest-list.patch
|
||||
Patch9000: add-save-command-to-support-digest-list-building.patch
|
||||
|
||||
BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel keyutils-libs-devel git
|
||||
BuildRequires: autoconf automake libtool asciidoc vim-common
|
||||
BuildRequires: libxslt openssl-devel keyutils-libs-devel ima-evm-utils
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
%description
|
||||
@ -23,8 +24,8 @@ Summary: shared library for IMA/EVM
|
||||
This package provides shared library for IMA/EVM.
|
||||
|
||||
%package devel
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Provides: %{name}-static = %{version}-%{release}
|
||||
Obsoletes:%{name}-static < %{version}-%{release}
|
||||
|
||||
@ -34,10 +35,9 @@ This package provides the header files for %{name}
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1 -Sgit
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
mkdir -p m4
|
||||
autoreconf -f -i
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
@ -45,22 +45,17 @@ make %{?_smp_mflags}
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
%make_install
|
||||
cp %{_libdir}/libimaevm.so.1* %{buildroot}/%{_libdir}
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%pre
|
||||
|
||||
%preun
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
||||
%postun libs -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ChangeLog README
|
||||
%license COPYING AUTHORS
|
||||
%doc NEWS README AUTHORS
|
||||
%license COPYING
|
||||
%{_bindir}/*
|
||||
|
||||
%files libs
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user