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
2024-11-18 00:10:04 +00:00 · 2023-02-24 10:23:48 +01:00 · 2023-02-24 10:23:48 +01:00 · 47912ce2e6
commit 47912ce2e6
parent 11f5d028c4
8 changed files with 17 additions and 90 deletions
--- a/11
+++ b/11
@ -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
--- 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 <bsd.port.options.mk>

 # _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]
--- 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
--- a/databases/sqlite3/files/patch-test_e__uri.test
+++ b/databases/sqlite3/files/patch-test_e__uri.test
@ -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 ""]
--- a/databases/sqlite3/files/patch-test_fts3expr4.test
+++ b/databases/sqlite3/files/patch-test_fts3expr4.test
@ -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
- 
--- a/databases/sqlite3/files/patch-test_scanstatus.test
+++ b/databases/sqlite3/files/patch-test_scanstatus.test
@ -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=?)}
- }
- 
--- a/databases/sqlite3/files/patch-test_stat.test
+++ b/databases/sqlite3/files/patch-test_stat.test
@ -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 \
- ]
- 
--- a/databases/sqlite3/files/patch-test_uri.test
+++ b/databases/sqlite3/files/patch-test_uri.test
@ -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"} {