diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index bb42ecbd623b..3fde1c2cae9a 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,54 +1,54 @@ PORTNAME= opendht DISTVERSIONPREFIX= v -DISTVERSION= 2.4.12 +DISTVERSION= 2.5.1 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 pathfix pkgconfig readline ssl +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 -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 +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 b1ab4b3dd6f5..ed77b3526a86 100644 --- a/devel/opendht/distinfo +++ b/devel/opendht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678187565 -SHA256 (savoirfairelinux-opendht-v2.4.12_GH0.tar.gz) = 5144bc4456d396b527b59065064bbc31fbe0d2af5fd052506219a66895791e64 -SIZE (savoirfairelinux-opendht-v2.4.12_GH0.tar.gz) = 479457 +TIMESTAMP = 1680928160 +SHA256 (savoirfairelinux-opendht-v2.5.1_GH0.tar.gz) = 519245ad7ceff35f9e45035301b34f8ccafad16c605149b034cc10fd92adb32c +SIZE (savoirfairelinux-opendht-v2.5.1_GH0.tar.gz) = 480528 diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt index 4c092de64606..0ebb4df3c0df 100644 --- a/devel/opendht/files/patch-CMakeLists.txt +++ b/devel/opendht/files/patch-CMakeLists.txt @@ -1,49 +1,31 @@ ---- CMakeLists.txt.orig 2023-03-07 11:14:26 UTC +--- CMakeLists.txt.orig 2023-04-08 04:39:13 UTC +++ CMakeLists.txt -@@ -59,7 +59,7 @@ if (NOT MSVC) - find_package (PkgConfig REQUIRED) - pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls) +@@ -61,7 +61,7 @@ if (NOT MSVC) 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) + 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) - endif () -@@ -91,8 +91,8 @@ if (NOT MSVC) +@@ -94,8 +94,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 () -@@ -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) +@@ -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) + 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 c6d1d5313c8b..390089fa30f9 100644 --- a/devel/opendht/pkg-plist +++ b/devel/opendht/pkg-plist @@ -1,42 +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/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