From nobody Mon Feb 27 22:49:34 2023 X-Original-To: dev-commits-ports-main@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 4PQbKW25bJz3tGt4; Mon, 27 Feb 2023 22:49:35 +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 4PQbKW1gMnz3qWn; Mon, 27 Feb 2023 22:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677538175; 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=Uu7wlDClec0g1lWekeViwHVOCSW9fO467UICWOTy0W8=; b=MufHkpzc45JfIDHeXRrGylRCvTYCxRwqliXmCbNH9Do344/XUQp1qlyBi+LZnjPeeX63TZ M8DOPEelwBqVNEAMOOhrOWMZDglwBzIq5w/qF0euqZv4qQ4gilq5QZgN3NvzTj9nykUXqF hn2MFJT4YmgZQxDgz72njsDB2hF55vTvF6D4hUuXgRY7xfVqRsFaHyFpSrw70mJ9pH0TOp XLAVKB6S1+p0eKgfZLm8I+HVIb/bPyasnqkfkFLHDQR2yw3Pa0pFvYz5jeGa+tIr7uRmm5 Bd9byEuJVrDXKRrCDDfvQbYJzjzQgi29+CP6BFPu7AhnnU4wH90ls70r2nsI5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677538175; 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=Uu7wlDClec0g1lWekeViwHVOCSW9fO467UICWOTy0W8=; b=xjC/nmpZweqM22Gre6/1bKoigDEmaP4ynfEPZxxRiiOdDP4FHCu0xlw6YGPsCnJWdU7Noy kZOYpW+65/H2FC+s8UPijI8A96nL0WCYgCSsR725twIFUX9pLo3FKZCM6ElCCwuNh3YiIZ kkrN7y1SMjkuRlRvbTbBElQBbTkswpwNOGC0MRm04VW87l5/W6sCpfTyPn7CVcRnN8RsdV LZSPfvaQBqBOeTmqC+m+ndIBV/kMgNgW5IGAyYd2X8HbNt7whkSuZECFxJtUt7qHjDORdi T6XJeGoB+CRQINbqPmycWd+SCPgUU+xTw0ThzE+xu6mvDw7M2KydkXHH3d//Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677538175; a=rsa-sha256; cv=none; b=k4Rpz0UG8cUTcKAmGG2KboSflqX21JB23h1Z7QL5kDCEvchjh4FANs+wN8n7ywSz+3Uf+k un21uidTbje5c4XL6gdsH4eXEjDm8CJXaTrbaA83LX6dhovazHhQDPR+S+A0wMGuevKDBe 18wfl+yfv34CfRsGaeOJitoMjBp1TxCXNDjkPoDeLQXnmtin0UMdo7/IB5O30ef6Y+qdBX ZxPuO62VQ3Pj9i/ohjR7z08ykjHmhurH61e+O9ugCWfqd3Rxkc7qcU2YKab/qdy9pkIflc Yq6tY1ptkUqXCQn6N6sGrc1TV4xA0Zxajj/5EVpvmWFUFDG/0ZoI9jBMPZaueA== 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 4PQbKW0Wmczjcn; Mon, 27 Feb 2023 22:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31RMnZni078108; Mon, 27 Feb 2023 22:49:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMnYh9078107; Mon, 27 Feb 2023 22:49:34 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:49:34 GMT Message-Id: <202302272249.31RMnYh9078107@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 47912ce2e613 - main - databases/sqlite3: update to 3.41.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47912ce2e613211aecf6ecdfc58681b7aca0df33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=47912ce2e613211aecf6ecdfc58681b7aca0df33 commit 47912ce2e613211aecf6ecdfc58681b7aca0df33 Author: Pavel Volkov AuthorDate: 2023-02-24 09:23:48 +0000 Commit: Robert Clausecker CommitDate: 2023-02-27 22:46:24 +0000 databases/sqlite3: update to 3.41.0 Disable option DQS by default. Add a note to UPDATING about this. See also: https://sqlite.org/quirks.html#dblquote Changelog: https://sqlite.org/releaselog/3_41_0.html PR: 269798 Approved by: flo (mentor) Differential Revision: https://reviews.freebsd.org/D38774 --- UPDATING | 11 +++++++ databases/sqlite3/Makefile | 6 ++-- databases/sqlite3/distinfo | 6 ++-- databases/sqlite3/files/patch-test_e__uri.test | 13 --------- databases/sqlite3/files/patch-test_fts3expr4.test | 11 ------- databases/sqlite3/files/patch-test_scanstatus.test | 34 ---------------------- databases/sqlite3/files/patch-test_stat.test | 11 ------- databases/sqlite3/files/patch-test_uri.test | 15 ---------- 8 files changed, 17 insertions(+), 90 deletions(-) diff --git a/UPDATING b/UPDATING index 8b85cb1b5efc..8255385ceebc 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20230227: + AFFECTS: users of databases/sqlite3 + AUTHOR: fuz@FreeBSD.org + + Option DQS is now disabled by default. This option controls the "double + quoted string literals are accepted" quirk, permitting the use of double + quotes around string literals if enabled. Users who rely on this quirk + need to manually build databases/sqlite3 with the DQS option enabled. + + See also: https://sqlite.org/quirks.html#dblquote + 20230227: AFFECTS: users of mail/py-spf-engine AUTHOR: yasu@FreeBSD.org diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index c599084205d0..993737673af6 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -1,5 +1,5 @@ PORTNAME= sqlite3 -DISTVERSION= 3.40.1 +DISTVERSION= 3.41.0 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= https://www.sqlite.org/${_YEAR}/ https://www2.sqlite.org/${_YEAR}/ https://www3.sqlite.org/${_YEAR}/ @@ -74,7 +74,7 @@ OPTIONS_DEFINE+= ARMOR DBPAGE DBSTAT DIRECT_READ DQS EXTENSION FTS3_TOKEN \ SORT_REF STATIC STMT TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \ UPDATE_LIMIT URI URI_AUTHORITY .endif -OPTIONS_DEFAULT= DBPAGE DBSTAT DQS EXTENSION FTS3_TOKEN FTS4 FTS5 LIBEDIT METADATA \ +OPTIONS_DEFAULT= DBPAGE DBSTAT EXTENSION FTS3_TOKEN FTS4 FTS5 LIBEDIT METADATA \ RTREE SECURE_DELETE STRIP THREADS TS1 UNICODE61 UNLOCK_NOTIFY URI # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al. # RTREE used by graphics/mapnik, databases/spatialite @@ -215,7 +215,7 @@ URI_AUTHORITY_CPPFLAGS= -DSQLITE_ALLOW_URI_AUTHORITY=1 .include # _YEAR= ${%Y:L:gmtime} - do not work with the version from the previous year -_YEAR= 2022 +_YEAR= 2023 # Platform Configuration # -DHAVE_POSIX_FALLOCATE=1 not yet, chunksize.test ZFS failure chunksize-1.2 expected: [32768] got: [2048] diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo index a057f4188661..116e164d5af3 100644 --- a/databases/sqlite3/distinfo +++ b/databases/sqlite3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672831817 -SHA256 (sqlite-src-3400100.zip) = 5064126aa50db20c35578b612b56c3129425c0506ed4d1610efa4a0f01bdf8d0 -SIZE (sqlite-src-3400100.zip) = 13725560 +TIMESTAMP = 1677135234 +SHA256 (sqlite-src-3410000.zip) = 64a7638a35e86b991f0c15ae8e2830063b694b28068b8f7595358e3205a9eb66 +SIZE (sqlite-src-3410000.zip) = 13831104 diff --git a/databases/sqlite3/files/patch-test_e__uri.test b/databases/sqlite3/files/patch-test_e__uri.test deleted file mode 100644 index 6c09429555bc..000000000000 --- a/databases/sqlite3/files/patch-test_e__uri.test +++ /dev/null @@ -1,13 +0,0 @@ ---- test/e_uri.test.orig 2022-11-27 09:06:46 UTC -+++ test/e_uri.test -@@ -139,8 +139,8 @@ if {$tcl_platform(platform) == "unix"} { - foreach {tn uri error} " - 1 {file://localhost[test_pwd /]test.db} {not an error} - 2 {file://[test_pwd /]test.db} {not an error} -- 3 {file://x[test_pwd /]test.db} {invalid uri authority: x} -- 4 {file://invalid[test_pwd /]test.db} {invalid uri authority: invalid} -+ 3 {file://x[test_pwd /]test.db} {unable to open database file} -+ 4 {file://invalid[test_pwd /]test.db} {unable to open database file} - " { - do_test 2.$tn { - set DB [sqlite3_open_v2 $uri $flags ""] diff --git a/databases/sqlite3/files/patch-test_fts3expr4.test b/databases/sqlite3/files/patch-test_fts3expr4.test deleted file mode 100644 index ef73fba60d2f..000000000000 --- a/databases/sqlite3/files/patch-test_fts3expr4.test +++ /dev/null @@ -1,11 +0,0 @@ ---- test/fts3expr4.test.orig 2022-11-27 11:47:17 UTC -+++ test/fts3expr4.test -@@ -50,7 +50,7 @@ do_icu_expr_test 1.7 {a:word} {PHRASE 0 0 word} - # is passed to the tokenizer. - # - do_icu_expr_test 1.7 {a:word} {PHRASE 0 0 word} --do_icu_expr_test 1.8 {d:word} {PHRASE 3 0 d:word} -+do_icu_expr_test 1.8 {d:word} {AND {AND {PHRASE 3 0 d} {PHRASE 3 0 :}} {PHRASE 3 0 word}} - - set sqlite_fts3_enable_parentheses 0 - diff --git a/databases/sqlite3/files/patch-test_scanstatus.test b/databases/sqlite3/files/patch-test_scanstatus.test deleted file mode 100644 index 3d72a0b188a7..000000000000 --- a/databases/sqlite3/files/patch-test_scanstatus.test +++ /dev/null @@ -1,34 +0,0 @@ ---- test/scanstatus.test.orig 2022-11-27 11:40:24 UTC -+++ test/scanstatus.test -@@ -312,8 +312,8 @@ do_scanstatus_test 5.1.2 { - SELECT count(*) FROM t1 WHERE a IN (SELECT b FROM t1 AS ii) - } {2} - do_scanstatus_test 5.1.2 { -- nLoop 1 nVisit 10 nEst 10.0 zName t1bc -- zExplain {SCAN ii USING COVERING INDEX t1bc} -+ nLoop 1 nVisit 10 nEst 10.0 zName t1 -+ zExplain {SCAN ii} - nLoop 1 nVisit 2 nEst 8.0 zName sqlite_autoindex_t1_1 - zExplain {SEARCH t1 USING COVERING INDEX sqlite_autoindex_t1_1 (a=?)} - } -@@ -341,16 +341,16 @@ do_eqp_test 5.4.1 { - SELECT count(*) FROM t1, t2 WHERE y = c; - } { - QUERY PLAN -- |--SCAN t1 USING COVERING INDEX t1bc -+ |--SCAN t1 - `--SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?) - } - do_execsql_test 5.4.2 { - SELECT count(*) FROM t1, t2 WHERE y = c; - } {200} - do_scanstatus_test 5.4.3 { -- nLoop 1 nVisit 10 nEst 10.0 zName t1bc -- zExplain {SCAN t1 USING COVERING INDEX t1bc} -- nLoop 10 nVisit 200 nEst 56.0 zName t2xy -+ nLoop 1 nVisit 10 nEst 10.0 zName t1 -+ zExplain {SCAN t1} -+ nLoop 10 nVisit 200 nEst 56.0 zName t2xy - zExplain {SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?)} - } - diff --git a/databases/sqlite3/files/patch-test_stat.test b/databases/sqlite3/files/patch-test_stat.test deleted file mode 100644 index 772ea91a95c2..000000000000 --- a/databases/sqlite3/files/patch-test_stat.test +++ /dev/null @@ -1,11 +0,0 @@ ---- test/stat.test.orig 2022-11-27 11:50:01 UTC -+++ test/stat.test -@@ -140,7 +140,7 @@ do_execsql_test stat-2.1agg { - SELECT * FROM dbstat WHERE aggregate=TRUE ORDER BY name; - } [list \ - sqlite_autoindex_t3_1 {} 5 {} 32 3898 1065 132 {} 5120 \ -- sqlite_schema {} 1 {} 2 84 824 49 {} 1024 \ -+ sqlite_schema {} 1 {} 2 83 825 49 {} 1024 \ - t3 {} 17 {} 47 11188 5815 370 {} 17408 \ - ] - diff --git a/databases/sqlite3/files/patch-test_uri.test b/databases/sqlite3/files/patch-test_uri.test deleted file mode 100644 index e424ca6175ae..000000000000 --- a/databases/sqlite3/files/patch-test_uri.test +++ /dev/null @@ -1,15 +0,0 @@ ---- test/uri.test.orig 2022-11-27 09:14:11 UTC -+++ test/uri.test -@@ -301,9 +301,9 @@ foreach {tn uri res} { - 1 "file://localhost/PWD/test.db" {not an error} - 2 "file:///PWD/test.db" {not an error} - 3 "file:/PWD/test.db" {not an error} -- 4 "file://l%6Fcalhost/PWD/test.db" {invalid uri authority: l%6Fcalhost} -- 5 "file://lbcalhost/PWD/test.db" {invalid uri authority: lbcalhost} -- 6 "file://x/PWD/test.db" {invalid uri authority: x} -+ 4 "file://l%6Fcalhost/PWD/test.db" {unable to open database file} -+ 5 "file://lbcalhost/PWD/test.db" {unable to open database file} -+ 6 "file://x/PWD/test.db" {unable to open database file} - } { - - if {$tcl_platform(platform)=="windows"} {