From f03f22420005476e7789001beb370646d98470f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 20 Aug 2025 13:22:05 +0200 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 sqlite3 revision b21794d230ca213e73ec3d989c0c6b79 --- sqlite-3.49.0-fix-lemon-missing-cflags.patch | 25 ++++++++ sqlite-3.6.23-lemon-system-template.patch | 11 ++++ sqlite-doc-3490100.zip | 3 - sqlite-doc-3500200.zip | 3 + sqlite-src-3490100.zip | 3 - sqlite-src-3500200.zip | 3 + sqlite3-rpmlintrc | 2 + sqlite3.changes | 61 ++++++++++++++++++-- sqlite3.spec | 39 ++++++++++--- 9 files changed, 132 insertions(+), 18 deletions(-) create mode 100644 sqlite-3.49.0-fix-lemon-missing-cflags.patch create mode 100644 sqlite-3.6.23-lemon-system-template.patch delete mode 100644 sqlite-doc-3490100.zip create mode 100644 sqlite-doc-3500200.zip delete mode 100644 sqlite-src-3490100.zip create mode 100644 sqlite-src-3500200.zip create mode 100644 sqlite3-rpmlintrc diff --git a/sqlite-3.49.0-fix-lemon-missing-cflags.patch b/sqlite-3.49.0-fix-lemon-missing-cflags.patch new file mode 100644 index 0000000..d871142 --- /dev/null +++ b/sqlite-3.49.0-fix-lemon-missing-cflags.patch @@ -0,0 +1,25 @@ +From 0d7a62843abaa422130c78f6f69b996ee71a3c10 Mon Sep 17 00:00:00 2001 +From: Ales Nezbeda +Date: Thu, 27 Feb 2025 14:04:22 +0100 +Subject: [PATCH] Fix lemon not using CFLAGS + +--- + main.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main.mk b/main.mk +index 808f925..38749c8 100644 +--- a/main.mk ++++ b/main.mk +@@ -1058,7 +1058,7 @@ libsqlite3.SO = libsqlite3$(T.dll) + # Rules to build the LEMON compiler generator + # + lemon$(B.exe): $(MAKE_SANITY_CHECK) $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c +- $(B.cc) -o $@ $(TOP)/tool/lemon.c ++ $(T.cc) -o $@ $(TOP)/tool/lemon.c + cp $(TOP)/tool/lempar.c . + + # Rules to build the program that generates the source-id +-- +2.48.1 + diff --git a/sqlite-3.6.23-lemon-system-template.patch b/sqlite-3.6.23-lemon-system-template.patch new file mode 100644 index 0000000..2623a39 --- /dev/null +++ b/sqlite-3.6.23-lemon-system-template.patch @@ -0,0 +1,11 @@ +--- a/tool/lemon.c ++++ b/tool/lemon.c +@@ -3686,6 +3686,8 @@ + tpltname = buf; + }else if( access(templatename,004)==0 ){ + tpltname = templatename; ++ }else if( access("/usr/share/lemon/lempar.c", R_OK)==0){ ++ tpltname = "/usr/share/lemon/lempar.c"; + }else{ + toFree = tpltname = pathsearch(lemp->argv[0],templatename,0); + } diff --git a/sqlite-doc-3490100.zip b/sqlite-doc-3490100.zip deleted file mode 100644 index ea3750b..0000000 --- a/sqlite-doc-3490100.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4581e3340d9d0d8ce03f10fb8ab1cea03cf49fed8198478c1abf5d383521f037 -size 11333315 diff --git a/sqlite-doc-3500200.zip b/sqlite-doc-3500200.zip new file mode 100644 index 0000000..9227508 --- /dev/null +++ b/sqlite-doc-3500200.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f8ba2b53a3aa2c9166d46a02d911b85d3b8b0b840c491d321d5fc62150e3419 +size 11382890 diff --git a/sqlite-src-3490100.zip b/sqlite-src-3490100.zip deleted file mode 100644 index 08bbd04..0000000 --- a/sqlite-src-3490100.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4404d93cbce818b1b98ca7259d0ba9b45db76f2fdd9373e56f2d29b519f4d43b -size 14372402 diff --git a/sqlite-src-3500200.zip b/sqlite-src-3500200.zip new file mode 100644 index 0000000..f329e04 --- /dev/null +++ b/sqlite-src-3500200.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:091eeec3ae2ccb91aac21d0e9a4a58944fb2cb112fa67bffc3e08c2eca2d85c8 +size 14392422 diff --git a/sqlite3-rpmlintrc b/sqlite3-rpmlintrc new file mode 100644 index 0000000..3d87f76 --- /dev/null +++ b/sqlite3-rpmlintrc @@ -0,0 +1,2 @@ +# Driver template for the LEMON parser generator +addFilter("devel-file-in-non-devel-package /usr/share/lemon/lempar.c") diff --git a/sqlite3.changes b/sqlite3.changes index 2b69e81..49a8f46 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Tue Jul 1 12:04:55 UTC 2025 - Reinhard Max + +- Update to 3.50.2: + * Fix the concat_ws() SQL function so that it includes empty + strings in the concatenation. + * Avoid writing frames with no checksums into the wal file if a + savepoint is rolled back after dirty pages have already been + spilled into the wal file. + * Fix the Bitvec object to avoid stack overflow when the + database is within 60 pages of its maximum size. + * Fix a problem with UPDATEs on fts5 tables that contain BLOB + values. + * Fix an issue with transitive IS constraints on a RIGHT JOIN. + * CVE-2025-6965, bsc#1246597: + Raise an error early if the number of aggregate terms in a + query exceeds the maximum number of columns, to avoid + downstream assertion faults. + * Ensure that sqlite3_setlk_timeout() holds the database mutex. + +------------------------------------------------------------------- +Mon Jun 9 07:56:06 UTC 2025 - Andreas Stieger + +- Update to 3.50 (3.50.1): + * Improved handling and robust output of control characters + * sqlite3_rsync no longer requires WAL mode and needs less + bandwidth + * Bug fixes and optimized JSON handling + * Performance optimizations and developer visible fixes + +------------------------------------------------------------------- +Wed May 7 13:09:13 UTC 2025 - Reinhard Max + +- Update to release 3.49.2: + * Fix a bug in the NOT NULL optimization of version 3.40.0 that + can lead to a memory error if abused. + * Fix the count-of-view optimization so that it does not give an + incorrect answer for a DISTINCT query. + * Fix a possible incorrect answer that can result if a UNIQUE + constraint of a table contains the PRIMARY KEY column and that + UNIQUE constraint is used by an IN operator. + * Fix obscure problems with the generate_series() extension + function. + * Incremental improvements to the configure/make. + +------------------------------------------------------------------- +Thu Apr 17 09:33:26 UTC 2025 - Martin Hauke + +- Add subpackage for the lemon parser generator. +- Add patches: + * sqlite-3.49.0-fix-lemon-missing-cflags.patch + * sqlite-3.6.23-lemon-system-template.patch + ------------------------------------------------------------------- Tue Mar 11 21:34:05 UTC 2025 - Jan Engelhardt @@ -9,10 +62,10 @@ Tue Feb 18 16:21:23 UTC 2025 - Reinhard Max - Update to release 3.49.1: * Improve portability of makefiles and configure scripts. - * CVE-2025-29087, bsc#1241020: Fix a bug in the concat_ws() - function, introduced in version 3.44.0, that could lead to a - memory error if the separator string is very large (hundreds - of megabytes). + * CVE-2025-29087, CVE-2025-3277, bsc#1241020: + Fix a bug in the concat_ws() function, introduced in version + 3.44.0, that could lead to a memory error if the separator + string is very large (hundreds of megabytes). * CVE-2025-29088, bsc#1241078: Enhanced the SQLITE_DBCONFIG_LOOKASIDE interface to make it more robust against misuse. diff --git a/sqlite3.spec b/sqlite3.spec index 5fab0bc..f04f111 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -2,6 +2,7 @@ # spec file for package sqlite3 # # Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 Andreas Stieger # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +19,23 @@ %define _buildshell /bin/bash %define oname sqlite -%define tarversion 3490100 -%define docversion 3490100 +%define tarversion 3500200 +%define docversion 3500200 %bcond_with icu %bcond_without check Name: sqlite3 -Version: 3.49.1 +Version: 3.50.2 Release: 0 Summary: Embeddable SQL Database Engine License: SUSE-Public-Domain Group: Productivity/Databases/Servers URL: https://www.sqlite.org/ -Source0: https://www.sqlite.org/2023/sqlite-src-%{tarversion}.zip +Source0: https://www.sqlite.org/2025/sqlite-src-%{tarversion}.zip Source1: baselibs.conf -Source2: https://www.sqlite.org/2023/sqlite-doc-%{docversion}.zip +Source2: https://www.sqlite.org/2025/sqlite-doc-%{docversion}.zip +Source99: %{name}-rpmlintrc +Patch0: sqlite-3.6.23-lemon-system-template.patch +Patch1: sqlite-3.49.0-fix-lemon-missing-cflags.patch BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig @@ -127,6 +131,20 @@ Contains HTML documentation for SQLite: SQL Syntax, C/C++ API and other documentation found on sqlite.org. The files can be found in %{_docdir}/%{name}-doc. +%package -n lemon +Summary: A parser generator + +%description -n lemon +Lemon is an LALR(1) parser generator for C or C++. It does the same +job as bison and yacc. But lemon is not another bison or yacc +clone. It uses a different grammar syntax which is designed to reduce +the number of coding errors. Lemon also uses a more sophisticated +parsing engine that is faster than yacc and bison and which is both +reentrant and thread-safe. Furthermore, Lemon implements features +that can be used to eliminate resource leaks, making is suitable for +use in long-running programs such as graphical user interfaces or +embedded controllers. + %prep # Version and %%tarversion need to match, but %%docversion might be different, IFS=. read a b c d <<< "%version" @@ -136,7 +154,7 @@ then exit 1 fi -%autosetup -p0 -n sqlite-src-%{tarversion} -a2 +%autosetup -p1 -n sqlite-src-%{tarversion} -a2 rm -v sqlite-doc-%{docversion}/releaselog/current.html ln -sv `echo %{docversion} | sed "s/\./_/g"`.html sqlite-doc-%{docversion}/releaselog/current.html @@ -188,11 +206,12 @@ export CFLAGS="%{optflags} \ %install %make_install -#mkdir -pv %{buildroot}/%{_mandir}/man{1,n}/ install -Dpvm 0644 -t %{buildroot}/%{_mandir}/man1 sqlite3.1 install -Dpvm 0644 -t %{buildroot}/%{_mandir}/mann autoconf/tea/doc/sqlite3.n +install -Dpvm 0755 -t %{buildroot}%{_bindir} lemon +install -Dpvm 0644 -t %{buildroot}%{_datadir}/lemon tool/lempar.c # tcl bindings are provided by tcl itself -#rm -rf %{buildroot}%{_libdir}/tcl/tcl8.?/sqlite3* +#rm -rf %%{buildroot}%%{_libdir}/tcl/tcl8.?/sqlite3* find %{buildroot} -type f -name "*.la" -delete -print %ldconfig_scriptlets -n libsqlite3-0 @@ -217,4 +236,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %files doc %doc sqlite-doc-%{docversion}/* +%files -n lemon +%{_bindir}/lemon +%{_datadir}/lemon + %changelog