diff --git a/deps/Makefile b/deps/Makefile index 87d2a20e8f..15765c482f 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -243,8 +243,8 @@ mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclien sqlite3/sqlite3/sqlite3.o: cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true cd sqlite3 && tar -zxf sqlite-amalgamation-*.tar.gz - cd sqlite3/sqlite3 && patch -p1 < ../from_unixtime.patch - cd sqlite3/sqlite3 && patch sqlite3.c < ../sqlite3.c-multiplication-overflow.patch + cd sqlite3 && ln -fsT sqlite-amalgamation-*/ sqlite3 + cd sqlite3/sqlite3 && patch -p0 < ../from_unixtime.patch cd sqlite3/sqlite3 && patch -p0 < ../sqlite3_pass_exts.patch cd sqlite3/sqlite3 && patch -p0 < ../throw.patch cd sqlite3/sqlite3 && ${CC} ${MYCFLAGS} -fPIC -c -o sqlite3.o sqlite3.c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_JSON1 -DSQLITE_DLL=1 diff --git a/deps/sqlite3/from_unixtime.patch b/deps/sqlite3/from_unixtime.patch index c374dbdafd..5384e5bc57 100644 --- a/deps/sqlite3/from_unixtime.patch +++ b/deps/sqlite3/from_unixtime.patch @@ -1,6 +1,6 @@ ---- sqlite-amalgamation-3400100/sqlite3.c 2022-12-28 14:26:39.000000000 +0000 -+++ sqlite-amalgamation.patch/sqlite3.c 2023-01-10 16:48:54.793689411 +0000 -@@ -24926,6 +24926,44 @@ +--- sqlite3.c.O 2025-05-29 14:35:06.000000000 +0000 ++++ sqlite3.c 2025-05-30 14:53:11.510407512 +0000 +@@ -25950,6 +25950,44 @@ } /* @@ -45,11 +45,11 @@ ** time( TIMESTRING, MOD, MOD, ...) ** ** Return HH:MM:SS -@@ -25344,6 +25344,7 @@ - PURE_DATE(datetime, -1, 0, 0, datetimeFunc ), - PURE_DATE(strftime, -1, 0, 0, strftimeFunc ), - PURE_DATE(timediff, 2, 0, 0, timediffFunc ), -+ DFUNCTION(from_unixtime, -1, 0, 0, from_unixtimeFunc ), +@@ -26516,6 +26554,7 @@ + #ifdef SQLITE_DEBUG + PURE_DATE(datedebug, -1, 0, 0, datedebugFunc ), + #endif ++ DFUNCTION(from_unixtime, -1, 0, 0, from_unixtimeFunc ), DFUNCTION(current_time, 0, 0, 0, ctimeFunc ), DFUNCTION(current_timestamp, 0, 0, 0, ctimestampFunc), DFUNCTION(current_date, 0, 0, 0, cdateFunc ), diff --git a/deps/sqlite3/sqlite-amalgamation-3430200.tar.gz b/deps/sqlite3/sqlite-amalgamation-3430200.tar.gz deleted file mode 100644 index f3d4d9a849..0000000000 Binary files a/deps/sqlite3/sqlite-amalgamation-3430200.tar.gz and /dev/null differ diff --git a/deps/sqlite3/sqlite-amalgamation-3500000.tar.gz b/deps/sqlite3/sqlite-amalgamation-3500000.tar.gz new file mode 100644 index 0000000000..1409ca0d49 Binary files /dev/null and b/deps/sqlite3/sqlite-amalgamation-3500000.tar.gz differ diff --git a/deps/sqlite3/sqlite3 b/deps/sqlite3/sqlite3 index 7808afec56..bef8d19715 120000 --- a/deps/sqlite3/sqlite3 +++ b/deps/sqlite3/sqlite3 @@ -1 +1 @@ -sqlite-amalgamation-3430200 \ No newline at end of file +sqlite-amalgamation-3500000/ \ No newline at end of file diff --git a/deps/sqlite3/sqlite3.c-multiplication-overflow.patch b/deps/sqlite3/sqlite3.c-multiplication-overflow.patch deleted file mode 100644 index fe2203bf40..0000000000 --- a/deps/sqlite3/sqlite3.c-multiplication-overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ -@@ -177218,10 +177218,10 @@ - #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE - if( sz>=LOOKASIDE_SMALL*3 ){ - nBig = szAlloc/(3*LOOKASIDE_SMALL+sz); -- nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL; -+ nSm = (szAlloc - (long) sz*nBig)/LOOKASIDE_SMALL; - }else if( sz>=LOOKASIDE_SMALL*2 ){ - nBig = szAlloc/(LOOKASIDE_SMALL+sz); -- nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL; -+ nSm = (szAlloc - (long) sz*nBig)/LOOKASIDE_SMALL; - }else - #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */ - if( sz>0 ){ diff --git a/deps/sqlite3/sqlite3_pass_exts.patch b/deps/sqlite3/sqlite3_pass_exts.patch index 467a363616..94a35387a5 100644 --- a/deps/sqlite3/sqlite3_pass_exts.patch +++ b/deps/sqlite3/sqlite3_pass_exts.patch @@ -1,6 +1,6 @@ --- sqlite3.c 2024-03-22 19:22:47.046093173 +0100 +++ sqlite3-pass-exts.c 2024-03-22 19:24:09.557303716 +0100 -@@ -25168,6 +25168,183 @@ +@@ -26309,6 +26309,183 @@ sqlite3ResultStrAccum(context, &sRes); } @@ -184,7 +184,7 @@ /* ** current_time() ** -@@ -129263,6 +129440,9 @@ +@@ -133198,6 +133198,9 @@ FUNCTION(substr, 3, 0, 0, substrFunc ), FUNCTION(substring, 2, 0, 0, substrFunc ), FUNCTION(substring, 3, 0, 0, substrFunc ), diff --git a/deps/sqlite3/throw.patch b/deps/sqlite3/throw.patch index 90f165d2f9..0c6f08ccb3 100644 --- a/deps/sqlite3/throw.patch +++ b/deps/sqlite3/throw.patch @@ -1,11 +1,11 @@ --- sqlite3.c.orig 2024-04-04 15:53:48.801105000 +0000 +++ sqlite3.c 2024-04-04 15:54:51.423876000 +0000 -@@ -25175,7 +25175,7 @@ +@@ -26316,7 +26316,7 @@ //////////////////////////////////////////////////////////////////////////////// // ctype.h -extern int toupper (int __c) __THROW; -+extern int toupper (int __c); ++//extern int toupper (int __c) __THROW; // SHA256_crypt char * sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen);