Attachment 240362 Details for Bug 269798 – patch

[patch] patch

sqlite3-20230224.diff (text/plain), 6.71 KB, created by Pavel Volkov on 2023-02-24 07:04:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2023-02-24 07:04:22 UTC

Size: 6.71 KB

patch

obsolete

>diff -urNd databases/sqlite3.orig/Makefile databases/sqlite3/Makefile
>--- databases/sqlite3.orig/Makefile	2023-02-23 09:41:45.459040000 +0300
>+++ databases/sqlite3/Makefile	2023-02-23 10:48:36.151545000 +0300
>@@ -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 @@
> 			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 @@
> .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]
>diff -urNd databases/sqlite3.orig/distinfo databases/sqlite3/distinfo
>--- databases/sqlite3.orig/distinfo	2023-02-23 09:41:45.459134000 +0300
>+++ databases/sqlite3/distinfo	2023-02-23 09:53:54.163950000 +0300
>@@ -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 -urNd databases/sqlite3.orig/files/patch-test_e__uri.test databases/sqlite3/files/patch-test_e__uri.test
>--- databases/sqlite3.orig/files/patch-test_e__uri.test	2023-02-23 09:41:45.459508000 +0300
>+++ databases/sqlite3/files/patch-test_e__uri.test	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -urNd databases/sqlite3.orig/files/patch-test_fts3expr4.test databases/sqlite3/files/patch-test_fts3expr4.test
>--- databases/sqlite3.orig/files/patch-test_fts3expr4.test	2023-02-23 09:41:45.459585000 +0300
>+++ databases/sqlite3/files/patch-test_fts3expr4.test	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -urNd databases/sqlite3.orig/files/patch-test_scanstatus.test databases/sqlite3/files/patch-test_scanstatus.test
>--- databases/sqlite3.orig/files/patch-test_scanstatus.test	2023-02-23 09:41:45.459661000 +0300
>+++ databases/sqlite3/files/patch-test_scanstatus.test	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -urNd databases/sqlite3.orig/files/patch-test_stat.test databases/sqlite3/files/patch-test_stat.test
>--- databases/sqlite3.orig/files/patch-test_stat.test	2023-02-23 09:41:45.459736000 +0300
>+++ databases/sqlite3/files/patch-test_stat.test	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -urNd databases/sqlite3.orig/files/patch-test_uri.test databases/sqlite3/files/patch-test_uri.test
>--- databases/sqlite3.orig/files/patch-test_uri.test	2023-02-23 09:41:45.459817000 +0300
>+++ databases/sqlite3/files/patch-test_uri.test	1970-01-01 03:00:00.000000000 +0300
>@@ -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"} {

Flags:

pavelivolkov: maintainer-approval+

Actions: View | Diff

Attachments on bug 269798: 240362 | 240363 | 240364 | 240365 | 240366