!15 [sync] PR-14: Update to version 0.3.95

From: @openeuler-sync-bot
Reviewed-by: @zhujianwei001
Signed-off-by: @zhujianwei001

digest-list-tools.spec

@@ -1,16 +1,15 @@
 name:           digest-list-tools
-Version:        0.3.94
-Release:        3
+Version:        0.3.95
+Release:        1
 Summary:        Utilities for IMA Digest Lists extension
 
 Source0:        https://gitee.com/openeuler/%{name}/repository/archive/v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:        GPL-2.0
 Url:            https://gitee.com/openeuler/digest-list-tools
-Patch0:         fix-invalid-format-in-i686.patch
 
 BuildRequires:  autoconf automake libcurl-devel libtool rpm-devel dracut gzip
-BuildRequires:  libcap-devel libcmocka-devel
+BuildRequires:  libcap-devel libcmocka-devel libselinux-devel
 
 %if 0%{?suse_version}
 BuildRequires:  libopenssl-devel glibc-devel-static
@@ -36,6 +35,8 @@ make check
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ima/digest_lists
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ima/digest_lists.tlv
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ima/digest_lists.sig
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 
 %post
@@ -53,9 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/dracut.conf.d/digestlist.conf
 %dir %{_sysconfdir}/ima
 %dir %{_sysconfdir}/ima/digest_lists
+%dir %{_sysconfdir}/ima/digest_lists.tlv
+%dir %{_sysconfdir}/ima/digest_lists.sig
 %{_bindir}/gen_digest_lists
 %{_bindir}/setup_ima_digest_lists
 %{_bindir}/setup_ima_digest_lists_demo
+%{_bindir}/setup_grub2
 %{_bindir}/manage_digest_lists
 %{_bindir}/upload_digest_lists
 %{_bindir}/verify_digest_lists
@@ -101,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Tue Feb 16 2021 Roberto Sassu <roberto.sassu@huawei.com> - 0.3.95-1
+- Add support for PGP keys
+- Add setup_grub2 script
+- Bug fixes
+
 * Mon Sep 14 2020 Anakin Zhang <benjamin93@163.com> - 0.3.94-3
 - fix Source0 and Summary in spec
 

fix-invalid-format-in-i686.patch

@@ -1,33 +0,0 @@
-From cb64bc8e5c15dabc5c912e4621a54338716fb297 Mon Sep 17 00:00:00 2001
-From: Anakin Zhang <benjamin93@163.com>
-Date: Thu, 10 Sep 2020 11:56:04 +0800
-Subject: [PATCH] fix invalid format in i686
-
-Signed-off-by: Anakin Zhang <benjamin93@163.com>
----
- lib/compact_list.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/compact_list.c b/lib/compact_list.c
-index dea6e9b..44cbd89 100644
---- a/lib/compact_list.c
-+++ b/lib/compact_list.c
-@@ -15,6 +15,7 @@
- #define _GNU_SOURCE
- #include <errno.h>
- #include <unistd.h>
-+#include <inttypes.h>
- #include <dirent.h>
- #include <keyutils.h>
- #include <sys/mman.h>
-@@ -339,7 +340,7 @@ void compact_list_tlv_dump_items(struct _tlv_item **items)
- 		case ID_FSMAGIC:
- 			u64_value = *(u64 *)items[i]->data;
- 			u64_value = le64_to_cpu(u64_value);
--			printf("%lu", u64_value);
-+			printf("%" PRIu64 "", u64_value);
- 			break;
- 		default:
- 			break;
--- 
-2.23.0