public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Igor Gnatenko <ignatenko@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/abrt] update-2.17.8: Hacks for RPM 4.14 support
Date: Mon, 03 Aug 2026 10:23:31 GMT [thread overview]
Message-ID: <178575261111.1.5893984839583639260.rpms-abrt-2fe9ae6400fa@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/abrt
Branch : update-2.17.8
Commit : 2fe9ae6400fae4d3cb94f7af1bbd4e5a4d99bf0e
Author : Igor Gnatenko <ignatenko@redhat.com>
Date : 2017-08-11T12:27:27+02:00
Stats : +57/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/abrt/c/2fe9ae6400fae4d3cb94f7af1bbd4e5a4d99bf0e?branch=update-2.17.8
Log:
Hacks for RPM 4.14 support
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
---
diff --git a/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch b/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch
new file mode 100644
index 0000000..ea52a98
--- /dev/null
+++ b/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch
@@ -0,0 +1,54 @@
+From c01551e6e9fd293a3f40e481afe8c28e786fe632 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri, 11 Aug 2017 13:24:26 +0300
+Subject: [PATCH] Quick hack to fix build with rpm >= 4.14
+
+1) rpm >= 4.14 no longer has rpmCheckTerminate() call, it cleans up
+ automatically on exit(). Note that "needing" rpmCheckTerminate()
+ means the code is buggy: it does not properly track and free
+ rpmdb iterators and/or rpmts handles.
+2) pgpPubkeyFingerprint() now returns the actual fingerprint, the
+ key ID which it previously returned is now retrieved by
+ pgpPubkeyKeyID()
+
+If compatibility to older versions is needed, these will need
+configure checks, left as an excercise for someone more familiar
+with the abrt codebase.
+---
+ src/daemon/rpm.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c
+index 36b36a91..011e44ca 100644
+--- a/src/daemon/rpm.c
++++ b/src/daemon/rpm.c
+@@ -76,11 +76,14 @@ void rpm_destroy()
+ rpmFreeMacros(NULL);
+ rpmFreeRpmrc();
+
++/* rpm >= 4.14 handles this automatically on exit */
++#if 0
+ /* RPM doc says "clean up any open iterators and databases".
+ * Observed to eliminate these Berkeley DB warnings:
+ * "BDB2053 Freeing read locks for locker 0x1e0: 28718/139661746636736"
+ */
+ rpmdbCheckTerminate(1);
++#endif
+ #endif
+
+ list_free_with_free(list_fingerprints);
+@@ -100,7 +103,11 @@ void rpm_load_gpgkey(const char* filename)
+ }
+
+ uint8_t keyID[8];
++#if 0
+ if (pgpPubkeyFingerprint(pkt, pklen, keyID) == 0)
++#else
++ if (pgpPubkeyKeyID(pkt, pklen, keyID) == 0)
++#endif
+ {
+ char *fingerprint = pgpHexStr(keyID, sizeof(keyID));
+ if (fingerprint != NULL)
+--
+2.14.0
+
diff --git a/abrt.spec b/abrt.spec
index ea5ad34..4002713 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -72,6 +72,9 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta
# don't remove this patch, packages in rawhide are not signed!
Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch
+# Hacks for RPM 4.14 support
+Patch1: 0001-Quick-hack-to-fix-build-with-rpm-4.14.patch
+
# '%%autosetup -S git' -> git
BuildRequires: git
reply other threads:[~2026-08-03 10:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178575261111.1.5893984839583639260.rpms-abrt-2fe9ae6400fa@fedoraproject.org \
--to=ignatenko@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox