diff --git a/digest-list-tools.spec b/digest-list-tools.spec index 124592a..c0b64c7 100644 --- a/digest-list-tools.spec +++ b/digest-list-tools.spec @@ -1,12 +1,14 @@ name: digest-list-tools Version: 0.3.93 -Release: 2 +Release: 3 Summary: Digest list tools Source0: %{name}-%{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: set-user.digest_list-in-repair-meta-digest-lists.patch + BuildRequires: autoconf automake libcurl-devel libtool rpm-devel dracut gzip BuildRequires: libcap-devel libcmocka-devel @@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1.gz %changelog +* Tue Sep 1 2020 Anakin Zhang - 0.3.93-3 +- set user.digest_list in repair-meta-digest-lists + * Mon Aug 31 2020 Anakin Zhang - 0.3.93-2 - remove README file diff --git a/set-user.digest_list-in-repair-meta-digest-lists.patch b/set-user.digest_list-in-repair-meta-digest-lists.patch new file mode 100644 index 0000000..01993b6 --- /dev/null +++ b/set-user.digest_list-in-repair-meta-digest-lists.patch @@ -0,0 +1,34 @@ +From 0e1ac8c94120b522e20589512ee229790362c914 Mon Sep 17 00:00:00 2001 +From: Anakin Zhang +Date: Tue, 1 Sep 2020 19:50:56 +0800 +Subject: [PATCH] set user.digest_list in repair-meta-digest-lists + +Signed-off-by: Anakin Zhang +--- + lib/compact_list.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/compact_list.c b/lib/compact_list.c +index f2667f4..0c73ec8 100644 +--- a/lib/compact_list.c ++++ b/lib/compact_list.c +@@ -787,8 +787,15 @@ int process_lists(int dirfd, int fd, int save, int verbose, + ret = gen_write_ima_xattr(xattr, &xattr_len, path, + DIGEST_LIST_ALGO, digest, + true, true); +- if (ret < 0) ++ if (ret < 0) { + printf("Cannot set IMA xattr to %s\n", path); ++ break; ++ } ++ ++ ret = lsetxattr(path, "user.digest_list", "1", 1, 0); ++ if (ret < 0) ++ printf("Cannot add user.digest_list to %s\n", ++ path); + + break; + default: +-- +2.23.0.windows.1 +