packages/rpm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!214 change log level when deal with digest list process

Browse Source 
From: @zcfsite 
Reviewed-by: @gys66, @openeuler-basic 
Signed-off-by: @openeuler-basic
This commit is contained in:
openeuler-ci-bot 2023-02-18 06:45:47 +00:00 committed by Gitee
commit aec68b08e0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Change-log-level-when-deal-with-digest-list-process.patch Normal file
View File

@ -0,0 +1,35 @@
From 16b57c4031fe7d86abe1a70c5e3ff1d6eea97a32 Mon Sep 17 00:00:00 2001
From: gaoyusong <gaoyusong2@huawei.com>
Date: Fri, 17 Feb 2023 15:08:05 +0800
Subject: [PATCH] Change log level when deal with digest-list process
Signed-off-by: gaoyusong <gaoyusong2@huawei.com>
---
plugins/digest_list.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/digest_list.c b/plugins/digest_list.c
index 4283d5e..a553d63 100644
--- a/plugins/digest_list.c
+++ b/plugins/digest_list.c
@@ -295,7 +295,7 @@ static int write_rpm_digest_list_ima_xattr(rpmte te, char *path)
ret = lsetxattr(path, XATTR_NAME_IMA,
sig, sizeof(*sig_hdr) + sig_size_rounded, 0);
if (ret < 0)
- rpmlog(RPMLOG_ERR, "digest_list: could not apply security.ima "
+ rpmlog(RPMLOG_NOTICE, "digest_list: could not apply security.ima "
"on '%s': %s\n", path, strerror(errno));
else
rpmlog(RPMLOG_DEBUG, "digest_list: security.ima successfully "
@@ -371,7 +371,7 @@ static int write_digest_list_ima_xattr(rpmte te, char *path, char *path_sig)
ret = lsetxattr(path, XATTR_NAME_IMA,
sig, sizeof(*sig_hdr) + sig_size, 0);
if (ret < 0)
- rpmlog(RPMLOG_ERR, "digest_list: could not apply security.ima "
+ rpmlog(RPMLOG_NOTICE, "digest_list: could not apply security.ima "
"on '%s': %s\n", path, strerror(errno));
else
rpmlog(RPMLOG_DEBUG, "digest_list: security.ima successfully "
--
2.23.0

7
rpm.spec
View File

@ -1,6 +1,6 @@
Name: rpm
Version: 4.15.1
Release: 44
Release: 45
Summary: RPM Package Manager
License: GPLv2+
URL: http://www.rpm.org/
@ -192,6 +192,8 @@ Patch172: backport-Fix-h-blob-leak-when-installing-source-rpms.patch
Patch173: backport-Fix-Header-leak-when-running-rpm2cpio.patch
Patch174: backport-Use-unsigned-integers-more-consistently-in-the-handl.patch
Patch175: Change-log-level-when-deal-with-digest-list-process.patch
BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel libdb-devel
BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
BuildRequires: dbus-devel fakechroot elfutils-devel elfutils-libelf-devel ima-evm-utils
@ -474,6 +476,9 @@ make check || (cat tests/rpmtests.log; exit 0)
%{_mandir}/man1/gendiff.1*
%changelog
* Sat Feb 18 2023 zcfsite<zhchf2010@126.com> - 4.15.1-45
- DESC:Change log level when deal with digest list process
* Mon Jan 16 2023 renhongxun<renhongxun@h-partners.com> - 4.15.1-44
- DESC:backport patches from upstream to fix resource leak