diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index 81cc267de27a..7f99049a59a7 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,55 +1,54 @@ PORTNAME= opendht DISTVERSIONPREFIX= v -DISTVERSION= 2.5.1 -PORTREVISION= 1 +DISTVERSION= 2.6.0 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org COMMENT= Lightweight Distributed Hash Table implementation WWW= https://github.com/savoirfairelinux/opendht/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio \ boost-libs>0:devel/boost-libs \ 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 \ 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 localbase pathfix pkgconfig readline ssl USE_GITHUB= yes GH_ACCOUNT= savoirfairelinux USE_LDCONFIG= yes LDFLAGS+= -lcrypto CMAKE_OFF= OPENDHT_STATIC BUILD_TESTING CMAKE_TESTING_ON= BUILD_TESTING # 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} OPTIONS_DEFINE= PROXY_SERVER PROXY_CLIENT PUSH_NOTIFICATIONS DOCS PROXY_SERVER_DESC= Enable DHT proxy server PROXY_CLIENT_DESC= Enable DHT proxy client PUSH_NOTIFICATIONS_DESC= Enable push notifications support PROXY_SERVER_CMAKE_BOOL= OPENDHT_PROXY_SERVER PROXY_CLIENT_CMAKE_BOOL= OPENDHT_PROXY_CLIENT PUSH_NOTIFICATIONS_CMAKE_BOOL= OPENDHT_PUSH_NOTIFICATIONS PROXY_SERVER_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp \ librestbed.so:www/restbed PORTDOCS= * .include diff --git a/devel/opendht/distinfo b/devel/opendht/distinfo index ed77b3526a86..32cd9ac08090 100644 --- a/devel/opendht/distinfo +++ b/devel/opendht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680928160 -SHA256 (savoirfairelinux-opendht-v2.5.1_GH0.tar.gz) = 519245ad7ceff35f9e45035301b34f8ccafad16c605149b034cc10fd92adb32c -SIZE (savoirfairelinux-opendht-v2.5.1_GH0.tar.gz) = 480528 +TIMESTAMP = 1694326478 +SHA256 (savoirfairelinux-opendht-v2.6.0_GH0.tar.gz) = 25d67e766e439cc04fd73091f8cd6d3c0fc8bf047427cdc9e8f469b9084add45 +SIZE (savoirfairelinux-opendht-v2.6.0_GH0.tar.gz) = 482044 diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt index 0ebb4df3c0df..a72c690b955e 100644 --- a/devel/opendht/files/patch-CMakeLists.txt +++ b/devel/opendht/files/patch-CMakeLists.txt @@ -1,31 +1,22 @@ ---- CMakeLists.txt.orig 2023-04-08 04:39:13 UTC +--- CMakeLists.txt.orig 2023-09-10 06:15:32 UTC +++ CMakeLists.txt -@@ -61,7 +61,7 @@ if (NOT MSVC) - pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle) - check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX) - if (NOT HAVE_MSGPACKCXX) -- find_package (msgpack REQUIRED CONFIG) -+ find_package (msgpack-cxx REQUIRED CONFIG) - endif() - if (OPENDHT_TOOLS) - find_package (Readline 6 REQUIRED) -@@ -94,8 +94,8 @@ if (NOT MSVC) +@@ -99,8 +99,8 @@ if (NOT MSVC) endif() if (OPENDHT_PROXY_OPENSSL) # https://cmake.org/cmake/help/latest/module/FindOpenSSL.html - pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl) - if (OPENSSL_FOUND) + #pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl) + if (TRUE OR OPENSSL_FOUND) message(STATUS "Found OpenSSL ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIRS}") set(openssl_lib ", openssl") else () -@@ -359,7 +359,7 @@ if (Jsoncpp_FOUND) - target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp) - endif() - if (OPENDHT_PROXY_OPENSSL) -- target_link_libraries(opendht PUBLIC PkgConfig::OPENSSL) -+ target_link_libraries(opendht PRIVATE ssl) +@@ -370,7 +370,7 @@ else() + target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp) + endif() + if (OPENDHT_PROXY_OPENSSL) +- target_link_libraries(opendht PUBLIC PkgConfig::OPENSSL) ++ target_link_libraries(opendht PRIVATE ssl) + endif() endif() - if (APPLE) - target_link_libraries(opendht PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security") + diff --git a/devel/opendht/pkg-plist b/devel/opendht/pkg-plist index 390089fa30f9..a5b80a31d9b8 100644 --- a/devel/opendht/pkg-plist +++ b/devel/opendht/pkg-plist @@ -1,43 +1,43 @@ bin/dhtchat bin/dhtnode bin/dhtscanner include/opendht.h include/opendht/callbacks.h include/opendht/crypto.h include/opendht/def.h include/opendht/default_types.h include/opendht/dht.h include/opendht/dht_interface.h include/opendht/dht_proxy_client.h include/opendht/dht_proxy_server.h include/opendht/dhtrunner.h include/opendht/http.h include/opendht/indexation/pht.h include/opendht/infohash.h include/opendht/log.h -include/opendht/log_enable.h +include/opendht/logger.h include/opendht/network_engine.h include/opendht/network_utils.h include/opendht/node.h include/opendht/node_cache.h include/opendht/node_export.h include/opendht/peer_discovery.h include/opendht/proxy.h include/opendht/rate_limiter.h include/opendht/rng.h include/opendht/routing_table.h include/opendht/scheduler.h include/opendht/securedht.h include/opendht/sockaddr.h include/opendht/thread_pool.h include/opendht/utils.h include/opendht/value.h include/opendht/value.h.orig lib/cmake/opendht/opendhtConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/opendht/opendhtConfig.cmake lib/cmake/opendht/opendhtConfigVersion.cmake lib/libopendht.so lib/libopendht.so.%%SHL1%% lib/libopendht.so.%%SHL3%% libdata/pkgconfig/opendht.pc man/man1/dhtnode.1.gz