From nobody Mon Feb 19 10:29:28 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tdf0n0qz5z5BNvX; Mon, 19 Feb 2024 10:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tdf0n0K0Xz4kcg; Mon, 19 Feb 2024 10:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708338569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T3v6P8K4x3nCrBrkB3ZzMgmnqsWX2mm4kaP/zdqyws=; b=H4zxs0GuvDAITNlj762LqowTKZgc+arIlNkUq8yhb6KNPg8ZtjPIw7OEPJ4UPvWkR/wcqR fv6uGmMmO+UREY9hskbKqFg1lwHaAo4A3NKQLpsPMNG6f5LBJXGy3RnurP/v24jWYFJh16 VClOKLNd3t2GkxIQsxU/RDUDsq3eRanB/vABuYuKf7GJ5VnT2sB/09edgP1kGBGPOOhmPk 6l+iRxpDK6bWR0s9zYgsw++1Ax0a5yyt1CeU2YHg7jaX1V+8gv+qKHhslkgjS2eSgwVCsS 5m6qLkMmuA4fzspeqH6la2U7bUqmEnWqvbbJRiPRPNE/yIhSxT/gJjVwtIpbxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708338569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T3v6P8K4x3nCrBrkB3ZzMgmnqsWX2mm4kaP/zdqyws=; b=FNrUN0RlF/YOJJ5/ksbrHF9wN4hVUsu4jazx1kTPGYlh08i1mByqHmaERzjResGytbBB9f IV4WNP4libFZZ31LRSjVXxqgGpBtBtFrItLxK8Il4R/x97FVTpLbqycx9rlKBZyYucyCDf Xd0Y/jJgkhPtSusNbGb6VW2hxtrKKTP9O/dLMc2CG+QFhAnZjZMhKt8rZAnRwk37df5Vg3 PvyFZb3cLJei43N6hcttXXAY4C3vztR9K1eWwbhLK7m2wrsdypD1EyZEeqLxvDPh7NrFjd I3JSsofrrf64ucUZPPwWi+9/gW6S9kGQsItD4GZbYH7bXvqwI1AbqQa7PBFW0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708338569; a=rsa-sha256; cv=none; b=yLhenQIDQs0iJcwjkF1imTZODuujLwDKrKjK/adWy4Cs33x+nLcGoK7S/GE7o8aw/56diG ilUGjCwpNb84xkT4vKZ0FWO16R+WGS8zHXyMWTNRnzGbycM9yu9rFuWJvZpsdwSfcbRMXJ o9iI7Djub0nyUk1rwTOzcTVPcDfbzp3uuTaJmTuhsplC/ZcXNRuIpgYyrheTyoVS6F2bZS wIA6KemBorqgb/Q1Pw4e1CttDf04IXAUmY/TmsD+tkglLtYnHsegJVnPmhKaPuVwXl9kvj ArzbgZR+Ga3S6ZUxDSNU/ruV8ddeW6/0hc7gAq9D2EDQkanqINsSvZDrflJSGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tdf0m6T5lzWx5; Mon, 19 Feb 2024 10:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JATSfO052694; Mon, 19 Feb 2024 10:29:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JATSgG052691; Mon, 19 Feb 2024 10:29:28 GMT (envelope-from git) Date: Mon, 19 Feb 2024 10:29:28 GMT Message-Id: <202402191029.41JATSgG052691@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: d2e373f81e02 - main - databases/sqlcipher: update 3.4.2 =?utf-8?Q?=E2=86=92?= 4.5.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2e373f81e025b309d7ab316667d9adc1fc3794c Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2e373f81e025b309d7ab316667d9adc1fc3794c commit d2e373f81e025b309d7ab316667d9adc1fc3794c Author: Yuri Victorovich AuthorDate: 2024-02-19 10:28:04 +0000 Commit: Yuri Victorovich CommitDate: 2024-02-19 10:28:14 +0000 databases/sqlcipher: update 3.4.2 → 4.5.6 PR: 277056 Approved by: jharris@widomaker.com (maintainer) --- databases/sqlcipher/Makefile | 6 ++--- databases/sqlcipher/distinfo | 6 ++--- .../sqlcipher/files/patch-sqlcipher-libressl-2.7 | 31 ---------------------- 3 files changed, 6 insertions(+), 37 deletions(-) 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 {