]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] gh-129917: Update installers to use SQLite 3.49.1 (GH-131025) (#131957)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 31 Mar 2025 21:37:14 +0000 (23:37 +0200)
committerGitHub <noreply@github.com>
Mon, 31 Mar 2025 21:37:14 +0000 (21:37 +0000)
gh-129917: Update installers to use SQLite 3.49.1 (GH-131025)

(cherry picked from commit 45a3ab5a81769eadd94da3e26eb9bb2f3ae80fb1)

Co-authored-by: Erlend E. Aasland <erlend@python.org>
Co-authored-by: Ned Deily <nad@python.org>
Android/android.py
Mac/BuildScript/build-installer.py
Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst [new file with mode: 0644]
Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst [new file with mode: 0644]
Misc/externals.spdx.json
PCbuild/get_externals.bat
PCbuild/python.props
PCbuild/readme.txt

index ae630aa8f4427cfac40eefea6dafb32ef6c1f54f..a2a31b23f6403b9ffa2776371377418c8591d4f8 100755 (executable)
@@ -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])
index f5f0ed44884142cc5435720a92313e6d43e00ed5..10e64a89532f7940158360aeee8a7e0a461c3519 100755 (executable)
@@ -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 (file)
index 0000000..0764232
--- /dev/null
@@ -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 (file)
index 0000000..c82feb3
--- /dev/null
@@ -0,0 +1 @@
+Update macOS installer to ship with SQLite 3.49.1.
index 5b844b28bb15215d33b0734fbd63b441b3865fbd..40518e8844e4bc7d41a94ccc46e951cb8ad1ba9b 100644 (file)
       "checksums": [
         {
           "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": [
         {
           "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",
index 50493486d334b9e1074777db43d84f24a885c36e..dd4ca00c5c4cb14f5527fe8e015a48df30dea8ac 100644 (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 "%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
index e3c7fd225ed79654285e5926d7f19d380c397908..087f0b588b9f426ed5fc2c52b0025944965664ed 100644 (file)
@@ -68,7 +68,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>
index 42d87fc9cd8e64e9d8dda1d61ac927959669f52a..f2c70de5b481e453b29dec12a54e9a482fa0415b 100644 (file)
@@ -191,7 +191,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