From 3bf8e2db26245ef94044c7abfdd718a10b8182a6 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 28 Mar 2023 13:01:40 +0000 Subject: [PATCH] sqlite3: updated to 3.41.2 version 3.41.2 (2023-03-22): Multiple fixes for reads past the end of memory buffers (NB: reads not writes) in the following circumstances: When processing a corrupt database file using the non-standard SQLITE_ENABLE_STAT4 compile-time option. In the CLI when the sqlite3_error_offset() routine returns an out-of-range value (see also the fix to sqlite3_error_offset() below). In the recovery extension. In FTS3 when processing a corrupt database file. Fix the sqlite3_error_offset() so that it does not return out-of-range values when reporting errors associated with generated columns. Multiple fixes in the query optimizer for problems that cause incorrect results for bizarre, fuzzer-generated queries. Increase the size of the reference counter in the page cache object to 64 bits to ensure that the counter never overflows. Fix a performance regression caused by a bug fix in patch release 3.41.1. Fix a few incorrect assert() statements. --- databases/sqlite3-docs/PLIST | 3 ++- databases/sqlite3-docs/distinfo | 8 ++++---- databases/sqlite3-tcl/distinfo | 9 ++++----- databases/sqlite3-tcl/patches/patch-configure | 17 ----------------- databases/sqlite3/Makefile.common | 6 +++--- databases/sqlite3/distinfo | 8 ++++---- devel/lemon/distinfo | 8 ++++---- 7 files changed, 21 insertions(+), 38 deletions(-) delete mode 100644 databases/sqlite3-tcl/patches/patch-configure diff --git a/databases/sqlite3-docs/PLIST b/databases/sqlite3-docs/PLIST index 6f1c981e9303..4e60a80c3d69 100644 --- a/databases/sqlite3-docs/PLIST +++ b/databases/sqlite3-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.122 2023/03/12 10:34:32 adam Exp $ +@comment $NetBSD: PLIST,v 1.123 2023/03/28 13:01:40 adam Exp $ share/doc/sqlite3/34to35.html share/doc/sqlite3/35to36.html share/doc/sqlite3/about.html @@ -680,6 +680,7 @@ share/doc/sqlite3/releaselog/3_40_0.html share/doc/sqlite3/releaselog/3_40_1.html share/doc/sqlite3/releaselog/3_41_0.html share/doc/sqlite3/releaselog/3_41_1.html +share/doc/sqlite3/releaselog/3_41_2.html share/doc/sqlite3/releaselog/3_4_0.html share/doc/sqlite3/releaselog/3_4_1.html share/doc/sqlite3/releaselog/3_4_2.html diff --git a/databases/sqlite3-docs/distinfo b/databases/sqlite3-docs/distinfo index 58b1ea07395c..5f612fef3997 100644 --- a/databases/sqlite3-docs/distinfo +++ b/databases/sqlite3-docs/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.125 2023/03/12 10:34:32 adam Exp $ +$NetBSD: distinfo,v 1.126 2023/03/28 13:01:40 adam Exp $ -BLAKE2s (sqlite-doc-3410100.zip) = 6cf605f02c0454b886f63e9783a2f379814f54b496cc20712ebf4e58bcb24176 -SHA512 (sqlite-doc-3410100.zip) = 796e3f75506ab1819043377cfaa96ff156e962b19d1aa5f04da591842ea52bc4e5dc5c69d765d9d7debd34e9075e1c48276d0a57c90d914ccb6236044cad0895 -Size (sqlite-doc-3410100.zip) = 10996110 bytes +BLAKE2s (sqlite-doc-3410200.zip) = b163a40d95e5ffa08134dee847aa5015a5ac6bdece647c17d340a348cd84848c +SHA512 (sqlite-doc-3410200.zip) = 77099fd3bfdb0c19baedb1248c5ff028a14cbc98d18956dfb13e55289a7dddbe82d25e4522f0cbbe9c2798e0531c354df5a207f89c62dfe0f84877db47bb4f9e +Size (sqlite-doc-3410200.zip) = 10633275 bytes diff --git a/databases/sqlite3-tcl/distinfo b/databases/sqlite3-tcl/distinfo index aba78915e2b7..5397e2f588a9 100644 --- a/databases/sqlite3-tcl/distinfo +++ b/databases/sqlite3-tcl/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.137 2023/03/12 10:34:33 adam Exp $ +$NetBSD: distinfo,v 1.138 2023/03/28 13:01:41 adam Exp $ -BLAKE2s (sqlite-autoconf-3410100.tar.gz) = c0c9a4f14fec640511547dbfbd8fd9a43a0d99cafe4e08d7b41300eda896edb1 -SHA512 (sqlite-autoconf-3410100.tar.gz) = 6e6dafc35b8b11df3cd3bea48aaf84a102893242cffbe18eb7b111791563095111a2a8a5632636b8f46523d98d16e2b48dab79ee6707a141b22c2e6fde3002a2 -Size (sqlite-autoconf-3410100.tar.gz) = 3125153 bytes +BLAKE2s (sqlite-autoconf-3410200.tar.gz) = 60bbbdb9926d9aa18607b6fee461be39ef72cc1867fe0b25904479be1ac0c9db +SHA512 (sqlite-autoconf-3410200.tar.gz) = 8059dc4cf509dc2810fff5cc31a8aa595bf0a3ae5bc90cb7495b773b78e0a974927cf3e37cf720ed2e284dbcaf6cef05d35e248d8fbb0f0a4ee8d0a65118b67c +Size (sqlite-autoconf-3410200.tar.gz) = 3125545 bytes SHA1 (patch-Makefile.in) = 8f68039c9169bc69eb0da4bd0f910c7584aed2b5 -SHA1 (patch-configure) = 907ba5c474214fa487d782db26a6858297f92b3b diff --git a/databases/sqlite3-tcl/patches/patch-configure b/databases/sqlite3-tcl/patches/patch-configure deleted file mode 100644 index b329ae55388b..000000000000 --- a/databases/sqlite3-tcl/patches/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-configure,v 1.3 2023/03/12 10:34:33 adam Exp $ - -Fix version. - ---- configure.orig 2023-03-12 10:29:25.000000000 +0000 -+++ configure -@@ -608,8 +608,8 @@ MAKEFLAGS= - # Identity of this package. - PACKAGE_NAME='sqlite' - PACKAGE_TARNAME='sqlite' --PACKAGE_VERSION='3.41.0' --PACKAGE_STRING='sqlite 3.41.0' -+PACKAGE_VERSION='3.41.1' -+PACKAGE_STRING='sqlite 3.41.1' - PACKAGE_BUGREPORT='' - PACKAGE_URL='' - diff --git a/databases/sqlite3/Makefile.common b/databases/sqlite3/Makefile.common index 1eceadf4fa5f..4e3861cb8d1b 100644 --- a/databases/sqlite3/Makefile.common +++ b/databases/sqlite3/Makefile.common @@ -1,12 +1,12 @@ -# $NetBSD: Makefile.common,v 1.99 2023/03/12 10:34:32 adam Exp $ +# $NetBSD: Makefile.common,v 1.100 2023/03/28 13:01:40 adam Exp $ # # used by databases/sqlite3/Makefile # used by databases/sqlite3-docs/Makefile # used by databases/sqlite3-tcl/Makefile # used by devel/lemon/Makefile -SQLITE3_DISTVERSION= 3410100 -SQLITE3_VERSION= 3.41.1 +SQLITE3_DISTVERSION= 3410200 +SQLITE3_VERSION= 3.41.2 MASTER_SITES= http://www.sqlite.org/2023/ MASTER_SITES+= http://www.hwaci.com/sw/sqlite/2023/ diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo index 76c0f6774b54..30902e5bbb3b 100644 --- a/databases/sqlite3/distinfo +++ b/databases/sqlite3/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.192 2023/03/12 10:34:32 adam Exp $ +$NetBSD: distinfo,v 1.193 2023/03/28 13:01:40 adam Exp $ -BLAKE2s (sqlite-autoconf-3410100.tar.gz) = c0c9a4f14fec640511547dbfbd8fd9a43a0d99cafe4e08d7b41300eda896edb1 -SHA512 (sqlite-autoconf-3410100.tar.gz) = 6e6dafc35b8b11df3cd3bea48aaf84a102893242cffbe18eb7b111791563095111a2a8a5632636b8f46523d98d16e2b48dab79ee6707a141b22c2e6fde3002a2 -Size (sqlite-autoconf-3410100.tar.gz) = 3125153 bytes +BLAKE2s (sqlite-autoconf-3410200.tar.gz) = 60bbbdb9926d9aa18607b6fee461be39ef72cc1867fe0b25904479be1ac0c9db +SHA512 (sqlite-autoconf-3410200.tar.gz) = 8059dc4cf509dc2810fff5cc31a8aa595bf0a3ae5bc90cb7495b773b78e0a974927cf3e37cf720ed2e284dbcaf6cef05d35e248d8fbb0f0a4ee8d0a65118b67c +Size (sqlite-autoconf-3410200.tar.gz) = 3125545 bytes SHA1 (patch-configure) = c0aa83bddc20d090b3cd2fd840ac69031f4396e4 diff --git a/devel/lemon/distinfo b/devel/lemon/distinfo index f2df07777c7a..d0f4d47a66ab 100644 --- a/devel/lemon/distinfo +++ b/devel/lemon/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.66 2023/03/12 10:34:33 adam Exp $ +$NetBSD: distinfo,v 1.67 2023/03/28 13:01:41 adam Exp $ -BLAKE2s (sqlite-src-3410100.zip) = fd0216ca2bc80c17d76e2a5ab6aa933058335fcd25eb7602384ae5147c8385f7 -SHA512 (sqlite-src-3410100.zip) = 840d2542825db2d1758cf9fa0f7159a8c6c7d40d23a5249d1c7bdf0210a6cc83e4dd8e3393c0c6e76e922a76614a1b5f311e232d7439759bdc0e2fbb4c12244a -Size (sqlite-src-3410100.zip) = 13833820 bytes +BLAKE2s (sqlite-src-3410200.zip) = 991729c2cd188103306cc30e569c242b206e9264a77230eaaf8468b675817ded +SHA512 (sqlite-src-3410200.zip) = 28cfa72f2b39d851c38fb757a0c6d0696c22548792ce2fa1be5e2f6084e4bf0a5fb216902b59ccba5b6ebaf140aab954ed7676d84841b58ad063404a119a0c17 +Size (sqlite-src-3410200.zip) = 13836230 bytes