feat(sqlcipher): enable auto-update, upgrade to 4.5.1

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
This commit is contained in:
Aditya Alok 2022-04-15 01:52:17 +05:30
parent 440f1e7751
commit 8d8ad18487
No known key found for this signature in database
GPG Key ID: 345AE134142077D8
2 changed files with 57 additions and 3 deletions

View File

@ -0,0 +1,53 @@
--- a/src/crypto.h 2022-02-28 20:11:16.000000000 +0000
+++ b/src/crypto.h 2022-04-15 22:46:24.166211467 +0000
@@ -39,10 +39,6 @@
#include "btreeInt.h"
#include "pager.h"
-#ifdef __ANDROID__
-#include <android/log.h>
-#endif
-
/* extensions defined in pager.c */
void *sqlite3PagerGetCodec(Pager*);
void sqlite3PagerSetCodec(Pager*, void *(*)(void*,void*,Pgno,int), void (*)(void*,int,int), void (*)(void*), void *);
--- a/src/crypto_impl.c 2022-02-28 20:11:16.000000000 +0000
+++ b/src/crypto_impl.c 2022-04-15 23:00:47.610944833 +0000
@@ -1660,11 +1660,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;
}
@@ -1714,13 +1709,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 */
@@ -1752,11 +1743,6 @@
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);
}

View File

@ -2,12 +2,13 @@ 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.0
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=4.5.1
TERMUX_PKG_SRCURL=https://github.com/sqlcipher/sqlcipher/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=20c46a855c47d5a0a159fdcaa8491ec7bdbaa706a734ee52bc76188b929afb14
TERMUX_PKG_SHA256=023499516ef2ade14fbcdbe93fb81cc69458ae6cb3544614df8dbef34835b406
TERMUX_PKG_DEPENDS="openssl"
TERMUX_PKG_BUILD_DEPENDS="tcl"
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--enable-tempstore=yes