git: 294f4c23aad4 - main - archivers/rpm4: Backport an upstream bugfix

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=294f4c23aad46176cd0ebb8b816508b437f22b1f

commit 294f4c23aad46176cd0ebb8b816508b437f22b1f
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-09-06 20:58:55 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-10-12 15:21:48 +0000

    archivers/rpm4: Backport an 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.  This can be dropped once rpm 4.19 is imported.
    
    PR:             273614
    Approved by:    maintainer timeout (4 weeks)
    Sponsored by:   Klara, Inc.
---
 archivers/rpm4/files/patch-lib_backend_sqlite.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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");