2525set -e
2626
2727VER2=2.8.17
28- VER3=3.32.2
29- VER3X=3320200
28+ VER3=3.32.3
29+ VER3X=3320300
3030VERZ=1.2.8
3131TCCVER=0.9.26
3232
@@ -318,7 +318,7 @@ test -r sqlite3/tool/mkshellc.tcl && \
318318 sed -i -e ' s/ rb/ r/g' sqlite3/tool/mkshellc.tcl
319319
320320# appendText name clash in sqlite3 shell
321- test " $VER3 " = " 3.32.2" \
321+ test " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
322322 && perl -pi -e ' s/appendText/shAppendText/g' sqlite3/src/shell.c.in
323323
324324test -r sqlite3/src/shell.c.in &&
@@ -415,7 +415,7 @@ test "$VER3" != "3.7.14" -a "$VER3" != "3.7.14.1" -a "$VER3" != "3.7.15" \
415415 -a " $VER3 " ! = " 3.10.2" -a " $VER3 " ! = " 3.12.2" -a " $VER3 " ! = " 3.13.0" \
416416 -a " $VER3 " ! = " 3.14.0" -a " $VER3 " ! = " 3.14.1" -a " $VER3 " ! = " 3.15.0" \
417417 -a " $VER3 " ! = " 3.15.1" -a " $VER3 " ! = " 3.15.2" -a " $VER3 " ! = " 3.19.3" \
418- -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" \
418+ -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" -a " $VER3 " ! = " 3.32.3 " \
419419 && patch sqlite3/src/libshell.c << 'EOD '
420420--- sqlite3.orig/src/libshell.c 2007-01-08 23:40:05.000000000 +0100
421421+++ sqlite3/src/libshell.c 2007-01-10 18:35:43.000000000 +0100
@@ -598,7 +598,7 @@ test "$VER3" = "3.8.9" -o "$VER3" = "3.8.10" -o "$VER3" = "3.8.11" \
598598 #else
599599EOD
600600
601- test " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
601+ test " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
602602 && patch sqlite3/src/os_win.h << 'EOD '
603603--- sqlite3.orig/src/os_win.h 2018-01-22 19:57:25.000000000 +0100
604604+++ sqlite3/src/os_win.h 2018-02-21 21:13:46.000000000 +0100
618618test " $VER3 " = " 3.13.0" -o " $VER3 " = " 3.14.0" -o " $VER3 " = " 3.14.1" \
619619 -o " $VER3 " = " 3.15.0" -o " $VER3 " = " 3.15.1" -o " $VER3 " = " 3.15.2" \
620620 -o " $VER3 " = " 3.19.3" -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
621+ -o " $VER3 " = " 3.32.3" \
621622 && patch sqlite3/src/libshell.c << 'EOD '
622623--- sqlite3.orig/src/libshell.c.orig 2016-05-18 13:06:59.000000000 +0200
623624+++ sqlite3/src/libshell.c 2016-06-04 17:02:05.000000000 +0200
@@ -756,7 +757,7 @@ test "$VER3" != "3.6.15" -a "$VER3" != "3.6.16" -a "$VER3" != "3.6.17" \
756757 -a " $VER3 " ! = " 3.10.2" -a " $VER3 " ! = " 3.12.2" -a " $VER3 " ! = " 3.13.0" \
757758 -a " $VER3 " ! = " 3.14.0" -a " $VER3 " ! = " 3.14.1" -a " $VER3 " ! = " 3.15.0" \
758759 -a " $VER3 " ! = " 3.15.1" -a " $VER3 " ! = " 3.15.2" -a " $VER3 " ! = " 3.19.3" \
759- -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" \
760+ -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" -a " $VER3 " ! = " 3.32.3 " \
760761 && patch -d sqlite3 -p1 << 'EOD '
761762diff -u sqlite3.orig/src/build.c sqlite3/src/build.c
762763--- sqlite3.orig/src/build.c 2007-01-09 14:53:04.000000000 +0100
@@ -821,14 +822,14 @@ test "$VER3" != "3.8.8" -a "$VER3" != "3.8.9" -a "$VER3" != "3.8.10" \
821822 -a " $VER3 " ! = " 3.12.2" -a " $VER3 " ! = " 3.13.0" -a " $VER3 " ! = " 3.14.0" \
822823 -a " $VER3 " ! = " 3.14.1" -a " $VER3 " ! = " 3.15.0" -a " $VER3 " ! = " 3.15.1" \
823824 -a " $VER3 " ! = " 3.15.2" -a " $VER3 " ! = " 3.19.3" -a " $VER3 " ! = " 3.22.0" \
824- -a " $VER3 " ! = " 3.32.2" \
825+ -a " $VER3 " ! = " 3.32.2" -a " $VER3 " ! = " 3.32.3 " \
825826 && patch -d sqlite3 -p1 << 'EOD '
826827diff -u sqlite3.orig/src/tclsqlite.c sqlite3/src/tclsqlite.c
827828--- sqlite3.orig/src/tclsqlite.c 2007-04-06 17:02:14.000000000 +0200
828829+++ sqlite3/src/tclsqlite.c 2007-04-10 07:47:49.000000000 +0200
829830@@ -14,6 +14,7 @@
830831 **
831- ** $Id: mingw-cross-build.sh,v 1.108 2020/06/13 11:06:35 chw Exp chw $
832+ ** $Id: mingw-cross-build.sh,v 1.109 2020/06/20 11:55:37 chw Exp chw $
832833 */
833834+#ifndef NO_TCL /* Omit this whole file if TCL is unavailable */
834835 #include "tcl.h"
@@ -848,7 +849,7 @@ test "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" -o "$VER3" = "3.8.10" \
848849 -o " $VER3 " = " 3.12.2" -o " $VER3 " = " 3.13.0" -o " $VER3 " = " 3.14.0" \
849850 -o " $VER3 " = " 3.14.1" -o " $VER3 " = " 3.15.0" -o " $VER3 " = " 3.15.1" \
850851 -o " $VER3 " = " 3.15.2" -o " $VER3 " = " 3.19.3" -o " $VER3 " = " 3.22.0" \
851- -o " $VER3 " = " 3.32.2" \
852+ -o " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
852853 && patch -d sqlite3 -p1 << 'EOD '
853854--- sqlite3.orig/src/tclsqlite.c 2015-01-16 14:47:26.000000000 +0100
854855+++ sqlite3/src/tclsqlite.c 2015-01-19 17:56:26.517386413 +0100
@@ -1021,7 +1022,7 @@ test "$VER3" != "3.6.21" -a "$VER3" != "3.6.22" -a "$VER3" != "3.6.23" \
10211022 -a " $VER3 " ! = " 3.10.2" -a " $VER3 " ! = " 3.12.2" -a " $VER3 " ! = " 3.13.0" \
10221023 -a " $VER3 " ! = " 3.14.0" -a " $VER3 " ! = " 3.14.1" -a " $VER3 " ! = " 3.15.0" \
10231024 -a " $VER3 " ! = " 3.15.1" -a " $VER3 " ! = " 3.15.2" -a " $VER3 " ! = " 3.19.3" \
1024- -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" \
1025+ -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" -a " $VER3 " ! = " 3.32.3 " \
10251026 && patch -d sqlite3 -p1 << 'EOD '
10261027--- sqlite3.orig/ext/fts3/fts3.c 2008-02-02 17:24:34.000000000 +0100
10271028+++ sqlite3/ext/fts3/fts3.c 2008-03-16 11:29:02.000000000 +0100
@@ -1120,6 +1121,7 @@ test "$VER3" != "3.7.8" -a "$VER3" != "3.7.9" -a "$VER3" != "3.7.10" \
11201121 -a " $VER3 " ! = " 3.13.0" -a " $VER3 " ! = " 3.14.0" -a " $VER3 " ! = " 3.14.1" \
11211122 -a " $VER3 " ! = " 3.15.0" -a " $VER3 " ! = " 3.15.1" -a " $VER3 " ! = " 3.15.2" \
11221123 -a " $VER3 " ! = " 3.19.3" -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" \
1124+ -a " $VER3 " ! = " 3.32.3" \
11231125 && patch -d sqlite3 -p1 << 'EOD '
11241126--- sqlite3.orig/ext/fts3/fts3_hash.c 2007-11-24 01:41:52.000000000 +0100
11251127+++ sqlite3/ext/fts3/fts3_hash.c 2008-03-16 11:39:57.000000000 +0100
@@ -1468,7 +1470,7 @@ test "$VER3" != "3.8.0" -a "$VER3" != "3.8.1" -a "$VER3" != "3.8.2" \
14681470 -a " $VER3 " ! = " 3.10.2" -a " $VER3 " ! = " 3.12.2" -a " $VER3 " ! = " 3.13.0" \
14691471 -a " $VER3 " ! = " 3.14.0" -a " $VER3 " ! = " 3.14.1" -a " $VER3 " ! = " 3.15.0" \
14701472 -a " $VER3 " ! = " 3.15.1" -a " $VER3 " ! = " 3.15.2" -a " $VER3 " ! = " 3.19.3" \
1471- -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" \
1473+ -a " $VER3 " ! = " 3.22.0" -a " $VER3 " ! = " 3.32.2" -a " $VER3 " ! = " 3.32.3 " \
14721474 && patch -d sqlite3 -p1 << 'EOD '
14731475--- sqlite3.orig/ext/rtree/rtree.c 2008-07-16 16:43:35.000000000 +0200
14741476+++ sqlite3/ext/rtree/rtree.c 2008-07-17 08:59:53.000000000 +0200
@@ -1517,7 +1519,7 @@ test "$VER3" = "3.7.3" -o "$VER3" = "3.7.4" -o "$VER3" = "3.7.5" \
15171519EOD
15181520
15191521# patch: fix rtree to be loadable as extension module
1520- test " $VER3 " = " 3.32.2" \
1522+ test " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
15211523 && perl -pi -e ' s/sqlite3_rtree_init/sqlite3_extension_init/g' \
15221524 sqlite3/ext/rtree/rtree.c
15231525
@@ -1556,7 +1558,7 @@ test "$VER3" = "3.7.7" -o "$VER3" = "3.7.7.1" -o "$VER3" = "3.7.8" \
15561558 -o " $VER3 " = " 3.10.2" -o " $VER3 " = " 3.12.2" -o " $VER3 " = " 3.13.0" \
15571559 -o " $VER3 " = " 3.14.0" -o " $VER3 " = " 3.14.1" -o " $VER3 " = " 3.15.0" \
15581560 -o " $VER3 " = " 3.15.1" -o " $VER3 " = " 3.15.2" -o " $VER3 " = " 3.19.3" \
1559- -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
1561+ -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
15601562 && patch -d sqlite3 -p1 << 'EOD '
15611563--- sqlite3.orig/ext/fts3/fts3_aux.c 2011-06-24 09:06:08.000000000 +0200
15621564+++ sqlite3/ext/fts3/fts3_aux.c 2011-06-25 06:44:08.000000000 +0200
@@ -1612,6 +1614,7 @@ test "$VER3" = "3.7.8" -o "$VER3" = "3.7.9" -o "$VER3" = "3.7.10" \
16121614 -o " $VER3 " = " 3.13.0" -o " $VER3 " = " 3.14.0" -o " $VER3 " = " 3.14.1" \
16131615 -o " $VER3 " = " 3.15.0" -o " $VER3 " = " 3.15.1" -o " $VER3 " = " 3.15.2" \
16141616 -o " $VER3 " = " 3.19.3" -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
1617+ -o " $VER3 " = " 3.32.3" \
16151618 && patch -d sqlite3 -p1 << 'EOD '
16161619--- sqlite3.orig/ext/fts3/fts3.c 2011-09-19 20:46:52.000000000 +0200
16171620+++ sqlite3/ext/fts3/fts3.c 2011-09-20 09:47:40.000000000 +0200
@@ -1651,7 +1654,7 @@ test "$VER3" = "3.7.7" -o "$VER3" = "3.7.7.1" -o "$VER3" = "3.7.8" \
16511654 -o " $VER3 " = " 3.10.2" -o " $VER3 " = " 3.12.2" -o " $VER3 " = " 3.13.0" \
16521655 -o " $VER3 " = " 3.14.0" -o " $VER3 " = " 3.14.1" -o " $VER3 " = " 3.15.0" \
16531656 -o " $VER3 " = " 3.15.1" -o " $VER3 " = " 3.15.2" -o " $VER3 " = " 3.19.3" \
1654- -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
1657+ -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
16551658 && patch -d sqlite3 -p1 << 'EOD '
16561659--- sqlite3.orig/ext/fts3/fts3_expr.c 2011-06-24 09:06:08.000000000 +0200
16571660+++ sqlite3/ext/fts3/fts3_expr.c 2011-06-25 06:47:00.000000000 +0200
@@ -1832,7 +1835,7 @@ test "$VER3" = "3.8.0" -o "$VER3" = "3.8.1" -o "$VER3" = "3.8.2" \
18321835 zAltEntry[iEntry++] = (char)sqlite3UpperToLower[(unsigned)c];
18331836EOD
18341837
1835- test " $VER3 " = " 3.32.2" \
1838+ test " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
18361839 && patch -d sqlite3 -p1 << 'EOD '
18371840--- sqlite3.orig/src/loadext.c 2020-06-04 16:01:10.000000000 +0200
18381841+++ sqlite3/src/loadext.c 2020-06-12 05:47:05.000000000 +0200
@@ -1858,6 +1861,7 @@ test "$VER3" = "3.8.2" -o "$VER3" = "3.8.3" -o "$VER3" = "3.8.4" \
18581861 -o " $VER3 " = " 3.13.0" -o " $VER3 " = " 3.14.0" -o " $VER3 " = " 3.14.1" \
18591862 -o " $VER3 " = " 3.15.0" -o " $VER3 " = " 3.15.1" -o " $VER3 " = " 3.15.2" \
18601863 -o " $VER3 " = " 3.19.3" -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
1864+ -o " $VER3 " = " 3.32.3" \
18611865 && patch -d sqlite3 -p1 << 'EOD '
18621866--- sqlite3.orig/ext/fts3/fts3.c 2014-03-26 10:26:28.000000000 +0100
18631867+++ sqlite3/ext/fts3/fts3.c 2014-03-26 16:54:39.000000000 +0100
@@ -1879,7 +1883,7 @@ test "$VER3" = "3.8.7" -o "$VER3" = "3.8.8" -o "$VER3" = "3.8.9" \
18791883 -o " $VER3 " = " 3.10.2" -o " $VER3 " = " 3.12.2" -o " $VER3 " = " 3.13.0" \
18801884 -o " $VER3 " = " 3.14.0" -o " $VER3 " = " 3.14.1" -o " $VER3 " = " 3.15.0" \
18811885 -o " $VER3 " = " 3.15.1" -o " $VER3 " = " 3.15.2" -o " $VER3 " = " 3.19.3" \
1882- -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
1886+ -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
18831887 && patch -d sqlite3 -p1 << 'EOD '
18841888--- sqlite3.orig/src/threads.c 2014-10-17 13:38:27.000000000 +0200
18851889+++ sqlite3/src/threads.c 2014-10-26 13:40:26.000000000 +0100
@@ -1899,6 +1903,7 @@ test "$VER3" = "3.9.0" -o "$VER3" = "3.9.1" -o "$VER3" = "3.9.2" \
18991903 -o " $VER3 " = " 3.13.0" -o " $VER3 " = " 3.14.0" -o " $VER3 " = " 3.14.1" \
19001904 -o " $VER3 " = " 3.15.0" -o " $VER3 " = " 3.15.1" -o " $VER3 " = " 3.15.2" \
19011905 -o " $VER3 " = " 3.19.3" -o " $VER3 " = " 3.22.0" -o " $VER3 " = " 3.32.2" \
1906+ -o " $VER3 " = " 3.32.3" \
19021907 && patch sqlite3/ext/fts5/tool/mkfts5c.tcl << 'EOD '
19031908--- mkfts5c.tcl.orig 2015-10-14 14:53:26.000000000 +0200
19041909+++ mkfts5c.tcl 2015-10-15 08:19:25.000000000 +0200
@@ -1921,7 +1926,7 @@ test "$VER3" = "3.10.0" -o "$VER3" = "3.10.2" -o "$VER3" = "3.12.2" \
19211926 -o " $VER3 " = " 3.19.3" -o " $VER3 " = " 3.22.0" \
19221927 && perl -pi -e ' s/ rb\]/ r\]/g' sqlite3/tool/mkopcodec.tcl \
19231928 sqlite3/tool/tostr.tcl sqlite3/tool/addopcodes.tcl
1924- test " $VER3 " = " 3.32.2" \
1929+ test " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
19251930 && perl -pi -e ' s/ rb\]/ r\]/g' sqlite3/tool/mkopcodec.tcl \
19261931 sqlite3/tool/mkccode.tcl
19271932
@@ -2019,7 +2024,7 @@ test "$VER3" = "3.8.11" -o "$VER3" = "3.9.0" -o "$VER3" = "3.9.1" \
20192024 # ifndef access
20202025 # define access(f,m) _access((f),(m))
20212026EOD
2022- test " $VER3 " = " 3.32.2" \
2027+ test " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
20232028 && patch sqlite3/sqlite3.c << 'EOD '
20242029--- sqlite3.c.orig 2020-06-12 06:16:37.000000000 +0200
20252030+++ sqlite3.c 2020-06-12 07:34:44.000000000 +0200
@@ -2034,7 +2039,7 @@ test "$VER3" = "3.32.2" \
20342039 # define access(f,m) _access((f),(m))
20352040EOD
20362041# rtree using internal core func
2037- test " $VER3 " = " 3.32.2" \
2042+ test " $VER3 " = " 3.32.2" -o " $VER3 " = " 3.32.3 " \
20382043 && patch sqlite3/ext/rtree/rtree.c << 'EOD '
20392044--- rtree.c.orig 2020-06-04 16:01:10.000000000 +0200
20402045+++ rtree.c 2020-06-12 11:51:49.000000000 +0200
0 commit comments