From d2e373f81e025b309d7ab316667d9adc1fc3794c Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Mon, 19 Feb 2024 02:28:04 -0800 Subject: [PATCH] =?UTF-8?q?databases/sqlcipher:=20update=203.4.2=20?= =?UTF-8?q?=E2=86=92=204.5.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 277056 Approved by: jharris@widomaker.com (maintainer) --- databases/sqlcipher/Makefile | 6 ++-- databases/sqlcipher/distinfo | 6 ++-- .../files/patch-sqlcipher-libressl-2.7 | 31 ------------------- 3 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 databases/sqlcipher/files/patch-sqlcipher-libressl-2.7 diff --git a/databases/sqlcipher/Makefile b/databases/sqlcipher/Makefile index a6ffc5ff7212..9d7267da906b 100644 --- a/databases/sqlcipher/Makefile +++ b/databases/sqlcipher/Makefile @@ -1,14 +1,14 @@ PORTNAME= sqlcipher DISTVERSIONPREFIX= v -DISTVERSION= 3.4.2 +DISTVERSION= 4.5.6 CATEGORIES= databases MAINTAINER= jharris@widomaker.com COMMENT= Encrypted SQLite database -WWW= http://www.sqlcipher.net +WWW= https://www.zetetic.net/sqlcipher/ LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= cpe libedit libtool pathfix ssl tcl:86,build CPE_VENDOR= zetetic diff --git a/databases/sqlcipher/distinfo b/databases/sqlcipher/distinfo index 4f1ace00d3f2..f68afc1ded0f 100644 --- a/databases/sqlcipher/distinfo +++ b/databases/sqlcipher/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518208810 -SHA256 (sqlcipher-sqlcipher-v3.4.2_GH0.tar.gz) = 69897a5167f34e8a84c7069f1b283aba88cdfa8ec183165c4a5da2c816cfaadb -SIZE (sqlcipher-sqlcipher-v3.4.2_GH0.tar.gz) = 14743960 +TIMESTAMP = 1707945924 +SHA256 (sqlcipher-sqlcipher-v4.5.6_GH0.tar.gz) = e4a527e38e67090c1d2dc41df28270d16c15f7ca5210a3e7ec4c4b8fda36e28f +SIZE (sqlcipher-sqlcipher-v4.5.6_GH0.tar.gz) = 18937692 diff --git a/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7 b/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7 deleted file mode 100644 index bda45d959ea3..000000000000 --- a/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7 +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c -index a45db3b..4344076 100644 ---- src/crypto_openssl.c.orig -+++ src/crypto_openssl.c -@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0; - static unsigned int openssl_init_count = 0; - static sqlite3_mutex* openssl_rand_mutex = NULL; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) - static HMAC_CTX *HMAC_CTX_new(void) - { - HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); -@@ -117,7 +117,7 @@ static int sqlcipher_openssl_activate(void *ctx) { - - if(openssl_init_count == 0 && openssl_external_init == 0) { - /* if the library was not externally initialized, then should be now */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) - OpenSSL_add_all_algorithms(); - #endif - } -@@ -154,7 +154,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) { - Note: this code will only be reached if OpensSSL_add_all_algorithms() - is called by SQLCipher internally. This should prevent SQLCipher from - "cleaning up" openssl when it was initialized externally by the program */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) - EVP_cleanup(); - #endif - } else {