git: c2e7dd0dbd0f - main - devel/opendht: Update 2.4.12 → 2.5.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 08 Apr 2023 05:28:31 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c2e7dd0dbd0f458e7d94f7382578832b00d6f599
commit c2e7dd0dbd0f458e7d94f7382578832b00d6f599
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-04-08 05:13:24 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-04-08 05:28:18 +0000
devel/opendht: Update 2.4.12 → 2.5.1
Reported by: portscout
---
devel/opendht/Makefile | 8 ++---
devel/opendht/distinfo | 6 ++--
devel/opendht/files/patch-CMakeLists.txt | 52 +++++++++++---------------------
devel/opendht/pkg-plist | 1 +
4 files changed, 25 insertions(+), 42 deletions(-)
diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
index bb42ecbd623b..3fde1c2cae9a 100644
--- a/devel/opendht/Makefile
+++ b/devel/opendht/Makefile
@@ -1,6 +1,6 @@
PORTNAME= opendht
DISTVERSIONPREFIX= v
-DISTVERSION= 2.4.12
+DISTVERSION= 2.5.1
CATEGORIES= devel net
MAINTAINER= yuri@FreeBSD.org
@@ -23,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 ssl
+USES= cmake:testing compiler:c++17-lang localbase pathfix pkgconfig readline ssl
USE_GITHUB= yes
GH_ACCOUNT= savoirfairelinux
@@ -31,8 +31,8 @@ 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}
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,15 +1,15 @@
---- 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
@@ -20,30 +20,12 @@
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
@@ -20,6 +20,7 @@ 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