mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

devel/{,py-}opendht: update 3.1.11 → 3.2.0

Browse source 
Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2024-08-25 00:24:21 -07:00
parent 1d764bd5b4
commit bca33966eb
7 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devel/opendht/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= opendht
DISTVERSIONPREFIX= v
DISTVERSION= 3.1.11
DISTVERSION= 3.2.0
CATEGORIES= devel net
MAINTAINER= yuri@FreeBSD.org
@ -18,6 +18,7 @@ LIB_DEPENDS= libargon2.so:security/libargon2 \
libfmt.so:devel/libfmt \
libhttp_parser.so:www/http-parser \
libjsoncpp.so:devel/jsoncpp \
libllhttp.so:www/llhttp \
libnettle.so:security/nettle \
libgnutls.so:security/gnutls
RUN_DEPENDS= msgpack-cxx>0:devel/msgpack-cxx
@ -53,4 +54,6 @@ PUSH_NOTIFICATIONS_CMAKE_BOOL= OPENDHT_PUSH_NOTIFICATIONS
PORTDOCS= *
# several tests fail, see https://github.com/savoirfairelinux/opendht/issues/721
.include <bsd.port.mk>

6
devel/opendht/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712477063
SHA256 (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = ab543cc391824fa1a8b1a593f897c26a033352acff889940c009cb63e49b4f93
SIZE (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = 484353
TIMESTAMP = 1724551785
SHA256 (savoirfairelinux-opendht-v3.2.0_GH0.tar.gz) = 019564087f0752a1c09347473c39b2d48e920247f25f68dac235f1e5d6204ea4
SIZE (savoirfairelinux-opendht-v3.2.0_GH0.tar.gz) = 486853

19
devel/opendht/files/patch-CMakeLists.txt
View file

@ -1,6 +1,15 @@
--- CMakeLists.txt.orig 2023-09-10 06:15:32 UTC
--- CMakeLists.txt.orig 2024-08-25 06:24:59 UTC
+++ CMakeLists.txt
@@ -99,8 +99,8 @@ if (NOT MSVC)
@@ -116,7 +116,7 @@ if (NOT MSVC)
endif()
FetchContent_MakeAvailable(llhttp-local)
if (BUILD_SHARED_LIBS)
- set(llhttp_target llhttp_shared)
+ set(llhttp_target llhttp)
else()
set(llhttp_target llhttp_static)
endif()
@@ -128,8 +128,8 @@ if (NOT MSVC)
endif()
if (OPENDHT_PROXY_OPENSSL)
# https://cmake.org/cmake/help/latest/module/FindOpenSSL.html
@ -11,12 +20,12 @@
message(STATUS "Found OpenSSL ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIRS}")
set(openssl_lib ", openssl")
else ()
@@ -370,7 +370,7 @@ else()
@@ -405,7 +405,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 (liburing_FOUND)
set(iouring_lib ", liburing")

22
devel/opendht/files/patch-src_http.cpp
View file

@ -1,15 +1,15 @@
--- src/http.cpp.orig 2022-11-06 06:49:51 UTC
--- src/http.cpp.orig 2024-08-11 15:44:47 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));
@@ -707,9 +707,9 @@ Connection::set_keepalive(uint32_t seconds)
#endif
#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));
// Linux based systems
- setsockopt(socket, SOL_TCP, TCP_KEEPIDLE, &seconds, 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, &seconds, 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
}
}

2
devel/opendht/pkg-plist
View file

@ -39,6 +39,6 @@ lib/cmake/opendht/opendhtConfig.cmake
lib/cmake/opendht/opendhtConfigVersion.cmake
lib/libopendht.so
lib/libopendht.so.3
lib/libopendht.so.3.1.11
lib/libopendht.so.3.2.0
libdata/pkgconfig/opendht.pc
share/man/man1/dhtnode.1.gz

2
devel/py-opendht/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= opendht
DISTVERSIONPREFIX= v
DISTVERSION= 3.1.11
DISTVERSION= 3.2.0
CATEGORIES= devel net
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-opendht/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712477291
SHA256 (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = ab543cc391824fa1a8b1a593f897c26a033352acff889940c009cb63e49b4f93
SIZE (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = 484353
TIMESTAMP = 1724552024
SHA256 (savoirfairelinux-opendht-v3.2.0_GH0.tar.gz) = 019564087f0752a1c09347473c39b2d48e920247f25f68dac235f1e5d6204ea4
SIZE (savoirfairelinux-opendht-v3.2.0_GH0.tar.gz) = 486853