From be8b01305f3a05229c64696fcb4182a846845522 Mon Sep 17 00:00:00 2001
From: tqfx <tqfx@tqfx.org>
Date: Sat, 27 Apr 2024 13:44:28 +0800
Subject: [PATCH] bump(main/sqlcipher): 4.5.7 (#19928)

---
 packages/sqlcipher/android_log.patch | 56 ----------------------------
 packages/sqlcipher/build.sh          |  6 +--
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 packages/sqlcipher/android_log.patch

diff --git a/packages/sqlcipher/android_log.patch b/packages/sqlcipher/android_log.patch
deleted file mode 100644
index 7ede4351db..0000000000
--- a/packages/sqlcipher/android_log.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -uNr sqlcipher-4.5.2/src/crypto.h sqlcipher-4.5.2.mod/src/crypto.h
---- sqlcipher-4.5.2/src/crypto.h	2022-07-28 03:23:29.000000000 +0800
-+++ sqlcipher-4.5.2.mod/src/crypto.h	2022-08-04 09:04:30.948978453 +0800
-@@ -40,10 +40,6 @@
- #include "pager.h"
- #include "vdbeInt.h"
- 
--#ifdef __ANDROID__
--#include <android/log.h>
--#endif
--
- #include <time.h>
- 
- #if defined(_WIN32) || defined(SQLITE_OS_WINRT)
-diff -uNr sqlcipher-4.5.2/src/crypto_impl.c sqlcipher-4.5.2.mod/src/crypto_impl.c
---- sqlcipher-4.5.2/src/crypto_impl.c	2022-07-28 03:23:29.000000000 +0800
-+++ sqlcipher-4.5.2.mod/src/crypto_impl.c	2022-08-04 09:06:21.678978411 +0800
-@@ -1648,11 +1648,6 @@
-   FILE *f = (FILE*) file;
-   char *fmt = "Elapsed time:%.3f ms - %s\n";
-   double elapsed = (*((sqlite3_uint64*)run_time))/1000000.0;
--#ifdef __ANDROID__
--  if(f == NULL) {
--    __android_log_print(ANDROID_LOG_DEBUG, "sqlcipher", fmt, elapsed, sqlite3_sql((sqlite3_stmt*)stmt));
--  }
--#endif
-   if(f) fprintf(f, fmt, elapsed, sqlite3_sql((sqlite3_stmt*)stmt));
-   return SQLITE_OK;
- }
-@@ -1702,13 +1697,9 @@
-   va_start(params, message);
- 
- #ifdef CODEC_DEBUG
--#ifdef __ANDROID__
--    __android_log_vprint(ANDROID_LOG_DEBUG, "sqlcipher", message, params);
--#else
-     vfprintf(stderr, message, params);
-     fprintf(stderr, "\n");
- #endif
--#endif
- 
-   if(level > sqlcipher_log_level || (sqlcipher_log_logcat == 0 && sqlcipher_log_file == NULL)) {
-     /* no log target or tag not in included filters */
-@@ -1740,11 +1731,7 @@
-       fprintf((FILE*)sqlcipher_log_file, "\n");
-     }
-   }
--#ifdef __ANDROID__
--  if(sqlcipher_log_logcat) {
--    __android_log_vprint(ANDROID_LOG_DEBUG, "sqlcipher", message, params);
--  }
--#endif
-+
- end:
-   va_end(params);
- }
diff --git a/packages/sqlcipher/build.sh b/packages/sqlcipher/build.sh
index 320112724c..0ba4befecb 100644
--- a/packages/sqlcipher/build.sh
+++ b/packages/sqlcipher/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/sqlcipher/sqlcipher
 TERMUX_PKG_DESCRIPTION="SQLCipher is an SQLite extension that provides 256 bit AES encryption of database files"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="4.5.6"
+TERMUX_PKG_VERSION="4.5.7"
 TERMUX_PKG_SRCURL=https://github.com/sqlcipher/sqlcipher/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=e4a527e38e67090c1d2dc41df28270d16c15f7ca5210a3e7ec4c4b8fda36e28f
+TERMUX_PKG_SHA256=b670845f28da0a3c717e991e9f18a334e08f6bc977190bbce6be864ca229f96d
 TERMUX_PKG_DEPENDS="libedit, openssl"
 TERMUX_PKG_BUILD_DEPENDS="tcl"
 TERMUX_PKG_AUTO_UPDATE=true
@@ -16,5 +16,5 @@ TCLLIBDIR=${TERMUX_PREFIX}/lib/tcl8.6/sqlite
 "
 
 termux_step_pre_configure() {
-	CPPFLAGS+=" -DSQLITE_HAS_CODEC"
+	CPPFLAGS+=" -DSQLCIPHER_OMIT_LOG_DEVICE -DSQLITE_HAS_CODEC"
 }