!367 Fix the judgement of digests count

From: @HuaxinLuGitee 
Reviewed-by: @xujing99 
Signed-off-by: @xujing99
This commit is contained in:
openeuler-ci-bot 2024-08-19 07:39:05 +00:00 committed by Gitee
commit 733c120d4a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 5 additions and 34 deletions

View File

@ -198,7 +198,7 @@ index 0000000..c1864c7
+ }
+
+ close(fd);
+ return (first == '\0');
+ return (first == '0');
+}
+
+static int upload_digest_list(char *path, int type, int digest_list_signed)

View File

@ -1,32 +0,0 @@
From 988df03f8a293f7aa1d6bb872b981c5dfc6493d9 Mon Sep 17 00:00:00 2001
From: xujing <xujing125@huawei.com>
Date: Tue, 8 Nov 2022 10:36:36 +0800
Subject: [PATCH] rpm: fix rpm is blocked when open fifo file
---
lib/fsm.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/fsm.c b/lib/fsm.c
index c9ab3e1..c1c86b0 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -1137,8 +1137,13 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
if (!rc && fd == -1 && !S_ISLNK(fp->sb.st_mode)) {
/* Only follow safe symlinks, and never on temporary files */
- fd = fsmOpenat(di.dirfd, fp->fpath,
- fp->suffix ? AT_SYMLINK_NOFOLLOW : 0);
+ int flags = fp->suffix ? AT_SYMLINK_NOFOLLOW : 0;
+
+ /* Open the FIFO file in O_RDWR mode to prevent process blocking */
+ if (S_ISFIFO(fp->sb.st_mode))
+ flags |= O_RDWR;
+
+ fd = fsmOpenat(di.dirfd, fp->fpath, flags);
if (fd < 0)
rc = RPMERR_OPEN_FAILED;
}
--
2.27.0

View File

@ -1,6 +1,6 @@
Name: rpm
Version: 4.17.0
Release: 40
Release: 41
Summary: RPM Package Manager
License: GPLv2+
URL: http://www.rpm.org/
@ -415,6 +415,9 @@ make check || (cat tests/rpmtests.log; exit 0)
%{_mandir}/man1/gendiff.1*
%changelog
* Mon Aug 19 2024 luhuaxin <luhuaxin1@huawei.com> - 4.17.0-41
- Fix the judgement of digests count
* Mon Jul 22 2024 gengqihu <gengqihu2@h-partners.com> - 4.17.0-40
- Backport some patches from upstream