https://github.com/python/cpython/commit/45a3ab5a81769eadd94da3e26eb9bb2f3ae... commit: 45a3ab5a81769eadd94da3e26eb9bb2f3ae80fb1 branch: main author: Erlend E. Aasland <erlend@python.org> committer: erlend-aasland <erlend.aasland@protonmail.com> date: 2025-03-31T23:13:17+02:00 summary: gh-129917: Update installers to use SQLite 3.49.1 (#131025) Co-authored-by: Ned Deily <nad@python.org> files: A Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst A Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst M Android/android.py M Mac/BuildScript/build-installer.py M Misc/externals.spdx.json M PCbuild/get_externals.bat M PCbuild/python.props M PCbuild/readme.txt diff --git a/Android/android.py b/Android/android.py index ae630aa8f4427c..a2a31b23f6403b 100755 --- a/Android/android.py +++ b/Android/android.py @@ -139,7 +139,7 @@ def make_build_python(context): def unpack_deps(host): 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", - "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" download(f"{deps_url}/{name_ver}/{filename}") run(["tar", "-xf", filename]) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index cb2484767e6449..04a0e31b46329d 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -359,9 +359,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.45.3", - url="https://sqlite.org/2024/sqlite-autoconf-3450300.tar.gz", - checksum="b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531", + name="SQLite 3.49.1", + url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz", + checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254", extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' @@ -372,11 +372,10 @@ def library_recipes(): ), configure_pre=[ '--enable-threadsafe', - '--enable-shared=no', - '--enable-static=yes', '--disable-readline', '--disable-dependency-tracking', - ] + ], + install=f"make && ranlib libsqlite3.a && make install DESTDIR={shellQuote(os.path.join(WORKDIR, 'libraries'))}", ), dict( name="libmpdec 4.0.0", diff --git a/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst new file mode 100644 index 00000000000000..0764232bb5f434 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst @@ -0,0 +1 @@ +Update Windows installer to ship with SQLite 3.49.1. diff --git a/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst new file mode 100644 index 00000000000000..c82feb3efebba7 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst @@ -0,0 +1 @@ +Update macOS installer to ship with SQLite 3.49.1. diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index 1ff2c8d7477313..13be10ca039286 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -91,21 +91,21 @@ "checksums": [ { "algorithm": "SHA256", - "checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504" + "checksumValue": "e335aeb44fa36cde60ecbb6a9f8be6f5d449d645ce9b0199ee53a7e6728d19d2" } ], - "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45....", + "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.49....", "externalRefs": [ { "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" } ], "licenseConcluded": "NOASSERTION", "name": "sqlite", "primaryPackagePurpose": "SOURCE", - "versionInfo": "3.45.3.0" + "versionInfo": "3.49.1.0" }, { "SPDXID": "SPDXRef-PACKAGE-tcl-core", diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 4e4d5c6b53aec9..51a76866e840e3 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -55,7 +55,7 @@ set libraries=%libraries% bzip2-1.0.8 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.16 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% tk-8.6.15.0 set libraries=%libraries% xz-5.2.5 diff --git a/PCbuild/python.props b/PCbuild/python.props index d923bfab8a13b4..514576ce14f47e 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -74,7 +74,7 @@ <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" /> <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> <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index cbbee8bcea06d3..c02c12be5113b0 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -230,7 +230,7 @@ _ssl again when building. _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: https://www.sqlite.org/ _tkinter