git: b85e602c9ca9 - main - devel/{,py-}opendht: Update 1.10.1 -> 2.4.10
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 06 Nov 2022 08:20:30 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b85e602c9ca925f3af40c8aabafece584e426b4a
commit b85e602c9ca925f3af40c8aabafece584e426b4a
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-11-06 08:16:44 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
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 <string>
+ #include <string_view>
#include <sstream>
- #include <bitset>
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<asio::ip::tcp::e
+ setsockopt(socket, IPPROTO_TCP, TCP_KEEPALIVE, &start, sizeof(uint32_t));
+ #else
+ // Linux based systems
+- setsockopt(socket, SOL_TCP, TCP_KEEPIDLE, &start, sizeof(uint32_t));
+- setsockopt(socket, SOL_TCP, TCP_KEEPINTVL, &interval, sizeof(uint32_t));
+- setsockopt(socket, SOL_TCP, TCP_KEEPCNT, &cnt, sizeof(uint32_t));
++ setsockopt(socket, IPPROTO_TCP, TCP_KEEPIDLE, &start, sizeof(uint32_t));
++ setsockopt(socket, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(uint32_t));
++ setsockopt(socket, IPPROTO_TCP, TCP_KEEPCNT, &cnt, sizeof(uint32_t));
+ #endif
+ #endif
+ }
diff --git a/devel/opendht/pkg-plist b/devel/opendht/pkg-plist
index 11c31ea14e6b..c6d1d5313c8b 100644
--- a/devel/opendht/pkg-plist
+++ b/devel/opendht/pkg-plist
@@ -11,6 +11,7 @@ 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
diff --git a/devel/py-opendht/Makefile b/devel/py-opendht/Makefile
index 0a5946aaec12..da378e900906 100644
--- a/devel/py-opendht/Makefile
+++ b/devel/py-opendht/Makefile
@@ -1,5 +1,6 @@
PORTNAME= opendht
-DISTVERSION= 1.10.1
+DISTVERSIONPREFIX= v
+DISTVERSION= 2.4.10
CATEGORIES= devel net
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -10,13 +11,14 @@ WWW= https://github.com/savoirfairelinux/opendht/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/../COPYING
+BUILD_DEPENDS= ${LOCALBASE}/include/boost/predef/other/endian.h:devel/boost-libs
LIB_DEPENDS= libopendht.so:devel/opendht \
libgnutls.so:security/gnutls
-USES= cmake compiler:c++11-lib localbase python:3.4+
+USES= cmake compiler:c++17-lang localbase python:3.4+
USE_GITHUB= yes
GH_ACCOUNT= savoirfairelinux
-USE_PYTHON= distutils cython autoplist
+USE_PYTHON= distutils cython autoplist pytest
WRKSRC_SUBDIR= python
diff --git a/devel/py-opendht/distinfo b/devel/py-opendht/distinfo
index 721b17781f9c..14cfcdce6fc9 100644
--- a/devel/py-opendht/distinfo
+++ b/devel/py-opendht/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564859831
-SHA256 (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = c1ce3b03c028ff8c11ab2855fd51f050a2ceef33c3afea9ac54f39ab78e5aee5
-SIZE (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = 434885
+TIMESTAMP = 1667721398
+SHA256 (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 8077958fb7006612b9b9758095461d8a35316b4224184f10cef785f0ec7031fe
+SIZE (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 478467