Thu Dec 30 20:31:51 2021 UTC ()
sqlite3: updated to 3.37.1

version 3.37.1

Fix a bug introduced by the UPSERT enhancements of version 3.35.0 that can cause incorrect byte-code to be generated for some obscure but valid SQL, possibly resulting in a NULL-pointer dereference.
Fix an OOB read that can occur in FTS5 when reading corrupt database files.
Improved robustness of the --safe option in the CLI.
Other minor fixes to assert() statements and test cases.


(adam)
diff -r1.144 -r1.145 pkgsrc/databases/sqlite3/Makefile
diff -r1.82 -r1.83 pkgsrc/databases/sqlite3/Makefile.common
diff -r1.175 -r1.176 pkgsrc/databases/sqlite3/distinfo
diff -r1.105 -r1.106 pkgsrc/databases/sqlite3-docs/PLIST
diff -r1.108 -r1.109 pkgsrc/databases/sqlite3-docs/distinfo
diff -r1.108 -r1.109 pkgsrc/databases/sqlite3-tcl/Makefile
diff -r1.120 -r1.121 pkgsrc/databases/sqlite3-tcl/distinfo
diff -r1.49 -r1.50 pkgsrc/devel/lemon/distinfo

cvs diff -r1.144 -r1.145 pkgsrc/databases/sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3/Makefile 2021/12/08 16:01:49 1.144
+++ pkgsrc/databases/sqlite3/Makefile 2021/12/30 20:31:51 1.145
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.144 2021/12/08 16:01:49 adam Exp $ 1# $NetBSD: Makefile,v 1.145 2021/12/30 20:31:51 adam Exp $
2 2
3PKGREVISION= 1 
4.include "Makefile.common" 3.include "Makefile.common"
5 4
6DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION} 5DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION}
7PKGNAME= sqlite3-${SQLITE3_VERSION} 6PKGNAME= sqlite3-${SQLITE3_VERSION}
8CATEGORIES= databases 7CATEGORIES= databases
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= SQL Database Engine in a C Library 10COMMENT= SQL Database Engine in a C Library
12 11
13.include "options.mk" 12.include "options.mk"
14 13
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16USE_TOOLS+= gmake 15USE_TOOLS+= gmake

cvs diff -r1.82 -r1.83 pkgsrc/databases/sqlite3/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3/Makefile.common 2021/11/28 20:48:28 1.82
+++ pkgsrc/databases/sqlite3/Makefile.common 2021/12/30 20:31:51 1.83
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.82 2021/11/28 20:48:28 adam Exp $ 1# $NetBSD: Makefile.common,v 1.83 2021/12/30 20:31:51 adam Exp $
2# 2#
3# used by databases/sqlite3/Makefile 3# used by databases/sqlite3/Makefile
4# used by databases/sqlite3-docs/Makefile 4# used by databases/sqlite3-docs/Makefile
5# used by databases/sqlite3-tcl/Makefile 5# used by databases/sqlite3-tcl/Makefile
6# used by devel/lemon/Makefile 6# used by devel/lemon/Makefile
7 7
8SQLITE3_DISTVERSION= 3370000 8SQLITE3_DISTVERSION= 3370100
9SQLITE3_VERSION= 3.37.0 9SQLITE3_VERSION= 3.37.1
10 10
11MASTER_SITES= http://www.sqlite.org/2021/ 11MASTER_SITES= http://www.sqlite.org/2021/
12MASTER_SITES+= http://www.hwaci.com/sw/sqlite/2021/ 12MASTER_SITES+= http://www.hwaci.com/sw/sqlite/2021/
13 13
14HOMEPAGE?= http://www.sqlite.org/ 14HOMEPAGE?= http://www.sqlite.org/
15LICENSE= public-domain 15LICENSE= public-domain

