From 2e61d08e41afcdc99c60328812b2b02e04ba5238 Mon Sep 17 00:00:00 2001 From: Richard Phibel Date: Aug 10 2023 23:40:04 +0000 Subject: Fix for mix transcoded/untranscoded transactions The flag saying whether a package is transcoded is not clean-up between each packages. Because of that if a non-transcoded package is treated after a transcoded one, the package is treated as transcoded --- diff --git a/0034-rpmcow-fix-issue-for-transaction-with-transcoded-and-untranscoded-packages.patch b/0034-rpmcow-fix-issue-for-transaction-with-transcoded-and-untranscoded-packages.patch new file mode 100644 index 0000000..709472d --- /dev/null +++ b/0034-rpmcow-fix-issue-for-transaction-with-transcoded-and-untranscoded-packages.patch @@ -0,0 +1,28 @@ +From a3b6102b4d2e79a8b74b036c6a29272a7f6e5c6a Mon Sep 17 00:00:00 2001 +From: Richard Phibel +Date: Fri, 11 Aug 2023 00:43:21 +0200 +Subject: [PATCH] Fix issue for transaction with transcoded and non-transcoded + packages + +The flag saying whether a package is transcoded is not clean-up between +each packages. Because of that if a non-transcoded package is treated +after a transcoded one, the package is treated as transcoded +--- + plugins/reflink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/reflink.c b/plugins/reflink.c +index 986cbd172..20d35eefd 100644 +--- a/plugins/reflink.c ++++ b/plugins/reflink.c +@@ -234,6 +234,7 @@ static rpmRC reflink_psm_post(rpmPlugin plugin, rpmte te, int res) + inodeIndexHashFree(state->inodeIndexes); + state->inodeIndexes = NULL; + } ++ state->transcoded = 0; + return RPMRC_OK; + } + +-- +2.40.1 + diff --git a/rpm.spec b/rpm.spec index 0011bcb..da9b1bd 100644 --- a/rpm.spec +++ b/rpm.spec @@ -42,7 +42,7 @@ %global rpmver 4.16.1.3 #global snapver rc1 -%global rel 22.4 +%global rel 22.5 %global sover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -191,6 +191,7 @@ Patch9930: 0030-rpmcow-Make-rpm-i-install-package-without-the-need-o.patch Patch9931: 0031-rpmcow-denylist.patch Patch9932: 0032-rpmcow-workaround.patch Patch9933: 0033-rpmcow-fix-stack-overflow-in-rpm2extents.patch +Patch9934: 0034-rpmcow-fix-issue-for-transaction-with-transcoded-and-untranscoded-packages.patch Provides: rpm(pr1470) Provides: rpm(pr1470_1) @@ -776,6 +777,9 @@ fi %doc doc/librpm/html/* %changelog +* Fri Aug 11 2023 Richard Phibel - 4.16.1.3-22.5 +- Fix issue for transaction with transcoded and non-transcoded packages + * Mon May 22 2023 Richard Phibel - 4.16.1.3-22.4 - Fix stack overflow in rpm2extents and various memory leaks