Merge branch 'v3.0.3-upgrade_sqlite3' into v3.0.3-upgrade_deps

pull/5154/head
Miro Stauder 7 months ago
commit 2cba4f56f5

3
deps/Makefile vendored

@ -245,8 +245,7 @@ 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/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

@ -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
@@ -25954,6 +25954,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 ),
@@ -26520,6 +26558,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 ),

Binary file not shown.

Binary file not shown.

@ -1 +1 @@
sqlite-amalgamation-3430200
sqlite-amalgamation-3500400

@ -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 ){

@ -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 @@
@@ -26313,6 +26313,183 @@
sqlite3ResultStrAccum(context, &sRes);
}
@ -184,7 +184,7 @@
/*
** current_time()
**
@@ -129263,6 +129440,9 @@
@@ -133269,6 +133269,9 @@
FUNCTION(substr, 3, 0, 0, substrFunc ),
FUNCTION(substring, 2, 0, 0, substrFunc ),
FUNCTION(substring, 3, 0, 0, substrFunc ),

@ -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 @@
@@ -26320,7 +26320,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);

Loading…
Cancel
Save