cvs diff -r1.175 -r1.176 pkgsrc/databases/sqlite3/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3/distinfo 2021/11/28 20:48:28 1.175
+++ pkgsrc/databases/sqlite3/distinfo 2021/12/30 20:31:51 1.176
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.175 2021/11/28 20:48:28 adam Exp $ 1$NetBSD: distinfo,v 1.176 2021/12/30 20:31:51 adam Exp $
2 2
3BLAKE2s (sqlite-autoconf-3370000.tar.gz) = df964e39d338c8a4ba4fecd8a0be9d1b8536867cd0b8e27ed168fc8c202200fb 3BLAKE2s (sqlite-autoconf-3370100.tar.gz) = d8a824e862b52e29909aadee7334848affda012331c7e6ba8767fc4a6b257d90
4SHA512 (sqlite-autoconf-3370000.tar.gz) = 413655d7b61b4d0a510bc42eb2e4f3e801ff35dee7d825d84b8397c956f23c5eac6a1a73134d3d7a63e40704968a4607d5762a137557e688ec5f87efb5b729ea 4SHA512 (sqlite-autoconf-3370100.tar.gz) = 426f087733a864ed16648b162f80484ffdb415c55da837224fd22365c2ab4621840af984f9c8eb4f1d91aceaabb1f4c1285bd9e92a678f686fdd5d4544f98c81
5Size (sqlite-autoconf-3370000.tar.gz) = 3001298 bytes 5Size (sqlite-autoconf-3370100.tar.gz) = 3001542 bytes
6SHA1 (patch-configure) = c0aa83bddc20d090b3cd2fd840ac69031f4396e4 6SHA1 (patch-configure) = c0aa83bddc20d090b3cd2fd840ac69031f4396e4

cvs diff -r1.105 -r1.106 pkgsrc/databases/sqlite3-docs/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3-docs/PLIST 2021/11/28 20:48:28 1.105
+++ pkgsrc/databases/sqlite3-docs/PLIST 2021/12/30 20:31:51 1.106
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.105 2021/11/28 20:48:28 adam Exp $ 1@comment $NetBSD: PLIST,v 1.106 2021/12/30 20:31:51 adam Exp $
2share/doc/sqlite3/34to35.html 2share/doc/sqlite3/34to35.html
3share/doc/sqlite3/35to36.html 3share/doc/sqlite3/35to36.html
4share/doc/sqlite3/about.html 4share/doc/sqlite3/about.html
5share/doc/sqlite3/aff_short.html 5share/doc/sqlite3/aff_short.html
6share/doc/sqlite3/affcase1.html 6share/doc/sqlite3/affcase1.html
7share/doc/sqlite3/amalgamation.html 7share/doc/sqlite3/amalgamation.html
8share/doc/sqlite3/appfileformat.html 8share/doc/sqlite3/appfileformat.html
9share/doc/sqlite3/appfunc.html 9share/doc/sqlite3/appfunc.html
10share/doc/sqlite3/arch.html 10share/doc/sqlite3/arch.html
11share/doc/sqlite3/assert.html 11share/doc/sqlite3/assert.html
12share/doc/sqlite3/asyncvfs.html 12share/doc/sqlite3/asyncvfs.html
13share/doc/sqlite3/atomiccommit.html 13share/doc/sqlite3/atomiccommit.html
14share/doc/sqlite3/autoinc.html 14share/doc/sqlite3/autoinc.html
@@ -463,26 +463,27 @@ share/doc/sqlite3/images/shane1.jpg @@ -463,26 +463,27 @@ share/doc/sqlite3/images/shane1.jpg
463share/doc/sqlite3/images/shared.gif 463share/doc/sqlite3/images/shared.gif
464share/doc/sqlite3/images/sqlite370.jpg 464share/doc/sqlite3/images/sqlite370.jpg
465share/doc/sqlite3/images/sqlite370_banner.gif 465share/doc/sqlite3/images/sqlite370_banner.gif
466share/doc/sqlite3/images/sqlitepie.jpg 466share/doc/sqlite3/images/sqlitepie.jpg
467share/doc/sqlite3/images/src_logo.gif 467share/doc/sqlite3/images/src_logo.gif
468share/doc/sqlite3/images/sw.gif 468share/doc/sqlite3/images/sw.gif
469share/doc/sqlite3/images/sw.png 469share/doc/sqlite3/images/sw.png
470share/doc/sqlite3/images/table-ex1b2.gif 470share/doc/sqlite3/images/table-ex1b2.gif
471share/doc/sqlite3/images/vfs1.gif 471share/doc/sqlite3/images/vfs1.gif
472share/doc/sqlite3/imposter.html 472share/doc/sqlite3/imposter.html
473share/doc/sqlite3/index.html 473share/doc/sqlite3/index.html
474share/doc/sqlite3/inmemorydb.html 474share/doc/sqlite3/inmemorydb.html
475share/doc/sqlite3/intern-v-extern-blob.html 475share/doc/sqlite3/intern-v-extern-blob.html
 476share/doc/sqlite3/invalidutf.html
476share/doc/sqlite3/isolation.html 477share/doc/sqlite3/isolation.html
477share/doc/sqlite3/json1.html 478share/doc/sqlite3/json1.html
478share/doc/sqlite3/keyword_index.html 479share/doc/sqlite3/keyword_index.html
479share/doc/sqlite3/lang.html 480share/doc/sqlite3/lang.html
480share/doc/sqlite3/lang_aggfunc.html 481share/doc/sqlite3/lang_aggfunc.html
481share/doc/sqlite3/lang_altertable.html 482share/doc/sqlite3/lang_altertable.html
482share/doc/sqlite3/lang_analyze.html 483share/doc/sqlite3/lang_analyze.html
483share/doc/sqlite3/lang_attach.html 484share/doc/sqlite3/lang_attach.html
484share/doc/sqlite3/lang_comment.html 485share/doc/sqlite3/lang_comment.html
485share/doc/sqlite3/lang_conflict.html 486share/doc/sqlite3/lang_conflict.html
486share/doc/sqlite3/lang_corefunc.html 487share/doc/sqlite3/lang_corefunc.html
487share/doc/sqlite3/lang_createindex.html 488share/doc/sqlite3/lang_createindex.html
488share/doc/sqlite3/lang_createtable.html 489share/doc/sqlite3/lang_createtable.html
@@ -624,26 +625,27 @@ share/doc/sqlite3/releaselog/3_32_1.html @@ -624,26 +625,27 @@ share/doc/sqlite3/releaselog/3_32_1.html
624share/doc/sqlite3/releaselog/3_32_2.html 625share/doc/sqlite3/releaselog/3_32_2.html
625share/doc/sqlite3/releaselog/3_32_3.html 626share/doc/sqlite3/releaselog/3_32_3.html
626share/doc/sqlite3/releaselog/3_33_0.html 627share/doc/sqlite3/releaselog/3_33_0.html
627share/doc/sqlite3/releaselog/3_34_0.html 628share/doc/sqlite3/releaselog/3_34_0.html
628share/doc/sqlite3/releaselog/3_34_1.html 629share/doc/sqlite3/releaselog/3_34_1.html
629share/doc/sqlite3/releaselog/3_35_0.html 630share/doc/sqlite3/releaselog/3_35_0.html
630share/doc/sqlite3/releaselog/3_35_1.html 631share/doc/sqlite3/releaselog/3_35_1.html
631share/doc/sqlite3/releaselog/3_35_2.html 632share/doc/sqlite3/releaselog/3_35_2.html
632share/doc/sqlite3/releaselog/3_35_3.html 633share/doc/sqlite3/releaselog/3_35_3.html
633share/doc/sqlite3/releaselog/3_35_4.html 634share/doc/sqlite3/releaselog/3_35_4.html
634share/doc/sqlite3/releaselog/3_35_5.html 635share/doc/sqlite3/releaselog/3_35_5.html
635share/doc/sqlite3/releaselog/3_36_0.html 636share/doc/sqlite3/releaselog/3_36_0.html
636share/doc/sqlite3/releaselog/3_37_0.html 637share/doc/sqlite3/releaselog/3_37_0.html
 638share/doc/sqlite3/releaselog/3_37_1.html
637share/doc/sqlite3/releaselog/3_3_0.html 639share/doc/sqlite3/releaselog/3_3_0.html
638share/doc/sqlite3/releaselog/3_3_1.html 640share/doc/sqlite3/releaselog/3_3_1.html
639share/doc/sqlite3/releaselog/3_3_10.html 641share/doc/sqlite3/releaselog/3_3_10.html
640share/doc/sqlite3/releaselog/3_3_11.html 642share/doc/sqlite3/releaselog/3_3_11.html
641share/doc/sqlite3/releaselog/3_3_12.html 643share/doc/sqlite3/releaselog/3_3_12.html
642share/doc/sqlite3/releaselog/3_3_13.html 644share/doc/sqlite3/releaselog/3_3_13.html
643share/doc/sqlite3/releaselog/3_3_14.html 645share/doc/sqlite3/releaselog/3_3_14.html
644share/doc/sqlite3/releaselog/3_3_15.html 646share/doc/sqlite3/releaselog/3_3_15.html
645share/doc/sqlite3/releaselog/3_3_16.html 647share/doc/sqlite3/releaselog/3_3_16.html
646share/doc/sqlite3/releaselog/3_3_17.html 648share/doc/sqlite3/releaselog/3_3_17.html
647share/doc/sqlite3/releaselog/3_3_2.html 649share/doc/sqlite3/releaselog/3_3_2.html
648share/doc/sqlite3/releaselog/3_3_3.html 650share/doc/sqlite3/releaselog/3_3_3.html
649share/doc/sqlite3/releaselog/3_3_4.html 651share/doc/sqlite3/releaselog/3_3_4.html

cvs diff -r1.108 -r1.109 pkgsrc/databases/sqlite3-docs/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3-docs/distinfo 2021/11/28 20:48:28 1.108
+++ pkgsrc/databases/sqlite3-docs/distinfo 2021/12/30 20:31:51 1.109
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.108 2021/11/28 20:48:28 adam Exp $ 1$NetBSD: distinfo,v 1.109 2021/12/30 20:31:51 adam Exp $
2 2
3BLAKE2s (sqlite-doc-3370000.zip) = 805b096d27353253ddf402e7a3447ee58628bdfb4ca89a633683345a4cf10522 3BLAKE2s (sqlite-doc-3370100.zip) = 2dd0c877eb0602d5bc7013e0083b16dd1054f2fa2d02d812772ed04ebc59c35f
4SHA512 (sqlite-doc-3370000.zip) = f245731675c67347318578e773b8d5f548c26eac7a333d6028cf7e11c4c9d2c3314da0a5428533ff26416f4194dce5c805d7f61f1fef27e02e9b91efa3c6d4c7 4SHA512 (sqlite-doc-3370100.zip) = 76184e913399734982ddad256273603670e650fc2332ac20a044218fb7e8df69e77ad0970af328d8a8c4403f11de29a7b01ded6a72b9cf727c41d14ccaefd316
5Size (sqlite-doc-3370000.zip) = 10509325 bytes 5Size (sqlite-doc-3370100.zip) = 10530906 bytes

