!10 Update to version 0.3.94

Merge pull request !10 from robertosassu/gitee-openeuler-master
This commit is contained in:
openeuler-ci-bot 2020-09-10 16:01:45 +08:00 committed by Gitee
commit c12d86e2c0
4 changed files with 8 additions and 37 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,12 @@
name: digest-list-tools
Version: 0.3.93
Release: 3
Version: 0.3.94
Release: 1
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
@ -101,6 +100,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/%{name}.1.gz
%changelog
* Thu Sep 03 2020 Roberto Sassu <roberto.sassu@huawei.com> - 0.3.94-1
- Add obj_label attribute in file list
- Replace hard coded permission
- Set user.digest_list xattr
- Bug fixes
* Tue Sep 1 2020 Anakin Zhang <benjamin93@163.com> - 0.3.93-3
- set user.digest_list in repair-meta-digest-lists

View File

@ -1,34 +0,0 @@
From 0e1ac8c94120b522e20589512ee229790362c914 Mon Sep 17 00:00:00 2001
From: Anakin Zhang <benjamin93@163.com>
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 <benjamin93@163.com>
---
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