From nobody Sun Nov 06 08:20:30 2022 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 4N4nNv1Pyjz4hnHt; Sun, 6 Nov 2022 08:20:31 +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 4N4nNt6BGrz3h7j; Sun, 6 Nov 2022 08:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667722830; 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=/qZNrFpDI0khEDKHnlpxKiq3xc30OQ+j81vLGSzgErI=; b=kBOwKUWWhCqnToEkDtWfYwNs8F/cN026lc40SJCJcqmrWGN695I1aVP0ilVOWJj3yOwNqC LCLrBF8EaE3PRVTkHhA1NBi2OYktWDIZjTzotRIPgKRxJNvi56oaX66ipgPZVqlesK/8Gt xs0hseSb1qOXz6IWFeqn4f08WvBGko/gnTpp2eLUmThnCoWxztBEER/sWfebIYse8vIlld SF2SK4KgZmUS+YGT94hCt4Qkh0NlBxqAWuN0gf6aZuU+emjDzTK/Mf6HJwqN1omeL7TL5C eSJwbMunl3hQ/uY5mg6jETw006VsEBUWvxvYOkGdeI5rLh20gySr0CFwyjCIxQ== 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 4N4nNt5JGxzF41; Sun, 6 Nov 2022 08:20:30 +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 2A68KU0R069521; Sun, 6 Nov 2022 08:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A68KUXC069520; Sun, 6 Nov 2022 08:20:30 GMT (envelope-from git) Date: Sun, 6 Nov 2022 08:20:30 GMT Message-Id: <202211060820.2A68KUXC069520@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: b85e602c9ca9 - main - devel/{,py-}opendht: Update 1.10.1 -> 2.4.10 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: b85e602c9ca925f3af40c8aabafece584e426b4a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667722830; 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=/qZNrFpDI0khEDKHnlpxKiq3xc30OQ+j81vLGSzgErI=; b=ctXobGhrr2X3pJa5i6VKyT6C84whAPO71nc4KInWj7o03RgC8LjNj2+8svcXYDEeYwlxRh 3skEyHvzMCo5Nhgs9l8BQHdTZDJIkkBBDwIqkZbLijWfTPKDR1/rkcuYRQ45y/d72+YCmZ d25HAcxKpIn3Ys6ywmqv7+tsxicj+w7oQBUwGa2lcojB2XJXkiOgZSm9r9qTd2C8dnnlij ck86UvPpfkYCkp3uwJgrVGmPnUMAscUsPQPdEITiqtYJxAOTjTvAT9JqFcPLnnHKBPLBez Wm8WKW9lHAE5lvuoK3iPnorw0Y0UDknlcdLS+iqLXCfP9PKsFaRaQta75Iq/bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667722830; a=rsa-sha256; cv=none; b=pCeGYmHD0d8xuX8bFH2p5Fhrze73dn7xcAL8yjNb9u3cXbtne1wmSeb9VDMMJ4xB4xbCr3 rpeOUU8uB0Q9ZktbOYAobTxuNOJuHkHh6QWs+yjd3jYdfQtgfnSLgjRUL0qLJl16An0Vxg YWadNYoSWrsLZ6ogH+kd7BTxzTNg7F3FqPUJ6YEaG2V1DDTBrBLrCKt+Oujg8eBLo43xtK 2nA2J+aowe2MRdJS1+biIg9CZFyl/Hamr5qh785Xpjz1IV8MfASV84OANujgQpUse94K/R b2P/eU++fu0b3qpEzBLF94hZjgy1H/RqSHG3jGtW7yjB6tb9x6+0d8gjYmn8XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b85e602c9ca925f3af40c8aabafece584e426b4a commit b85e602c9ca925f3af40c8aabafece584e426b4a Author: Yuri Victorovich AuthorDate: 2022-11-06 08:16:44 +0000 Commit: Yuri Victorovich CommitDate: 2022-11-06 08:20:22 +0000 devel/{,py-}opendht: Update 1.10.1 -> 2.4.10 --- devel/opendht/Makefile | 18 +++++++++++++----- devel/opendht/distinfo | 6 +++--- devel/opendht/files/patch-CMakeLists.txt | 13 +++++++++++++ devel/opendht/files/patch-include_opendht_value.h | 4 ++-- devel/opendht/files/patch-src_http.cpp | 15 +++++++++++++++ devel/opendht/pkg-plist | 1 + devel/py-opendht/Makefile | 8 +++++--- devel/py-opendht/distinfo | 6 +++--- 8 files changed, 55 insertions(+), 16 deletions(-) diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index 8abe82fa3735..4d8961e42c9a 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,6 +1,6 @@ PORTNAME= opendht -DISTVERSION= 1.10.1 -PORTREVISION= 5 +DISTVERSIONPREFIX= v +DISTVERSION= 2.4.10 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org @@ -11,19 +11,27 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ - msgpack-cxx>4.0.0:devel/msgpack-cxx + msgpack-cxx>0:devel/msgpack-cxx \ + restinio>0:www/restinio LIB_DEPENDS= libargon2.so:security/libargon2 \ + libfmt.so:devel/libfmt \ + libhttp_parser.so:www/http-parser \ libjsoncpp.so:devel/jsoncpp \ - libmsgpackc.so:devel/msgpack-c \ libnettle.so:security/nettle \ libgnutls.so:security/gnutls +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 compiler:c++11-lib pathfix pkgconfig readline USE_GITHUB= yes GH_ACCOUNT= savoirfairelinux 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 PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} diff --git a/devel/opendht/distinfo b/devel/opendht/distinfo index cbcd6cb3e1e6..0b6b28c7ebab 100644 --- a/devel/opendht/distinfo +++ b/devel/opendht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564859802 -SHA256 (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = c1ce3b03c028ff8c11ab2855fd51f050a2ceef33c3afea9ac54f39ab78e5aee5 -SIZE (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = 434885 +TIMESTAMP = 1667672703 +SHA256 (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 8077958fb7006612b9b9758095461d8a35316b4224184f10cef785f0ec7031fe +SIZE (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 478467 diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..3b7adfa72d00 --- /dev/null +++ b/devel/opendht/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2022-11-06 06:47:13 UTC ++++ CMakeLists.txt +@@ -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) +- if (OPENSSL_FOUND) ++ #pkg_search_module(OPENSSL REQUIRED 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}) diff --git a/devel/opendht/files/patch-include_opendht_value.h b/devel/opendht/files/patch-include_opendht_value.h index 10cf8ad2c4cf..3322b0cb663c 100644 --- a/devel/opendht/files/patch-include_opendht_value.h +++ b/devel/opendht/files/patch-include_opendht_value.h @@ -1,4 +1,4 @@ ---- include/opendht/value.h.orig 2016-11-12 22:38:27 UTC +--- include/opendht/value.h.orig 2022-09-02 21:01:23 UTC +++ include/opendht/value.h @@ -26,6 +26,11 @@ @@ -10,5 +10,5 @@ +#endif + #include + #include #include - #include diff --git a/devel/opendht/files/patch-src_http.cpp b/devel/opendht/files/patch-src_http.cpp new file mode 100644 index 000000000000..92fb836b1754 --- /dev/null +++ b/devel/opendht/files/patch-src_http.cpp @@ -0,0 +1,15 @@ +--- src/http.cpp.orig 2022-11-06 06:49:51 UTC ++++ src/http.cpp +@@ -608,9 +608,9 @@ Connection::async_connect(std::vector