diff --git a/SOURCES/0001-Fully-shutdown-DBUS-on-systemd_inhibit-cleanup-RhBug.patch b/SOURCES/0001-Fully-shutdown-DBUS-on-systemd_inhibit-cleanup-RhBug.patch deleted file mode 100644 index 54519f0..0000000 --- a/SOURCES/0001-Fully-shutdown-DBUS-on-systemd_inhibit-cleanup-RhBug.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d5f201345f6d27b6280750e5c6502f4418614fbc Mon Sep 17 00:00:00 2001 -From: Panu Matilainen -Date: Wed, 29 May 2019 12:09:20 +0300 -Subject: [PATCH] Fully shutdown DBUS on systemd_inhibit cleanup - (RhBug:1714657) - -dbus_shutdown() frees internal DBUS memory allocations that will otherwise -show up as memory leaks. This is of little consequence in practise -but shuts up valgrind... ---- - plugins/systemd_inhibit.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/plugins/systemd_inhibit.c b/plugins/systemd_inhibit.c -index e2cbcffbb..0628188ba 100644 ---- a/plugins/systemd_inhibit.c -+++ b/plugins/systemd_inhibit.c -@@ -80,6 +80,11 @@ static rpmRC systemd_inhibit_init(rpmPlugin plugin, rpmts ts) - return RPMRC_NOTFOUND; - } - -+static void systemd_inhibit_cleanup(rpmPlugin plugin) -+{ -+ dbus_shutdown(); -+} -+ - static rpmRC systemd_inhibit_tsm_pre(rpmPlugin plugin, rpmts ts) - { - if (rpmtsFlags(ts) & (RPMTRANS_FLAG_TEST|RPMTRANS_FLAG_BUILD_PROBS)) -@@ -106,6 +111,7 @@ static rpmRC systemd_inhibit_tsm_post(rpmPlugin plugin, rpmts ts, int res) - - struct rpmPluginHooks_s systemd_inhibit_hooks = { - .init = systemd_inhibit_init, -+ .cleanup = systemd_inhibit_cleanup, - .tsm_pre = systemd_inhibit_tsm_pre, - .tsm_post = systemd_inhibit_tsm_post, - }; --- -2.21.0 - diff --git a/SPECS/rpm.spec b/SPECS/rpm.spec index 9675ce1..1cae797 100644 --- a/SPECS/rpm.spec +++ b/SPECS/rpm.spec @@ -30,7 +30,7 @@ %global rpmver 4.14.2 #global snapver rc2 -%global rel 25 +%global rel 26 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -96,7 +96,6 @@ Patch120: 0001-rpmsign-man-page-Add-line-about-rpmsign-requiring-a-.patch Patch121: 0001-Use-dpbath-only-with-full-path-RhBug-1696408.patch Patch122: 0001-Fix-a-blindingly-obvious-memleak-in-package-verify-s.patch Patch123: 0001-Fix-rpmfiles-memory-leak-on-postuntrans-file-trigger.patch -Patch124: 0001-Fully-shutdown-DBUS-on-systemd_inhibit-cleanup-RhBug.patch Patch125: 0001-Remove-capabilities-instead-of-setting-empty-caps-vi.patch Patch126: 0001-Fix-off-by-one-in-hdrblobGet-making-last-entry-unrea.patch Patch127: 0001-Fix-memleak-during-transaction-verify-step-in-the-NO.patch @@ -647,6 +646,9 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Tue Jan 14 2020 Panu Matilainen - 4.14.2-26 +- Revert DBUS-shutdown patch, it causes regressions (#1790794) + * Wed Aug 07 2019 Florian Festi - 4.14.2-25 - Fix memory leak in verify code (#1714657)