From nobody Fri Mar 14 05:14:29 2025 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 4ZDXbn3g8vz5qY8c; Fri, 14 Mar 2025 05:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDXbn2vXdz45g5; Fri, 14 Mar 2025 05:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741929269; 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=1ij0OOZN29VTzhNHcxOSrWSdeh7EHCYUwVMCXE1zRig=; b=U9M43aGjFokxra7/H0oIilB0FMymxiGJbG1g7MSwSaWYHYQrrl52rUvpHa40oIf2n7ctfD fa6cQeVdHeElc1aJkdbIbDJGQRDcEzLM8yEb0fipy5HKvMLt9/t1l5N94mEk9k/wPuH+F6 pvTGHJzHb7eTUFiG2x4MH00QsQjb5+V+tX/xxXMj4lTfIVbkB9bqur5NhNppqtRepUbjmZ +ZE7dfVGu+M5IHJAhkpN50ZKCHQHScoxYG7h5aFF0yAJ5oP678nKPQEer3Tfje0MyLX5DS 433XFxeXhTTZ3D29SBKIHP1AHpnEMDZdiqdZ6KXLfszM52dgT9Kcxgpqoh0TlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741929269; a=rsa-sha256; cv=none; b=x9PMUJy+d2TALTetMvI4KT1XbGQrfZzOoYkC97FMqn+ZldkgzQOYGY0gudwL0AH2VjkzSP xQCE6MbESB/rH3pdtIRK3UdMYehkGYNUrcSpU8S2aWX5EKjFBOBsV3SHOBtcDumWW0Rxqh sHWIWgWRg39Z1lfnnDfasUm4nhYcEXx1RoCDkbH9YT49sdcWCBwI21IAjy/UbMr5zgS7V7 f1jg1SQAf4G40PF3I1imUygc2dBY03x+y5G7y7a941wZr692Al0PPXqDv5nYRPhHtlUiiu BnTL9Pk1a3FgEfhx8pL8UiTEbTuS0pMaZuiZZmA4NEC5MhA4FVVvwf2xKul0+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741929269; 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=1ij0OOZN29VTzhNHcxOSrWSdeh7EHCYUwVMCXE1zRig=; b=tkkJ/3DP1QH1WCIbBchunEfMOhw4vncmBZ4pQhGt6Ov5+Jc8TDzMAR5GHBOOHkOEwBVG9g YB+WOSzoIPvwH2ftReQvgH0tZ3Z9aPbEVJDRGopjkql0wE27le6A2QewXLHFHufPnYplv1 RLmW42eDSC3nttOMRJ9GX9bHstzejxHB2pfCc21RxcHITSsNB5PZq6e0b0/sHDFane+Iao 2cDKIhlH074pmvvR41l35D9t+Wx/7GslWNCICsP61m6L305vqeqJ1jDHToIW0ms9JddEir BQQP4tYke1zk16G8YH7cet5t1c6XWusDU3WhWVgd8mOAfWkihiUUoWfr5Ci7GA== 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 4ZDXbn28YTzVTq; Fri, 14 Mar 2025 05:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52E5ET0b030937; Fri, 14 Mar 2025 05:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52E5ETXg030934; Fri, 14 Mar 2025 05:14:29 GMT (envelope-from git) Date: Fri, 14 Mar 2025 05:14:29 GMT Message-Id: <202503140514.52E5ETXg030934@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 65f5909c8083 - main - devel/qca: Update to 2.3.10 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65f5909c808320dc6767351534d9c965fc2f0561 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=65f5909c808320dc6767351534d9c965fc2f0561 commit 65f5909c808320dc6767351534d9c965fc2f0561 Author: Jason E. Hale AuthorDate: 2025-03-14 05:05:33 +0000 Commit: Jason E. Hale CommitDate: 2025-03-14 05:14:23 +0000 devel/qca: Update to 2.3.10 Convert TEST option to cmake:testing after 8cb78e3688bf. Fix build with BOTAN option enabled if security/botan2 is also installed. [1] Fixes: 16577400db6b devel/qca: switch to botan3 instead of deprecated botan2 [1] --- devel/qca/Makefile | 20 ++++++++-------- devel/qca/distinfo | 6 ++--- .../files/patch-plugins_qca-botan_CMakeLists.txt | 27 ++++++++++++++++++++++ .../qca/files/patch-plugins_qca-ossl_qca-ossl.cpp | 26 ++++++++++----------- 4 files changed, 52 insertions(+), 27 deletions(-) diff --git a/devel/qca/Makefile b/devel/qca/Makefile index bd103c4e7520..ffeb2a585be9 100644 --- a/devel/qca/Makefile +++ b/devel/qca/Makefile @@ -1,6 +1,5 @@ PORTNAME= qca -DISTVERSION= 2.3.9 -PORTREVISION= 1 +DISTVERSION= 2.3.10 CATEGORIES= devel MASTER_SITES= KDE/stable/qca/${PORTVERSION} PKGNAMESUFFIX= -${FLAVOR} @@ -18,10 +17,12 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss FLAVORS= qt5 qt6 FLAVOR?= qt5 -USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig \ +USES= cmake:testing compiler:c++20-lang localbase:ldflags pkgconfig \ qt:${FLAVOR:S/qt//} tar:xz USE_LDCONFIG= yes -_USE_QT_qt5= core buildtools:build qmake:build +_USE_QT_qt5= core \ + buildtools:build qmake:build \ + network:test testlib:test _USE_QT_qt6= 5compat base USE_QT= ${_USE_QT_${FLAVOR}} @@ -30,6 +31,9 @@ CMAKE_ARGS= -DBUILD_PLUGINS=none \ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ -DQCA_SUFFIX=${FLAVOR} \ -D${FLAVOR:tu}:BOOL=TRUE +CMAKE_OFF= BUILD_TESTS +CMAKE_TESTING_ON= BUILD_TESTS + CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt _PLIST_SUB_qt5= QT5_ONLY="" @@ -38,7 +42,7 @@ PLIST_SUB= SHLIB_VER=${PORTVERSION} \ QCA_QT_VERSION=${FLAVOR} \ ${_PLIST_SUB_${FLAVOR}} -OPTIONS_DEFINE= BOTAN GCRYPT GNUPG LOGGER NSS OPENSSL PKCS11 SASL SOFTSTORE TEST +OPTIONS_DEFINE= BOTAN GCRYPT GNUPG LOGGER NSS OPENSSL PKCS11 SASL SOFTSTORE OPTIONS_DEFAULT=GNUPG OPENSSL OPTIONS_SUB= yes @@ -73,10 +77,4 @@ SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes SOFTSTORE_DESC= Simple persistent certificate store SOFTSTORE_CMAKE_ON= -DWITH_softstore_PLUGIN=yes -_TEST_USE_qt5= QT=network:build,testlib:build -_TEST_USE_qt6= # Network and Test included in base -TEST_USE= ${_TEST_USE_${FLAVOR}} -TEST_CMAKE_BOOL= BUILD_TESTS -TEST_TEST_TARGET= test - .include diff --git a/devel/qca/distinfo b/devel/qca/distinfo index a42f599aad16..91100a4e4e25 100644 --- a/devel/qca/distinfo +++ b/devel/qca/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1719288772 -SHA256 (qca-2.3.9.tar.xz) = c555d5298cdd7b6bafe2b1f96106f30cfa543a23d459d50c8a91eac33c476e4e -SIZE (qca-2.3.9.tar.xz) = 765256 +TIMESTAMP = 1741916166 +SHA256 (qca-2.3.10.tar.xz) = 1c5b722da93d559365719226bb121c726ec3c0dc4c67dea34f1e50e4e0d14a02 +SIZE (qca-2.3.10.tar.xz) = 764844 diff --git a/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt b/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt new file mode 100644 index 000000000000..a0d966149996 --- /dev/null +++ b/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt @@ -0,0 +1,27 @@ +Prefer botan-3 and prevent linking to botan-2, as security/botan2 is currently +marked for removal. [1] Although we depend on libbotan-3.so for the BOTAN +option, previous code would link to libbotan-2.so if installed. + +[1] https://cgit.freebsd.org/ports/commit/?id=eb1217e8e983cae63d99af35ac6de924b56691ab + +--- plugins/qca-botan/CMakeLists.txt.orig 2025-03-09 12:09:03 UTC ++++ plugins/qca-botan/CMakeLists.txt +@@ -1,13 +1,10 @@ find_package(PkgConfig REQUIRED) + find_package(PkgConfig REQUIRED) + +-pkg_check_modules(BOTAN IMPORTED_TARGET botan-2) +-if(NOT BOTAN_FOUND) +- pkg_check_modules(BOTAN IMPORTED_TARGET botan-3) +- if(BOTAN_FOUND) +- set(CMAKE_CXX_STANDARD 20) +- set(CMAKE_CXX_STANDARD_REQUIRED ON) +- set(CMAKE_CXX_EXTENSIONS OFF) +- endif() ++pkg_check_modules(BOTAN IMPORTED_TARGET botan-3) ++if(BOTAN_FOUND) ++ set(CMAKE_CXX_STANDARD 20) ++ set(CMAKE_CXX_STANDARD_REQUIRED ON) ++ set(CMAKE_CXX_EXTENSIONS OFF) + endif() + + if(WITH_botan_PLUGIN STREQUAL "yes" AND NOT BOTAN_FOUND) diff --git a/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp b/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp index fb1e6745eaec..10548649b6bd 100644 --- a/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp +++ b/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp @@ -3,11 +3,11 @@ Patch from OpenBSD rsadowski@ LibreSSL 3.0.x support from Stefan Strogin Index: plugins/qca-ossl/qca-ossl.cpp ---- plugins/qca-ossl/qca-ossl.cpp.orig 2021-02-04 10:29:44 UTC +--- plugins/qca-ossl/qca-ossl.cpp.orig 2025-03-09 12:09:03 UTC +++ plugins/qca-ossl/qca-ossl.cpp -@@ -41,7 +41,13 @@ - #include - #include +@@ -45,7 +45,13 @@ + #include + #endif +#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT +#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT @@ -19,7 +19,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp using namespace QCA; -@@ -1239,6 +1245,7 @@ class opensslPbkdf2Context : public KDFContext (public +@@ -1262,6 +1268,7 @@ class opensslPbkdf2Context : public KDFContext (protec protected: }; @@ -27,7 +27,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp class opensslHkdfContext : public HKDFContext { Q_OBJECT -@@ -1271,6 +1278,7 @@ class opensslHkdfContext : public HKDFContext (public) +@@ -1294,6 +1301,7 @@ class opensslHkdfContext : public HKDFContext (public) return out; } }; @@ -35,7 +35,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp class opensslHMACContext : public MACContext { -@@ -4951,7 +4959,11 @@ class MyTLSContext : public TLSContext (public) +@@ -5004,7 +5012,11 @@ class MyTLSContext : public TLSContext (public) case TLS::TLS_v1: ctx = SSL_CTX_new(TLS_client_method()); SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION); @@ -47,7 +47,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp break; case TLS::DTLS_v1: default: -@@ -4972,7 +4984,11 @@ class MyTLSContext : public TLSContext (public) +@@ -5025,7 +5037,11 @@ class MyTLSContext : public TLSContext (public) QStringList cipherList; for (int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) { const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i); @@ -59,7 +59,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp } sk_SSL_CIPHER_free(sk); -@@ -5345,7 +5361,11 @@ class MyTLSContext : public TLSContext (public) +@@ -5398,7 +5414,11 @@ class MyTLSContext : public TLSContext (public) sessInfo.version = TLS::TLS_v1; } @@ -71,9 +71,9 @@ Index: plugins/qca-ossl/qca-ossl.cpp sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits)); -@@ -6629,7 +6649,9 @@ class opensslProvider : public Provider (public) - #endif - list += QStringLiteral("pbkdf1(sha1)"); +@@ -6705,7 +6725,9 @@ class opensslProvider : public Provider (public) + } + list += QStringLiteral("pkcs12"); list += QStringLiteral("pbkdf2(sha1)"); +#ifndef LIBRESSL_VERSION_NUMBER list += QStringLiteral("hkdf(sha256)"); @@ -81,7 +81,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp list += QStringLiteral("pkey"); list += QStringLiteral("dlgroup"); list += QStringLiteral("rsa"); -@@ -6698,8 +6720,10 @@ class opensslProvider : public Provider (public) +@@ -6755,8 +6777,10 @@ class opensslProvider : public Provider (public) #endif else if (type == QLatin1String("pbkdf2(sha1)")) return new opensslPbkdf2Context(this, type);