gh-129917: Update installers to use SQLite 3.49.1 (#131025)

Co-authored-by: Ned Deily <nad@python.org>
This commit is contained in:
Erlend E. Aasland 2025-03-31 23:13:17 +02:00 committed by GitHub
parent 2e96f5ae4d
commit 45a3ab5a81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 15 additions and 14 deletions

View file

@ -139,7 +139,7 @@ def make_build_python(context):
def unpack_deps(host): def unpack_deps(host):
deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download" deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
for name_ver in ["bzip2-1.0.8-2", "libffi-3.4.4-3", "openssl-3.0.15-4", for name_ver in ["bzip2-1.0.8-2", "libffi-3.4.4-3", "openssl-3.0.15-4",
"sqlite-3.45.3-3", "xz-5.4.6-1"]: "sqlite-3.49.1-0", "xz-5.4.6-1"]:
filename = f"{name_ver}-{host}.tar.gz" filename = f"{name_ver}-{host}.tar.gz"
download(f"{deps_url}/{name_ver}/{filename}") download(f"{deps_url}/{name_ver}/{filename}")
run(["tar", "-xf", filename]) run(["tar", "-xf", filename])

View file

@ -359,9 +359,9 @@ def library_recipes():
), ),
), ),
dict( dict(
name="SQLite 3.45.3", name="SQLite 3.49.1",
url="https://sqlite.org/2024/sqlite-autoconf-3450300.tar.gz", url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz",
checksum="b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531", checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254",
extra_cflags=('-Os ' extra_cflags=('-Os '
'-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS5 '
'-DSQLITE_ENABLE_FTS4 ' '-DSQLITE_ENABLE_FTS4 '
@ -372,11 +372,10 @@ def library_recipes():
), ),
configure_pre=[ configure_pre=[
'--enable-threadsafe', '--enable-threadsafe',
'--enable-shared=no',
'--enable-static=yes',
'--disable-readline', '--disable-readline',
'--disable-dependency-tracking', '--disable-dependency-tracking',
] ],
install=f"make && ranlib libsqlite3.a && make install DESTDIR={shellQuote(os.path.join(WORKDIR, 'libraries'))}",
), ),
dict( dict(
name="libmpdec 4.0.0", name="libmpdec 4.0.0",

View file

@ -0,0 +1 @@
Update Windows installer to ship with SQLite 3.49.1.

View file

@ -0,0 +1 @@
Update macOS installer to ship with SQLite 3.49.1.

View file

@ -91,21 +91,21 @@
"checksums": [ "checksums": [
{ {
"algorithm": "SHA256", "algorithm": "SHA256",
"checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504" "checksumValue": "e335aeb44fa36cde60ecbb6a9f8be6f5d449d645ce9b0199ee53a7e6728d19d2"
} }
], ],
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45.3.0.tar.gz", "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.49.1.0.tar.gz",
"externalRefs": [ "externalRefs": [
{ {
"referenceCategory": "SECURITY", "referenceCategory": "SECURITY",
"referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.45.3.0:*:*:*:*:*:*:*", "referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.49.1.0:*:*:*:*:*:*:*",
"referenceType": "cpe23Type" "referenceType": "cpe23Type"
} }
], ],
"licenseConcluded": "NOASSERTION", "licenseConcluded": "NOASSERTION",
"name": "sqlite", "name": "sqlite",
"primaryPackagePurpose": "SOURCE", "primaryPackagePurpose": "SOURCE",
"versionInfo": "3.45.3.0" "versionInfo": "3.49.1.0"
}, },
{ {
"SPDXID": "SPDXRef-PACKAGE-tcl-core", "SPDXID": "SPDXRef-PACKAGE-tcl-core",

View file

@ -55,7 +55,7 @@ set libraries=%libraries% bzip2-1.0.8
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.16 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.16
set libraries=%libraries% mpdecimal-4.0.0 set libraries=%libraries% mpdecimal-4.0.0
set libraries=%libraries% sqlite-3.45.3.0 set libraries=%libraries% sqlite-3.49.1.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0
set libraries=%libraries% xz-5.2.5 set libraries=%libraries% xz-5.2.5

View file

@ -74,7 +74,7 @@
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" /> <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
<PropertyGroup> <PropertyGroup>
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir> <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.1.0\</sqlite3Dir>
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>

View file

@ -230,7 +230,7 @@ _ssl
again when building. again when building.
_sqlite3 _sqlite3
Wraps SQLite 3.45.3, which is itself built by sqlite3.vcxproj Wraps SQLite 3.49.1, which is itself built by sqlite3.vcxproj
Homepage: Homepage:
https://www.sqlite.org/ https://www.sqlite.org/
_tkinter _tkinter