diff --git a/Add-digest-list-plugin.patch b/Add-digest-list-plugin.patch index b579fee..dc129ea 100644 --- a/Add-digest-list-plugin.patch +++ b/Add-digest-list-plugin.patch @@ -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) diff --git a/rpm-fix-rpm-is-blocked-when-open-fifo-file.patch b/rpm-fix-rpm-is-blocked-when-open-fifo-file.patch deleted file mode 100644 index 3d60a68..0000000 --- a/rpm-fix-rpm-is-blocked-when-open-fifo-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 988df03f8a293f7aa1d6bb872b981c5dfc6493d9 Mon Sep 17 00:00:00 2001 -From: xujing -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 - diff --git a/rpm.spec b/rpm.spec index 76c9801..83716c9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -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 - 4.17.0-41 +- Fix the judgement of digests count + * Mon Jul 22 2024 gengqihu - 4.17.0-40 - Backport some patches from upstream