diff --git a/0001-Resolve-the-JS-side-corner-case-reported.patch b/0001-Resolve-the-JS-side-corner-case-reported.patch new file mode 100644 index 0000000000000000000000000000000000000000..d230b4be90d1fe5980893735cd856de563d2f81f --- /dev/null +++ b/0001-Resolve-the-JS-side-corner-case-reported.patch @@ -0,0 +1,34 @@ +diff -apurN sqlite-src-3420000/manifest sqlite-src-3420000-new/manifest +--- sqlite-src-3420000/manifest 2023-05-16 21:45:19.000000000 +0800 ++++ sqlite-src-3420000-new/manifest 2024-05-08 16:27:22.420366626 +0800 +@@ -1,5 +1,5 @@ +-C Version\s3.42.0 +-D 2023-05-16T12:36:15.536 ++C Resolve\sthe\sJS-side\scorner\scase\sreported\sin\s[forum:7774b773937cbe0a\s|\sforum\spost\s7774b773937cbe0a]\sby\snot\scaching\soo1.Stmt.columnCount. ++D 2023-05-16T14:18:48.756 + F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 + F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea + F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 +@@ -2070,10 +2070,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91 + F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc + F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e + F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 +-P 4254f086419892634c80b0b915e14edea365adc6a45bcc75eecba889da274ac3 +-R 5363a07f3e1462ec2f4570a33edb7167 +-T +sym-release * +-T +sym-version-3.42.0 * +-U drh +-Z 0ee8e0816fa6ac728bed7565aed4ec35 ++P 831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0 e841b142f583e49350c7cdd14dc4da72434cc67c7b521ae741e03e37e785d7e0 ++R 0ef1fb13a841d252487ff68b403f70e3 ++T +closed e841b142f583e49350c7cdd14dc4da72434cc67c7b521ae741e03e37e785d7e0 Closed\sby\sintegrate-merge. ++U stephan ++Z b38835aeee87cf1e75a7d5c7de5d0fa7 + # Remove this line to create a well-formed Fossil manifest. +diff -apurN sqlite-src-3420000/manifest.uuid sqlite-src-3420000-new/manifest.uuid +--- sqlite-src-3420000/manifest.uuid 2023-05-16 21:45:19.000000000 +0800 ++++ sqlite-src-3420000-new/manifest.uuid 2024-05-08 15:45:25.640366626 +0800 +@@ -1 +1 @@ +-831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0 ++37d44e8c447626738a8a7f915a9bc3f35fbb95581236dd152fc119b0c3a24c2a +\ No newline at end of file diff --git a/sqlite-src-3420000.zip b/sqlite-src-3420000.zip index 241a8532258b1132f7595453e0680afe7e755830..81f283c03e046eaf6387e940c4e9f53ea639bde7 100644 Binary files a/sqlite-src-3420000.zip and b/sqlite-src-3420000.zip differ diff --git a/sqlite.spec b/sqlite.spec index 7fd324b18522722a612aff76c6b9f03d83a71761..1acc34725519a6f63f1538b558111f46673b412b 100644 --- a/sqlite.spec +++ b/sqlite.spec @@ -6,7 +6,7 @@ Name: sqlite Version: 3.42.0 -Release: 1 +Release: 2 Summary: Embeded SQL database License: Public Domain URL: http://www.sqlite.org/ @@ -15,6 +15,8 @@ Source0: https://www.sqlite.org/2023/sqlite-src-%{extver}.zip Source1: http://www.sqlite.org/2023/sqlite-doc-%{extver}.zip Source2: https://www.sqlite.org/2023/sqlite-autoconf-%{extver}.tar.gz +Patch1: 0001-Resolve-the-JS-side-corner-case-reported.patch + BuildRequires: gcc autoconf tcl tcl-devel BuildRequires: ncurses-devel readline-devel glibc-devel @@ -56,6 +58,7 @@ This contains man files and HTML files for the using of sqlite. %prep #autosetup will fail because of 2 zip files %setup -q -a1 -n %{name}-src-%{extver} +%patch1 -p1 rm -f %{name}-doc-%{extver}/sqlite.css~ || : @@ -130,6 +133,9 @@ make test %{_mandir}/man*/* %changelog +* Wed May 8 2024 wuzhaomin - 3.42.0-2 +- Resolve the JS-side corner case reported + * Tue Feb 27 2024 Zheng Zhenyu - 3.42.0-1 - Bump version to fix CVE-2024-0232