cvs diff -r1.108 -r1.109 pkgsrc/databases/sqlite3-tcl/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3-tcl/Makefile 2021/12/08 16:03:50 1.108
+++ pkgsrc/databases/sqlite3-tcl/Makefile 2021/12/30 20:31:51 1.109
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.108 2021/12/08 16:03:50 adam Exp $ 1# $NetBSD: Makefile,v 1.109 2021/12/30 20:31:51 adam Exp $
2 2
3PKGREVISION= 1 
4.include "../../databases/sqlite3/Makefile.common" 3.include "../../databases/sqlite3/Makefile.common"
5 4
6DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION} 5DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION}
7PKGNAME= sqlite3-tcl-${SQLITE3_VERSION} 6PKGNAME= sqlite3-tcl-${SQLITE3_VERSION}
8CATEGORIES= databases 7CATEGORIES= databases
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= SQL Database Engine in a C Library (TCL extension) 10COMMENT= SQL Database Engine in a C Library (TCL extension)
12 11
13WRKSRC= ${WRKDIR}/${DISTNAME}/tea 12WRKSRC= ${WRKDIR}/${DISTNAME}/tea
14 13
15USE_TOOLS+= gmake 14USE_TOOLS+= gmake
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes

cvs diff -r1.120 -r1.121 pkgsrc/databases/sqlite3-tcl/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sqlite3-tcl/distinfo 2021/11/28 20:48:29 1.120
+++ pkgsrc/databases/sqlite3-tcl/distinfo 2021/12/30 20:31:51 1.121
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.120 2021/11/28 20:48:29 adam Exp $ 1$NetBSD: distinfo,v 1.121 2021/12/30 20:31:51 adam Exp $
2 2
3BLAKE2s (sqlite-autoconf-3370000.tar.gz) = df964e39d338c8a4ba4fecd8a0be9d1b8536867cd0b8e27ed168fc8c202200fb 3BLAKE2s (sqlite-autoconf-3370100.tar.gz) = d8a824e862b52e29909aadee7334848affda012331c7e6ba8767fc4a6b257d90
4SHA512 (sqlite-autoconf-3370000.tar.gz) = 413655d7b61b4d0a510bc42eb2e4f3e801ff35dee7d825d84b8397c956f23c5eac6a1a73134d3d7a63e40704968a4607d5762a137557e688ec5f87efb5b729ea 4SHA512 (sqlite-autoconf-3370100.tar.gz) = 426f087733a864ed16648b162f80484ffdb415c55da837224fd22365c2ab4621840af984f9c8eb4f1d91aceaabb1f4c1285bd9e92a678f686fdd5d4544f98c81
5Size (sqlite-autoconf-3370000.tar.gz) = 3001298 bytes 5Size (sqlite-autoconf-3370100.tar.gz) = 3001542 bytes
6SHA1 (patch-Makefile.in) = 6cbbc33a5bc9c98b5aa128279f8e21e47406f537 6SHA1 (patch-Makefile.in) = 6cbbc33a5bc9c98b5aa128279f8e21e47406f537

cvs diff -r1.49 -r1.50 pkgsrc/devel/lemon/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/lemon/distinfo 2021/11/28 20:48:29 1.49
+++ pkgsrc/devel/lemon/distinfo 2021/12/30 20:31:51 1.50
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.49 2021/11/28 20:48:29 adam Exp $ 1$NetBSD: distinfo,v 1.50 2021/12/30 20:31:51 adam Exp $
2 2
3BLAKE2s (sqlite-src-3370000.zip) = 0925ae0bdd00ab5371f9145510a2cc0a5dc3a6596b7bfbfc4ff729569762448f 3BLAKE2s (sqlite-src-3370100.zip) = 11efb1dfad47a0b71310ab259feac5801e45d43fc7d1b97dd4842b1b63651ef5
4SHA512 (sqlite-src-3370000.zip) = 5a3c358c42782bc248a0795ca78a10d834861f98ab0a021a05d8358ba1716f3febb3da29ded187dfd205902f77bbf284ed3207aabe4979b68b90d0557d1676f7 4SHA512 (sqlite-src-3370100.zip) = ff808f9541f53174ae221a6eb0f937643d46157ed3940f72f08910e9c68a08419a118933089dc771ef30d1af5ce397e96d5379198568029b09ad167dfd4242eb
5Size (sqlite-src-3370000.zip) = 13141152 bytes 5Size (sqlite-src-3370100.zip) = 13142659 bytes