Attachment 244693 Details for Bug 273614 – proposed patch

[patch] proposed patch

0001-archivers-rpm4-Backport-upstream-bugfix.patch (text/plain), 1.73 KB, created by Mark Johnston on 2023-09-07 13:21:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Johnston

Created: 2023-09-07 13:21:32 UTC

Size: 1.73 KB

patch

obsolete

>From 6286a0b13af68884d6091a5536d1a189cb83c311 Mon Sep 17 00:00:00 2001
>From: Mark Johnston <markj@FreeBSD.org>
>Date: Wed, 6 Sep 2023 16:58:55 -0400
>Subject: [PATCH] archivers/rpm4: Backport upstream bugfix
>
>The following upstream commit addresses a problem where librpmio.so's
>sqlite error handler can interfere with other sqlite consumers and cause
>a crash:
>https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e
>
>Backport the patch now since it's affecting at least one rpm4 user on
>FreeBSD.
>
>Sponsored by:	Klara
>---
> .../rpm4/files/patch-lib_backend_sqlite.c     | 24 +++++++++++++++++++
> 1 file changed, 24 insertions(+)
> create mode 100644 archivers/rpm4/files/patch-lib_backend_sqlite.c
>
>diff --git a/archivers/rpm4/files/patch-lib_backend_sqlite.c b/archivers/rpm4/files/patch-lib_backend_sqlite.c
>new file mode 100644
>index 000000000000..80e5042eda06
>--- /dev/null
>+++ b/archivers/rpm4/files/patch-lib_backend_sqlite.c
>@@ -0,0 +1,24 @@
>+--- lib/backend/sqlite.c.orig	2023-09-06 20:53:16 UTC
>++++ lib/backend/sqlite.c
>+@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc
>+     sqlite3_result_int(sctx, match);
>+ }
>+ 
>+-static void errCb(void *data, int err, const char *msg)
>+-{
>+-    rpmdb rdb = data;
>+-    rpmlog(RPMLOG_WARNING, "%s: %s: %s\n",
>+-		rdb->db_descr, sqlite3_errstr(err), msg);
>+-}
>+-
>+ static int dbiCursorReset(dbiCursor dbc)
>+ {
>+     if (dbc->stmt) {
>+@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome)
>+ 	 * the "database is locked" errors at every cost
>+ 	 */
>+ 	sqlite3_busy_timeout(sdb, 10000);
>+-	sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb);
>+ 
>+ 	sqlexec(sdb, "PRAGMA secure_delete = OFF");
>+ 	sqlexec(sdb, "PRAGMA case_sensitive_like = ON");
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 273614: 244693 | 244694