diff --git a/0002-plugin-absolute-path.patch b/0002-plugin-absolute-path.patch new file mode 100644 index 0000000..a9c3188 --- /dev/null +++ b/0002-plugin-absolute-path.patch @@ -0,0 +1,25 @@ +From 8a95dda30c4237da2a4ef16f3dca76d6b4417bc7 Mon Sep 17 00:00:00 2001 +From: Matteo Croce +Date: Fri, 22 Nov 2024 19:49:55 +0100 +Subject: [PATCH 2/2] plugin absolute path + +--- + lib/rpmplugins.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/rpmplugins.c b/lib/rpmplugins.c +index 1e0c345..4b86320 100644 +--- a/lib/rpmplugins.c ++++ b/lib/rpmplugins.c +@@ -371,7 +371,7 @@ rpmRC rpmpluginsCallFsmFilePre(rpmPlugins plugins, rpmfi fi, const char *path, + rpmPlugin plugin = plugins->plugins[i]; + RPMPLUGINS_SET_HOOK_FUNC(fsm_file_pre); + if (hookFunc) { +- hook_rc = hookFunc(plugin, fi, path, file_mode, op); ++ hook_rc = hookFunc(plugin, fi, apath, file_mode, op); + if (hook_rc == RPMRC_FAIL) { + rpmlog(RPMLOG_ERR, "Plugin %s: hook fsm_file_pre failed\n", plugin->name); + rc = RPMRC_FAIL; +-- +2.47.0 + diff --git a/rpm.spec b/rpm.spec index 372ddfd..276b368 100644 --- a/rpm.spec +++ b/rpm.spec @@ -32,7 +32,7 @@ %global rpmver 4.16.1.3 #global snapver rc1 -%global rel 34.2 +%global rel 34.3 %global sover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -149,6 +149,7 @@ Patch2000: rpm-4.16.1.3-backport-multithreaded-zstd.patch # Copy-on-Write Patch9901: 0001-RPM-with-Copy-on-Write.patch +Patch9902: 0002-plugin-absolute-path.patch Provides: rpm(pr1470) Provides: rpm(pr1470_1) @@ -727,6 +728,10 @@ fi %doc doc/librpm/html/* %changelog +* Fri Nov 22 2024 Matteo Croce - 4.16.1.3-34.3 +- Squash all CoW patches +- Fix a path issue with plugins + * Sat Sep 14 2024 Matteo Croce - 4.16.1.3-34.2 - Fix deduplication error in RPM CoW