Compare commits

..

29 Commits

Author SHA1 Message Date
openeuler-ci-bot 0316c9a2ef !139 update to version 3.50.3
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-07-18 06:42:34 +00:00
Funda Wang f139aaf336 3.50.3 2025-07-17 22:52:59 +08:00
openeuler-ci-bot 0026f9a3cf !138 update to version 3.50.2
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-06-30 03:00:58 +00:00
Funda Wang 796a2eaafb 3.50.2 2025-06-29 11:03:43 +08:00
openeuler-ci-bot 7e2c2bcc42 !137 update to version 3.50.1
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-06-09 07:15:06 +00:00
Funda Wang 26da06dd15 3.50.1 2025-06-07 11:37:22 +08:00
openeuler-ci-bot f073e96e26 !136 update to version 3.50.0
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-05-30 07:25:03 +00:00
Funda Wang 945ef9b4d4 3.50.0 2025-05-30 11:36:03 +08:00
openeuler-ci-bot 7aa54ba027 !135 update to version 3.49.2
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-05-08 07:35:41 +00:00
Funda Wang a3f5d671ca 3.49.2 2025-05-07 22:15:07 +08:00
openeuler-ci-bot 0be4fb42e1 !132 remove rpath for tcl binding
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-03-10 08:58:10 +00:00
openeuler-ci-bot 9c28db327d !132 remove rpath for tcl binding
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-03-10 08:58:09 +00:00
Funda Wang d718b4d985 remove rpath for tcl binding 2025-03-10 15:41:51 +08:00
openeuler-ci-bot 827a5b417c !131 update to version 3.49.1
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-02-25 02:18:45 +00:00
Funda Wang 3b85033543 3.49.1 2025-02-19 09:32:44 +08:00
openeuler-ci-bot 14e9d75e7c !130 update to version 3.49.0
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-02-08 06:03:51 +00:00
Funda Wang f9bbe77f76 3.49.0 2025-02-06 22:53:37 +08:00
openeuler-ci-bot 48cda60f9d !129 set legacy soname
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-01-19 09:30:48 +00:00
Funda Wang 9640b332c6 set as legacy soname 2025-01-19 11:24:44 +08:00
openeuler-ci-bot 080b939885 !128 update to version 3.48.0
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-01-17 09:30:26 +00:00
Funda Wang 4e33528100 3.48.0 2025-01-15 17:30:37 +08:00
openeuler-ci-bot 538d9d59d9 !126 update to version 3.47.2
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2024-12-09 08:23:11 +00:00
Funda Wang bddc04586e 3.47.2 2024-12-08 16:04:27 +08:00
openeuler-ci-bot a628f02a4b !125 update to 3.47.1
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2024-11-27 04:35:32 +00:00
Funda Wang 4376163380 3.47.1 2024-11-26 13:07:07 +08:00
openeuler-ci-bot fbe58057fb !124 update to 3.47.0
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2024-11-18 09:46:24 +00:00
Funda Wang c0290d3976 3.47.0 2024-11-18 14:20:08 +08:00
openeuler-ci-bot 0b520cc93e !114 Update to version 3.46.1
From: @fundawang 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2024-08-21 07:09:24 +00:00
Funda Wang e798a0f31e 3.46.1 2024-08-13 21:21:02 +08:00
14 changed files with 92 additions and 267 deletions
+2
View File
@@ -0,0 +1,2 @@
*.zip filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
+2
View File
@@ -0,0 +1,2 @@
[lfs]
url = https://artlfs.openeuler.openatom.cn/src-openEuler/sqlite
@@ -1,41 +0,0 @@
From 6a7c9be9502ea2023c4b5cf39a0d5a5a55b320f7 Mon Sep 17 00:00:00 2001
From: Lixiaokeng <lixiaokeng@huawei.com>
Date: Wed, 17 Jul 2024 10:31:56 +0800
Subject: [PATCH] sqlite no malloc_usable_size
Reference:https://gitee.com/src-openeuler/sqlite/blob/openEuler-22.03-LTS-SP3/0001-sqlite-no-malloc-usable-size.patch
Conflict:NA
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 29ca76b..d67183a 100755
--- a/configure
+++ b/configure
@@ -10292,7 +10292,7 @@ done
#########
# Figure out whether or not we have these functions
#
-for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64
+for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s strchrnul usleep utime pread pread64 pwrite pwrite64
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/configure.ac b/configure.ac
index 53be0a6..6f9b1e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,7 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h malloc.h])
#########
# Figure out whether or not we have these functions
#
-AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64])
+AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s strchrnul usleep utime pread pread64 pwrite pwrite64])
#########
# By default, we use the amalgamation (this may be changed below...)
--
2.33.0
@@ -1,68 +0,0 @@
From defded46ea50037500590122d847ba6a7cb96110 Mon Sep 17 00:00:00 2001
From: eulerstorage <eulerstoragemt@huawei.com>
Date: Sat, 11 Jan 2020 11:33:54 +0800
Subject: [PATCH] remove fail testcase in no free fd situation
Reference:https://gitee.com/src-openeuler/sqlite/blob/openEuler-22.03-LTS-SP3/0002-remove-fail-testcase-in-no-free-fd-situation.patch
Conflict:NA
Remove testcase 1.1.1, 1.1.2 and 1.1.3, since it can not success in
some situation if there is no enough fd resource.
---
test/oserror.test | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/test/oserror.test b/test/oserror.test
index a51301c..d46218f 100644
--- a/test/oserror.test
+++ b/test/oserror.test
@@ -40,47 +40,6 @@ proc do_re_test {tn script expression} {
}
-#--------------------------------------------------------------------------
-# Tests oserror-1.* test failures in the open() system call.
-#
-
-# Test a failure in open() due to too many files.
-#
-# The xOpen() method of the unix VFS calls getcwd() as well as open().
-# Although this does not appear to be documented in the man page, on OSX
-# a call to getcwd() may fail if there are no free file descriptors. So
-# an error may be reported for either open() or getcwd() here.
-#
-if {![clang_sanitize_address]} {
- unset -nocomplain rc
- unset -nocomplain nOpen
- set nOpen 20000
- do_test 1.1.1 {
- set ::log [list]
- set ::rc [catch {
- for {set i 0} {$i < $::nOpen} {incr i} { sqlite3 dbh_$i test.db -readonly 1 }
- } msg]
- if {$::rc==0} {
- # Some system (ex: Debian) are able to create 20000+ file descriptiors
- # such systems will not fail here
- set x ok
- } elseif {$::rc==1 && $msg=="unable to open database file"} {
- set x ok
- } else {
- set x [list $::rc $msg]
- }
- } {ok}
- do_test 1.1.2 {
- catch { for {set i 0} {$i < $::nOpen} {incr i} { dbh_$i close } }
- } $::rc
- if {$rc} {
- do_re_test 1.1.3 {
- lindex $::log 0
- } {^os_unix.c:\d+: \(\d+\) (open|getcwd)\(.*test.db\) - }
- }
-}
-
-
# Test a failure in open() due to the path being a directory.
#
do_test 1.2.1 {
--
1.8.3.1
@@ -1,26 +0,0 @@
From 26ea25aacc1e70f4d142d8f041da2065509c0b51 Mon Sep 17 00:00:00 2001
From: zwtmichael <zhuwentao5@huawei.com>
Date: Tue, 30 Aug 2022 17:02:04 +0800
Subject: [PATCH] fix memory problem in the rtree test suite
Reference:https://gitee.com/src-openeuler/sqlite/blob/openEuler-22.03-LTS-SP3/0004-fix-memory-problem-in-the-rtree-test-suite.patch
Conflict: BoxQueryCtx change to BoxGeomCtx
---
ext/rtree/test_rtreedoc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/rtree/test_rtreedoc.c b/ext/rtree/test_rtreedoc.c
index cdbcb2e..59a7942 100644
--- a/ext/rtree/test_rtreedoc.c
+++ b/ext/rtree/test_rtreedoc.c
@@ -188,7 +188,7 @@ static int SQLITE_TCLAPI register_box_geom(
}
if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
- pCtx = (BoxGeomCtx*)ckalloc(sizeof(BoxGeomCtx*));
+ pCtx = (BoxGeomCtx*)ckalloc(sizeof(BoxGeomCtx));
pCtx->interp = interp;
pCtx->pScript = Tcl_DuplicateObj(objv[2]);
Tcl_IncrRefCount(pCtx->pScript);
--
2.33.0
-34
View File
@@ -1,34 +0,0 @@
From c5c8e025ff6cf0f7400b17aec73014e9cdc00935 Mon Sep 17 00:00:00 2001
From: zwtmichael <zhuwentao5@huawei.com>
Date: Mon, 7 Aug 2023 15:10:32 +0800
Subject: [PATCH] fix segmentation violation
Reference:https://gitee.com/src-openeuler/sqlite/blob/openEuler-22.03-LTS-SP3/0007-CVE-2023-36191.patch
Conflict:context adaptation
Signed-off-by: zwtmichael <zhuwentao5@huawei.com>
---
src/shell.c.in | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/shell.c.in b/src/shell.c.in
index 72e4498..355b4bb 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12219,8 +12219,12 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
}else if( cli_strcmp(z,"-bail")==0 ){
bail_on_error = 1;
}else if( cli_strcmp(z,"-nonce")==0 ){
- free(data.zNonce);
- data.zNonce = strdup(argv[++i]);
+ if( data.zNonce ) free(data.zNonce);
+ if( i + 1 < argc ) data.zNonce = strdup(argv[++i]);
+ else{
+ data.zNonce = 0;
+ break;
+ }
}else if( cli_strcmp(z,"-unsafe-testing")==0 ){
ShellSetFlag(&data,SHFLG_TestingMode);
}else if( cli_strcmp(z,"-safe")==0 ){
--
2.33.0
-46
View File
@@ -1,46 +0,0 @@
From 310e27eec4eb0e6c5cbc7bad6d3c0ad71619cb44 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 7 Sep 2023 13:53:09 +0000
Subject: [PATCH] Fix a buffer overread in the sessions extension that could
occur when processing a corrupt changeset.
Reference:https://sqlite.org/src/info/0e4e7a05c4204b47
Conflict:NA
---
ext/session/sqlite3session.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index a892804..72ad427 100644
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -3050,15 +3050,19 @@ static int sessionReadRecord(
}
}
if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
- sqlite3_int64 v = sessionGetI64(aVal);
- if( eType==SQLITE_INTEGER ){
- sqlite3VdbeMemSetInt64(apOut[i], v);
+ if( (pIn->nData-pIn->iNext)<8 ){
+ rc = SQLITE_CORRUPT_BKPT;
}else{
- double d;
- memcpy(&d, &v, 8);
- sqlite3VdbeMemSetDouble(apOut[i], d);
+ sqlite3_int64 v = sessionGetI64(aVal);
+ if( eType==SQLITE_INTEGER ){
+ sqlite3VdbeMemSetInt64(apOut[i], v);
+ }else{
+ double d;
+ memcpy(&d, &v, 8);
+ sqlite3VdbeMemSetDouble(apOut[i], d);
+ }
+ pIn->iNext += 8;
}
- pIn->iNext += 8;
}
}
}
--
2.33.0
+11
View File
@@ -0,0 +1,11 @@
--- a/tool/buildtclext.tcl 2024-11-18 14:01:05.040080030 +0800
+++ b/tool/buildtclext.tcl 2024-11-18 14:01:27.998394871 +0800
@@ -300,7 +300,7 @@
# Generate and execute the command with which to do the compilation.
#
- set cmd "$CMD -DUSE_TCL_STUBS tclsqlite3.c -o $OUT $LIBS"
+ set cmd "$CMD -DUSE_TCL_STUBS tclsqlite3.c -o $OUT $LIBS -lm"
puts $cmd
file delete -force $OUT
catch {exec {*}$cmd} errmsg
Binary file not shown.
Binary file not shown.
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bdbd4e47d52c64c7acc332d1294aa67ad6251ef370abeb0b086ee0cbec91186d
size 11390337
Binary file not shown.
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:119862654b36e252ac5f8add2b3d41ba03f4f387b48eb024956c36ea91012d3f
size 14393097
+71 -52
View File
@@ -1,37 +1,30 @@
%bcond_without check
%global extver 3420000
%global tcl_version 8.6
%global tcl_sitearch %{_libdir}/tcl%{tcl_version}
Name: sqlite
Version: 3.42.0
Release: 3
Version: 3.50.3
%global extver %(echo %{version} |awk -F. '{printf "%d%02d%02d00", $1,$2,$3}')
Release: 1
Summary: Embeded SQL database
License: Public Domain
URL: http://www.sqlite.org/
URL: https://www.sqlite.org/
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
Source0: https://www.sqlite.org/2025/sqlite-src-%{extver}.zip
Source1: https://www.sqlite.org/2025/sqlite-doc-%{extver}.zip
Patch0: sqlite-3.48.0-buildtclext.patch
Patch6000: backport-0001-sqlite-no-malloc-usable-size.patch
Patch6001: backport-0002-remove-fail-testcase-in-no-free-fd-situation.patch
Patch6002: backport-0003-fix-memory-problem-in-the-rtree-test-suite.patch
Patch6003: backport-0004-CVE-2023-36191.patch
Patch6004: backport-CVE-2023-7104.patch
BuildRequires: gcc autoconf tcl tcl-devel
BuildRequires: gcc tcl tcl-devel
BuildRequires: ncurses-devel readline-devel glibc-devel
BuildRequires: chrpath
BuildRequires: rpm_macro(tcl_sitearch)
Provides: %{name}-libs
Obsoletes: %{name}-libs
Provides: lemon
Obsoletes: lemon
Provides: %{name}-analyzer
Obsoletes: %{name}-analyzer
Provides: %{name}-tcl
Obsoletes: %{name}-tcl
Provides: %{name}-libs = %{version}-%{release}
Obsoletes: %{name}-libs < %{version}-%{release}
Provides: lemon = %{version}-%{release}
Obsoletes: lemon < %{version}-%{release}
Provides: %{name}-analyzer = %{version}-%{release}
Obsoletes: %{name}-analyzer < %{version}-%{release}
Provides: %{name}-tcl = %{version}-%{release}
Obsoletes: %{name}-tcl < %{version}-%{release}
%description
SQLite is a C-language library that implements a small, fast, self-contained,
@@ -43,7 +36,6 @@ use every day.It also include lemon and sqlite3_analyzer and tcl tools.
%package devel
Summary: Including header files and library for the developing of sqlite
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
This contains dynamic libraries and header files for the developing of sqlite.
@@ -51,8 +43,8 @@ This contains dynamic libraries and header files for the developing of sqlite.
%package help
Summary: Man file and documentation for sqlite
BuildArch: noarch
Provides: %{name}-doc
Obsoletes: %{name}-doc
Provides: %{name}-doc = %{version}-%{release}
Obsoletes: %{name}-doc < %{version}-%{release}
%description help
This contains man files and HTML files for the using of sqlite.
@@ -61,47 +53,40 @@ 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}
%patch6000 -p1
%patch6001 -p1
%patch6002 -p1
%patch6003 -p1
%patch6004 -p1
%autopatch -p1
rm -f %{name}-doc-%{extver}/sqlite.css~ || :
%build
autoconf
export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 \
-DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
-DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_JSON1=1 \
-Wall -fno-strict-aliasing"
%configure --enable-fts5 \
export CC=%{__cc}
%configure --fts5 \
--enable-threadsafe \
--enable-threads-override-locks \
--enable-load-extension \
--disable-static \
--soname=legacy \
TCLLIBDIR=%{tcl_sitearch}/sqlite3
# rpath removal
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build
%make_build sqlite3_analyzer
%install
make DESTDIR=${RPM_BUILD_ROOT} install
mkdir -p %{buildroot}/%{tcl_sitearch}/sqlite3
%make_install TCLLIBDIR=%{tcl_sitearch}/sqlite3
%delete_la
install -D -m 755 lemon %{buildroot}%{_bindir}/lemon
install -D -m 644 tool/lempar.c %{buildroot}%{_datadir}/lemon/lempar.c
install -D -m 644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
install -D -m 755 sqlite3_analyzer %{buildroot}%{_bindir}/sqlite3_analyzer
chmod 755 %{buildroot}/%{tcl_sitearch}/sqlite3/*.so
chrpath --delete $RPM_BUILD_ROOT/%{tcl_sitearch}/sqlite3/*.so
%if %{with check}
%check
@@ -117,18 +102,15 @@ rm -rf test/thread1.test
rm -rf test/thread2.test
%endif
make test
%make_build test
%endif # with check
%ldconfig_scriptlets
%files
%doc README.md
%{_bindir}/{sqlite3,lemon,sqlite3_analyzer}
%{_libdir}/*.so.*
%{_datadir}/lemon
%{tcl_sitearch}/sqlite3
%exclude %{_libdir}/*.{la,a}
%files devel
%{_includedir}/*.h
@@ -140,11 +122,48 @@ make test
%{_mandir}/man*/*
%changelog
* Mon Nov 11 2024 wangmian <wangmian19@h-partners.com> - 3.42.0-3
- sync the patch from 2203
* Thu Jul 17 2025 Funda Wang <fundawang@yeah.net> - 3.50.3-1
- update to 3.50.3
* Wed Sep 4 2024 wangmian <wangmian19@h-partners.com> - 3.42.0-2
- sync the CVE-2023-7104 from 2203
* Sun Jun 29 2025 Funda Wang <fundawang@yeah.net> - 3.50.2-1
- update to 3.50.2
* Sat Jun 07 2025 Funda Wang <fundawang@yeah.net> - 3.50.1-1
- update to 3.50.1
* Fri May 30 2025 Funda Wang <fundawang@yeah.net> - 3.50.0-1
- update to 3.50.0
* Wed May 07 2025 Funda Wang <fundawang@yeah.net> - 3.49.2-1
- update to 3.49.2
* Mon Mar 10 2025 Funda Wang <fundawang@yeah.net> - 3.49.1-2
- remove rpath for tcl binding
* Wed Feb 19 2025 Funda Wang <fundawang@yeah.net> - 3.49.1-1
- update to 3.49.1
* Thu Feb 06 2025 Funda Wang <fundawang@yeah.net> - 3.49.0-1
- update to 3.49.0
* Sun Jan 19 2025 Funda Wang <fundawang@yeah.net> - 3.48.0-2
- set legacy soname, otherwise it changes too much
(see `./configure --help`)
* Tue Jan 14 2025 Funda Wang <fundawang@yeah.net> - 3.48.0-1
- update to 3.48.0
* Sun Dec 08 2024 Funda Wang <fundawang@yeah.net> - 3.47.2-1
- update to 3.47.2
* Tue Nov 26 2024 Funda Wang <fundawang@yeah.net> - 3.47.1-1
- update to 3.47.1
* Tue Oct 22 2024 Funda Wang <fundawang@yeah.net> - 3.47.0-1
- update to 3.47.0
* Tue Aug 13 2024 Funda Wang <fundawang@yeah.net> - 3.46.1-1
- update to 3.46.1
* Tue Feb 27 2024 Zheng Zhenyu <zheng.zhenyu@outlook.com> - 3.42.0-1
- Bump version to fix CVE-2024-0232