From nobody Thu Oct 12 15:23:19 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S5tgq2Kszz4wVwq; Thu, 12 Oct 2023 15:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S5tgq1mhPz4d1m; Thu, 12 Oct 2023 15:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697124199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEbxaW9wNFq/uJiGXeMWEQdiMjF5qlEdjhefbismGzY=; b=vZKx4RRahE8t0l/BHeoj/p3xco8hpvVaT9nHhwNo5qveUbCfQbWCkhULCdbfT7iOY5PIe5 Y/otbobmOBuRFnIu3JEViD+e4gYWanGWdr8nqNSt/gW2gv+P1GCbg1iF9qQUH/ux1/aZaT kDTYW8368Tf2JJoEateaCKo/cSpq9XeaqV9grOFr2+zFznUQjf1pQU1gr93nsLiAL+uQGz a1+VxGeQrdbUwB2vuPYTO9PMyNAhQoJKjOF8UKjkV9ODfA0+Bk34+82aE+iIqepKlrjK87 Y93hy+Lk0Qk9DeepRRhZE5SYxfRHT4k11QEj3QIztHOnZPs1AcYA865hIfbftw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697124199; a=rsa-sha256; cv=none; b=RtSvjNJXMMGCNf6+PvA764BLDJ+S3GtCAQ7nOHQwm1Tw8xTixeumcyPWWAC9TK+5k355tU toG0MaejIGRYZDo/HPrmfSI4iFHUpDDjhAZ1zgntSbhiMUKQ39apqBxWYoVS0EgGfHrUr1 hGTDNTVL5B5Wl7nsg8WS77zr+gOqZVhBNeTqr8P3IJtiGLxvQofSYs1SMq2/Xc4t+hVc0n oBHfyr+2mf69lG6PXisSu4H9v+37+MSw306zRcA8Ji+Jdd10/fgn5F2DuemzuZoloRKEA/ Bng4IywmuIiJyKRIsyUmCtPH4yVmbEQBOW2w6L2au0M7rHqpAEwiateQSinXgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697124199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEbxaW9wNFq/uJiGXeMWEQdiMjF5qlEdjhefbismGzY=; b=NQbVUU2vnBqu7JfpqijPx14HpZCru0cuTdw6/U8xJPDwd1bg31OXXOPbWF12l8GT1Im6Us 3ZgroSpg76A6P0vTy3bIDty5wfmGRvwwAZbmVMl07nNSv16YwbtfVaYWUtvz1s8lwzw+Tu YJAepRzmt/FfAjVxzzUH+wFVLsm0tNsCOovE+puu/wBFm+ys1Ny6c+QXbdmGF0s1k3C1pz EtyAWOS50gIA3EnVpU0TNJ/8swy0QkmTLQ5ErUu6W9JpgRRUw9NpnchJhqdLVOKL5SZ1it iti/gDUnsrOrprpZ0B/6yNMULH+Z5rz/90qRGsUpTrOrIN68ARZpuE32eGJedQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S5tgq0psNz18dF; Thu, 12 Oct 2023 15:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39CFNJAg090266; Thu, 12 Oct 2023 15:23:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CFNJ65090263; Thu, 12 Oct 2023 15:23:19 GMT (envelope-from git) Date: Thu, 12 Oct 2023 15:23:19 GMT Message-Id: <202310121523.39CFNJ65090263@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Johnston Subject: git: 294f4c23aad4 - main - archivers/rpm4: Backport an upstream bugfix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294f4c23aad46176cd0ebb8b816508b437f22b1f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=294f4c23aad46176cd0ebb8b816508b437f22b1f commit 294f4c23aad46176cd0ebb8b816508b437f22b1f Author: Mark Johnston AuthorDate: 2023-09-06 20:58:55 +0000 Commit: Mark Johnston 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");