From 89bf19418bc55756b02f0647b49d036b25cdbf96 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sun, 9 Feb 2025 21:34:40 +0100 Subject: [PATCH 1/7] gh-129917: Update installers to use SQLite 3.49 --- Android/android.py | 2 +- Mac/BuildScript/build-installer.py | 6 +++--- Misc/externals.spdx.json | 8 ++++---- PCbuild/get_externals.bat | 2 +- PCbuild/python.props | 2 +- PCbuild/readme.txt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) 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..fdcda69a616902 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.39.1", + url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz", + checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254", extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index d54b1fbe251378..8647d3b1487971 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -94,18 +94,18 @@ "checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504" } ], - "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": [ { "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", @@ -193,4 +193,4 @@ } ], "spdxVersion": "SPDX-2.3" -} \ No newline at end of file +} diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index dfacd1d1e788d4..c6ff9cddb59b07 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.15 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 6e90178f4ea8ab..f9f364bcf1329c 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -64,7 +64,7 @@ - $(ExternalsDir)sqlite-3.45.3.0\ + $(ExternalsDir)sqlite-3.49.1.0\ $(ExternalsDir)bzip2-1.0.8\ $(ExternalsDir)xz-5.2.5\ $(ExternalsDir)libffi-3.4.4\ diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 33952d31681cbc..38bf68c3b6d50f 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 From 5791ba4634ce9da971132d5bd543edf4e4fa8bd7 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sun, 9 Mar 2025 21:45:55 +0100 Subject: [PATCH 2/7] NEWS --- .../next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst | 1 + .../next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst | 1 + 2 files changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst create mode 100644 Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst 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. From e8589c1f9969e941992ca3d8ecb1c8460b1dde6f Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Thu, 13 Mar 2025 01:02:20 -0400 Subject: [PATCH 3/7] typo: 3.39.1 -> 3.49.1 --- Mac/BuildScript/build-installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index fdcda69a616902..3564e939b51bf6 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -359,7 +359,7 @@ def library_recipes(): ), ), dict( - name="SQLite 3.39.1", + name="SQLite 3.49.1", url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz", checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254", extra_cflags=('-Os ' From deb8d8edf56b768dc0cd942a47252ba794d91102 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Thu, 13 Mar 2025 01:40:54 -0400 Subject: [PATCH 4/7] remove outdated configure options --- Mac/BuildScript/build-installer.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 3564e939b51bf6..38fd1de4d75afd 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -372,8 +372,6 @@ def library_recipes(): ), configure_pre=[ '--enable-threadsafe', - '--enable-shared=no', - '--enable-static=yes', '--disable-readline', '--disable-dependency-tracking', ] From a3fb3b0fad49a9ea8442a71c5bb84717f18ef7c7 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 14 Mar 2025 03:35:33 -0400 Subject: [PATCH 5/7] update build recipe to fix sqlite3 universal static lib --- Mac/BuildScript/build-installer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 38fd1de4d75afd..04a0e31b46329d 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -374,7 +374,8 @@ def library_recipes(): '--enable-threadsafe', '--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", From f8dff9707494cc5820b09496f6b85938fa065233 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 31 Mar 2025 00:19:23 +0200 Subject: [PATCH 6/7] Fix sha --- Misc/externals.spdx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index feaa5090ea86f7..88764db16e88bb 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -91,7 +91,7 @@ "checksums": [ { "algorithm": "SHA256", - "checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504" + "checksumValue": "e335aeb44fa36cde60ecbb6a9f8be6f5d449d645ce9b0199ee53a7e6728d19d2" } ], "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.49.1.0.tar.gz", From 4fe5959459ff47bdcb164a592e2c4cbca9e78536 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 31 Mar 2025 00:35:51 +0200 Subject: [PATCH 7/7] noeol --- Misc/externals.spdx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index 88764db16e88bb..13be10ca039286 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -193,4 +193,4 @@ } ], "spdxVersion": "SPDX-2.3" -} +} \ No newline at end of file