commit 087ddd8bc84252334ff283e536077cd96b9f8aa1
Author: Jan Rękorajski <[email protected]>
Date: Sat Nov 23 10:23:42 2024 +0100
- remove patch for sqlite fix applied in 4.18
rpm.spec | 2 --
sqlite-log-crash.patch | 48 ------------------------------------------------
2 files changed, 50 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 9a7c59a..6453b78 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -88,7 +88,6 @@ Patch32: noexpand.patch
Patch34: skip-symlinks.patch
Patch36: build-locale.patch
Patch37: no-exe-for-elf-req.patch
-Patch39: sqlite-log-crash.patch
Patch40: perl-heredoc-matching.patch
URL: https://rpm.org/
BuildRequires: acl-devel
@@ -663,7 +662,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML
generowane ze
%patch34 -p1
%patch36 -p1
%patch37 -p1
-%patch39 -p1
%patch40 -p1
%{__rm} po/*.gmo
diff --git a/sqlite-log-crash.patch b/sqlite-log-crash.patch
deleted file mode 100644
index 87137f5..0000000
--- a/sqlite-log-crash.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <[email protected]>
-Date: Mon, 26 Jun 2023 12:45:09 +0300
-Subject: [PATCH] Don't muck with per-process global sqlite configuration from
- the db backend
-
-sqlite3_config() affects all in-process uses of sqlite. librpm being a
-low-level library, it has no business whatsoever making such decisions
-for the applications running on top of it. Besides that, the callback can
-easily end up pointing to an already closed database, causing an
-innocent API user to crash in librpm on an entirely unrelated error on
-some other database. "Oops."
-
-The sqlite API doesn't seem to provide any per-db or non-global context
-for logging errors, thus we can only remove the call and let sqlite output
-errors the way it pleases (print through stderr, presumably).
-
-Thanks to Jan Palus for spotting and reporting!
----
- lib/backend/sqlite.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c
-index 5a029d575a..b612732267 100644
---- a/lib/backend/sqlite.c
-+++ b/lib/backend/sqlite.c
-@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc,
sqlite3_value **argv)
- 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");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/087ddd8bc84252334ff283e536077cd96b9f8aa1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
