Skip to content

Commit 67087d9

Browse files
miss-islingtonerlend-aaslandned-deily
authored
[3.13] gh-129917: Update installers to use SQLite 3.49.1 (GH-131025) (#131957)
gh-129917: Update installers to use SQLite 3.49.1 (GH-131025) (cherry picked from commit 45a3ab5) Co-authored-by: Erlend E. Aasland <erlend@python.org> Co-authored-by: Ned Deily <nad@python.org>
1 parent 4913b6f commit 67087d9

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

Android/android.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def make_build_python(context):
139139
def unpack_deps(host):
140140
deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
141141
for name_ver in ["bzip2-1.0.8-2", "libffi-3.4.4-3", "openssl-3.0.15-4",
142-
"sqlite-3.45.3-3", "xz-5.4.6-1"]:
142+
"sqlite-3.49.1-0", "xz-5.4.6-1"]:
143143
filename = f"{name_ver}-{host}.tar.gz"
144144
download(f"{deps_url}/{name_ver}/{filename}")
145145
run(["tar", "-xf", filename])

Mac/BuildScript/build-installer.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@ def library_recipes():
359359
),
360360
),
361361
dict(
362-
name="SQLite 3.45.3",
363-
url="https://sqlite.org/2024/sqlite-autoconf-3450300.tar.gz",
364-
checksum="b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531",
362+
name="SQLite 3.49.1",
363+
url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz",
364+
checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254",
365365
extra_cflags=('-Os '
366366
'-DSQLITE_ENABLE_FTS5 '
367367
'-DSQLITE_ENABLE_FTS4 '
@@ -372,11 +372,10 @@ def library_recipes():
372372
),
373373
configure_pre=[
374374
'--enable-threadsafe',
375-
'--enable-shared=no',
376-
'--enable-static=yes',
377375
'--disable-readline',
378376
'--disable-dependency-tracking',
379-
]
377+
],
378+
install=f"make && ranlib libsqlite3.a && make install DESTDIR={shellQuote(os.path.join(WORKDIR, 'libraries'))}",
380379
),
381380
dict(
382381
name="libmpdec 4.0.0",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update Windows installer to ship with SQLite 3.49.1.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update macOS installer to ship with SQLite 3.49.1.

Misc/externals.spdx.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,21 @@
9191
"checksums": [
9292
{
9393
"algorithm": "SHA256",
94-
"checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504"
94+
"checksumValue": "e335aeb44fa36cde60ecbb6a9f8be6f5d449d645ce9b0199ee53a7e6728d19d2"
9595
}
9696
],
97-
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45.3.0.tar.gz",
97+
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.49.1.0.tar.gz",
9898
"externalRefs": [
9999
{
100100
"referenceCategory": "SECURITY",
101-
"referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.45.3.0:*:*:*:*:*:*:*",
101+
"referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.49.1.0:*:*:*:*:*:*:*",
102102
"referenceType": "cpe23Type"
103103
}
104104
],
105105
"licenseConcluded": "NOASSERTION",
106106
"name": "sqlite",
107107
"primaryPackagePurpose": "SOURCE",
108-
"versionInfo": "3.45.3.0"
108+
"versionInfo": "3.49.1.0"
109109
},
110110
{
111111
"SPDXID": "SPDXRef-PACKAGE-tcl-core",

PCbuild/get_externals.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ set libraries=%libraries% bzip2-1.0.8
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
5656
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.16
5757
set libraries=%libraries% mpdecimal-4.0.0
58-
set libraries=%libraries% sqlite-3.45.3.0
58+
set libraries=%libraries% sqlite-3.49.1.0
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0
6060
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0
6161
set libraries=%libraries% xz-5.2.5

PCbuild/python.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
6969

7070
<PropertyGroup>
71-
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir>
71+
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.1.0\</sqlite3Dir>
7272
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
7373
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
7474
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>

PCbuild/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ _ssl
191191
again when building.
192192

193193
_sqlite3
194-
Wraps SQLite 3.45.3, which is itself built by sqlite3.vcxproj
194+
Wraps SQLite 3.49.1, which is itself built by sqlite3.vcxproj
195195
Homepage:
196196
https://www.sqlite.org/
197197
_tkinter

0 commit comments

Comments
 (0)