diff mbox series

sqlite3: upgrade 3.50.4 -> 3.51.0

Message ID 20251125225257.2579493-1-peter.marko@siemens.com
State New
Headers show
Series sqlite3: upgrade 3.50.4 -> 3.51.0 | expand

Commit Message

Peter Marko Nov. 25, 2025, 10:52 p.m. UTC
From: Peter Marko <peter.marko@siemens.com>

Handles CVE-2025-7709.

Drop commit included in this release.
Refresh and rename the other patch.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 ... => 0001-Add-option-to-disable-zlib.patch} |  4 +-
 ...rpath-configure-script-flag-to-addre.patch | 57 -------------------
 meta/recipes-support/sqlite/sqlite3_3.50.4.bb | 10 ----
 meta/recipes-support/sqlite/sqlite3_3.51.0.bb |  9 +++
 4 files changed, 11 insertions(+), 69 deletions(-)
 rename meta/recipes-support/sqlite/sqlite3/{0002-Add-option-to-disable-zlib.patch => 0001-Add-option-to-disable-zlib.patch} (93%)
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/0001-Add-the-disable-rpath-configure-script-flag-to-addre.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.50.4.bb
 create mode 100644 meta/recipes-support/sqlite/sqlite3_3.51.0.bb
diff mbox series

Patch

diff --git a/meta/recipes-support/sqlite/sqlite3/0002-Add-option-to-disable-zlib.patch b/meta/recipes-support/sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch
similarity index 93%
rename from meta/recipes-support/sqlite/sqlite3/0002-Add-option-to-disable-zlib.patch
rename to meta/recipes-support/sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch
index 2855372c21..77181fe4df 100644
--- a/meta/recipes-support/sqlite/sqlite3/0002-Add-option-to-disable-zlib.patch
+++ b/meta/recipes-support/sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch
@@ -32,7 +32,7 @@  diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
 index 85fe414382..77190a7053 100644
 --- a/autosetup/sqlite-config.tcl
 +++ b/autosetup/sqlite-config.tcl
-@@ -274,6 +274,14 @@ proc sqlite-configure {buildMode configScript} {
+@@ -287,6 +287,14 @@ proc sqlite-configure {buildMode configScript} {
        }
      }
  
@@ -47,7 +47,7 @@  index 85fe414382..77190a7053 100644
      # Options for ICU: International Components for Unicode
      icu {
        {*} {
-@@ -641,7 +649,7 @@ proc sqlite-check-common-system-deps {} {
+@@ -656,7 +664,7 @@ proc sqlite-check-common-system-deps {} {
      string.h strings.h \
      inttypes.h
  
diff --git a/meta/recipes-support/sqlite/sqlite3/0001-Add-the-disable-rpath-configure-script-flag-to-addre.patch b/meta/recipes-support/sqlite/sqlite3/0001-Add-the-disable-rpath-configure-script-flag-to-addre.patch
deleted file mode 100644
index f1e93a1c9a..0000000000
--- a/meta/recipes-support/sqlite/sqlite3/0001-Add-the-disable-rpath-configure-script-flag-to-addre.patch
+++ /dev/null
@@ -1,57 +0,0 @@ 
-From 87c807c6dd4df67328919fa28e89a06839e634fe Mon Sep 17 00:00:00 2001
-From: stephan <stephan@noemail.net>
-Date: Sun, 22 Jun 2025 22:48:11 +0000
-Subject: [PATCH] Add the --disable-rpath configure script flag to address
- [forum:13cac3b56516f849 | forum post 13cac3b56516f849].
-
-FossilOrigin-Name: a59d9bb25e518f5d79f654615b92f6c50cfb704b5abee0f820912644b89366c5
-
-Upstream-Status: Backport [https://github.com/sqlite/sqlite/commit/87c807c6dd4df67328919fa28e89a06839e634fe]
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- autosetup/sqlite-config.tcl | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
-index bb81123204..4dd065095e 100644
---- a/autosetup/sqlite-config.tcl
-+++ b/autosetup/sqlite-config.tcl
-@@ -334,8 +334,8 @@ proc sqlite-configure {buildMode configScript} {
-           => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c}
-       }
-       {canonical autoconf} {
--        # A potential TODO without a current use case:
--        #rpath=1 => {Disable use of the rpath linker flag}
-+        rpath=1 => {Disable use of the rpath linker flag}
-+
-         # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded
-         soname:=legacy
-           => {SONAME for libsqlite3.so. "none", or not using this flag, sets no
-@@ -2119,7 +2119,6 @@ proc sqlite-handle-tcl {} {
- ########################################################################
- # Handle the --enable/disable-rpath flag.
- proc sqlite-handle-rpath {} {
--  proj-check-rpath
-   # autosetup/cc-shared.tcl sets the rpath flag definition in
-   # [get-define SH_LINKRPATH], but it does so on a per-platform basis
-   # rather than as a compiler check. Though we should do a proper
-@@ -2128,12 +2127,13 @@ proc sqlite-handle-rpath {} {
-   # for which sqlite-env-is-unix-on-windows returns a non-empty
-   # string.
- 
--#  if {[proj-opt-truthy rpath]} {
--#    proj-check-rpath
--#  } else {
--#    msg-result "Disabling use of rpath."
--#    define LDFLAGS_RPATH ""
--#  }
-+  # https://sqlite.org/forum/forumpost/13cac3b56516f849
-+  if {[proj-opt-truthy rpath]} {
-+    proj-check-rpath
-+  } else {
-+    msg-result "Disabling use of rpath."
-+    define LDFLAGS_RPATH ""
-+  }
- }
- 
- ########################################################################
diff --git a/meta/recipes-support/sqlite/sqlite3_3.50.4.bb b/meta/recipes-support/sqlite/sqlite3_3.50.4.bb
deleted file mode 100644
index b822d7e919..0000000000
--- a/meta/recipes-support/sqlite/sqlite3_3.50.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@ 
-require sqlite3.inc
-
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
-
-SRC_URI = "http://www.sqlite.org/2025/sqlite-autoconf-${SQLITE_PV}.tar.gz"
-SRC_URI[sha256sum] = "a3db587a1b92ee5ddac2f66b3edb41b26f9c867275782d46c3a088977d6a5b18"
-
-SRC_URI += "file://0001-Add-the-disable-rpath-configure-script-flag-to-addre.patch"
-SRC_URI += "file://0002-Add-option-to-disable-zlib.patch"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.51.0.bb b/meta/recipes-support/sqlite/sqlite3_3.51.0.bb
new file mode 100644
index 0000000000..258b2c6505
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3_3.51.0.bb
@@ -0,0 +1,9 @@ 
+require sqlite3.inc
+
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
+
+SRC_URI = "http://www.sqlite.org/2025/sqlite-autoconf-${SQLITE_PV}.tar.gz"
+SRC_URI[sha256sum] = "42e26dfdd96aa2e6b1b1be5c88b0887f9959093f650d693cb02eb9c36d146ca5"
+
+SRC_URI += "file://0001-Add-option-to-disable-zlib.patch"