From nobody Tue Mar 7 11:21:17 2023 X-Original-To: dev-commits-ports-main@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 4PWCgf3r6cz3xGlL; Tue, 7 Mar 2023 11:21:18 +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 4PWCgf1HTxz3jxQ; Tue, 7 Mar 2023 11:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678188078; 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=jO/NMGrlhUhrsnmI+Dunisw4OrQ6bqLO+VOsCdvrY7s=; b=V8imYR07koSF0RtreGCCLsnR9uJL1PGDgQdkoFbcgch0s1BYycfET7pH0uiIHQxVuNhmSd OLYWtQI+gtO1oOx5wlGJrFQlu+Uvh7hU9lU23PKXoGUsP7HCuBbuikjSAJh1Z6qlSacqb3 8VHH8F812lm9yk6ignguY7YabmFecrCwd9yN1CrttJf0rfdxF2k9XyfiN0iiuDqxbmIRct lFQ21gfs7BRrVvok3SmNNe8svJf1YR2KGXKrQaxLGrqBQj72FPQTAybFCY5K1dXSnE/rcB 2VkKdJwfLbpp+rOzpBsYjvbcNUgClgOZnN1nzjH5hqZpQo2cXf6Gq0GNYyrCOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678188078; 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=jO/NMGrlhUhrsnmI+Dunisw4OrQ6bqLO+VOsCdvrY7s=; b=LD2fzj+VCm+1bz8EoMoK3lQScTWb6S/zUW69i0g97QKZ+52WkwkAlXFjWAvXFWgFXjWb4k uA92vUbPgxa/Bc/NyaqBd5rif5iIwIX1ZKCb2gz4UXW9J9t0XOh85zLPOVXFBihXS11KRR LrZk534Rz8P9Galp7P15b/XOfUCA0/LvjLjKNerRwdccKPKPQOi4iT6exPpTYXrtjFGvZH Z3uqf/6C2p5DolDE5pPyqFti1ypfmNRB7QARQEX6rbfxP04S1BPNQPCf3iIg32GEkHzWbL 2+wyLG+79GC35SlwL1aDuKDubON3GXZD3hwF8nMxsyb0BzQuIjPZ/V2uv86vew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678188078; a=rsa-sha256; cv=none; b=DOeCWdlFT3FaOUr2IoDckHZeRp6lkFMrj8QHBGr6IhfsE4UQPvUvwoE2Qg/94w8fWnmiHG UZ8nEqBM3KIIXeOYkSAgnl7bIpsOljSBNb2j7tDq4wT5tRDmpGiG0b6S47uMNBHcnaFJ2O pph5I4lyLYffmOoMNOsokve+gBkBwszDwLgNpMtCXHJqSvxFtPDXRnDEej/6eBTNIjmp/k v7lR6kWRf8f+cIHkZLP05cm2LGJPBLDuBnW1jhoxTx8SPBo5VEHhjtfCp6w7ii5DBc2cjW I6WtgxlN7JUlaYJFCoVhVHSDEh8/adw37Liu3plfj++5c0WQNO/6QxoA1RObfA== 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 4PWCgf0MXxzhr8; Tue, 7 Mar 2023 11:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327BLHDV077301; Tue, 7 Mar 2023 11:21:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327BLHeM077300; Tue, 7 Mar 2023 11:21:17 GMT (envelope-from git) Date: Tue, 7 Mar 2023 11:21:17 GMT Message-Id: <202303071121.327BLHeM077300@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: 91018f2c4a18 - main - =?utf-8?Q?devel/opendht:=20Update=202.4.10=20=E2=86=92=202.4.12?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 91018f2c4a183638e47e5223e336400428700e85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=91018f2c4a183638e47e5223e336400428700e85 commit 91018f2c4a183638e47e5223e336400428700e85 Author: Yuri Victorovich AuthorDate: 2023-03-07 11:21:11 +0000 Commit: Yuri Victorovich CommitDate: 2023-03-07 11:21:11 +0000 devel/opendht: Update 2.4.10 → 2.4.12 --- devel/opendht/Makefile | 7 ++--- devel/opendht/distinfo | 6 ++-- devel/opendht/files/patch-CMakeLists.txt | 51 ++++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index 7ab169981e5a..bb42ecbd623b 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,7 +1,6 @@ PORTNAME= opendht DISTVERSIONPREFIX= v -DISTVERSION= 2.4.10 -PORTREVISION= 1 +DISTVERSION= 2.4.12 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org @@ -24,7 +23,7 @@ LIB_DEPENDS= libargon2.so:security/libargon2 \ RUN_DEPENDS= msgpack-cxx>0:devel/msgpack-cxx TEST_DEPENDS= cppunit>0:devel/cppunit -USES= cmake:testing compiler:c++17-lang pathfix pkgconfig readline +USES= cmake:testing compiler:c++17-lang pathfix pkgconfig readline ssl USE_GITHUB= yes GH_ACCOUNT= savoirfairelinux @@ -33,7 +32,7 @@ USE_LDCONFIG= yes LDFLAGS+= -lcrypto CMAKE_OFF= OPENDHT_STATIC -CMAKE_TESTING_ON= OPENDHT_TESTS # tests fail w/out explanation, see https://github.com/savoirfairelinux/opendht/issues/640 +CMAKE_TESTING_ON= OPENDHT_TESTS # tests fail w/out explanation, see https://github.com/savoirfairelinux/opendht/issues/640, https://github.com/savoirfairelinux/opendht/issues/658 PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} diff --git a/devel/opendht/distinfo b/devel/opendht/distinfo index 0b6b28c7ebab..b1ab4b3dd6f5 100644 --- a/devel/opendht/distinfo +++ b/devel/opendht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667672703 -SHA256 (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 8077958fb7006612b9b9758095461d8a35316b4224184f10cef785f0ec7031fe -SIZE (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 478467 +TIMESTAMP = 1678187565 +SHA256 (savoirfairelinux-opendht-v2.4.12_GH0.tar.gz) = 5144bc4456d396b527b59065064bbc31fbe0d2af5fd052506219a66895791e64 +SIZE (savoirfairelinux-opendht-v2.4.12_GH0.tar.gz) = 479457 diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt index f50759bf427d..4c092de64606 100644 --- a/devel/opendht/files/patch-CMakeLists.txt +++ b/devel/opendht/files/patch-CMakeLists.txt @@ -1,22 +1,49 @@ ---- CMakeLists.txt.orig 2023-01-10 16:45:50 UTC +--- CMakeLists.txt.orig 2023-03-07 11:14:26 UTC +++ CMakeLists.txt -@@ -61,7 +61,7 @@ if (NOT MSVC) - pkg_search_module (Nettle REQUIRED nettle) - check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX) - if (NOT HAVE_MSGPACKCXX) -- find_package (msgpack REQUIRED) -+ find_package (msgpackc-cxx REQUIRED) - endif() +@@ -59,7 +59,7 @@ if (NOT MSVC) + find_package (PkgConfig REQUIRED) + pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls) + pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle) +- find_package (msgpack REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx) ++ find_package (msgpackc-cxx REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx) if (OPENDHT_TOOLS) find_package (Readline 6 REQUIRED) + endif () @@ -91,8 +91,8 @@ if (NOT MSVC) endif() if (OPENDHT_PROXY_OPENSSL) # https://cmake.org/cmake/help/latest/module/FindOpenSSL.html -- pkg_search_module(OPENSSL REQUIRED openssl) +- pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl) - if (OPENSSL_FOUND) -+ #pkg_search_module(OPENSSL REQUIRED openssl) ++ #pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl) + if (TRUE OR OPENSSL_FOUND) message(STATUS "Found OpenSSL ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIRS}") - include_directories(SYSTEM ${OPENSSL_INCLUDE_DIRS}) - link_directories (${OPENSSL_LIBRARY_DIRS}) + set(openssl_lib ", openssl") + else () +@@ -309,7 +309,7 @@ if (OPENDHT_STATIC) + target_link_libraries(opendht-static PUBLIC PkgConfig::Jsoncpp) + endif() + if (OPENDHT_PROXY_OPENSSL) +- target_link_libraries(opendht-static PUBLIC PkgConfig::OPENSSL) ++ target_link_libraries(opendht-static ssl) + endif() + if (APPLE) + target_link_libraries(opendht-static PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security") +@@ -381,7 +381,7 @@ if (OPENDHT_SHARED) + target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp) + endif() + if (OPENDHT_PROXY_OPENSSL) +- target_link_libraries(opendht PUBLIC PkgConfig::OPENSSL) ++ target_link_libraries(opendht PUBLIC ssl) + endif() + if (APPLE) + target_link_libraries(opendht PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security") +@@ -498,7 +498,7 @@ if (OPENDHT_TESTS) + ${GNUTLS_LIBRARIES} + ) + if (OPENDHT_PROXY_OPENSSL) +- target_link_libraries(opendht_unit_tests PkgConfig::OPENSSL) ++ target_link_libraries(opendht_unit_tests ssl) + endif() + enable_testing() + add_test(TEST opendht_unit_tests)