diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index afac5c757496..36e6798a7cc3 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,53 +1,56 @@ PORTNAME= opendht DISTVERSIONPREFIX= v -DISTVERSION= 3.1.7 -PORTREVISION= 1 +DISTVERSION= 3.1.11 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 ncurses 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 +CMAKE_OFF= OPENDHT_STATIC BUILD_TESTING OPENDHT_TESTS_NETWORK +CMAKE_TESTING_ON= BUILD_TESTING OPENDHT_TESTS_NETWORK # tests Tests assert and crash, see https://github.com/savoirfairelinux/opendht/issues/696 -OPTIONS_DEFINE= PROXY_SERVER PROXY_CLIENT PUSH_NOTIFICATIONS DOCS +OPTIONS_DEFINE= INDEX PROXY_CLIENT PROXY_SERVER PUSH_NOTIFICATIONS DOCS +OPTIONS_DEFAULT= INDEX PROXY_CLIENT PROXY_SERVER PUSH_NOTIFICATIONS DOCS -PROXY_SERVER_DESC= Enable DHT proxy server -PROXY_CLIENT_DESC= Enable DHT proxy client -PUSH_NOTIFICATIONS_DESC= Enable push notifications support +INDEX_DESC= Build DHT indexation feature +INDEX_CMAKE_BOOL= OPENDHT_INDEX -PROXY_SERVER_CMAKE_BOOL= OPENDHT_PROXY_SERVER +PROXY_CLIENT_DESC= Enable DHT proxy client PROXY_CLIENT_CMAKE_BOOL= OPENDHT_PROXY_CLIENT -PUSH_NOTIFICATIONS_CMAKE_BOOL= OPENDHT_PUSH_NOTIFICATIONS +PROXY_SERVER_DESC= Enable DHT proxy server +PROXY_SERVER_CMAKE_BOOL= OPENDHT_PROXY_SERVER PROXY_SERVER_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp \ librestbed.so:www/restbed +PUSH_NOTIFICATIONS_DESC= Enable push notifications support +PUSH_NOTIFICATIONS_CMAKE_BOOL= OPENDHT_PUSH_NOTIFICATIONS + PORTDOCS= * .include diff --git a/devel/opendht/distinfo b/devel/opendht/distinfo index 2ae14cf8dd0f..8e069bb8c7bf 100644 --- a/devel/opendht/distinfo +++ b/devel/opendht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706689378 -SHA256 (savoirfairelinux-opendht-v3.1.7_GH0.tar.gz) = 62e275a3280321a31cc1f7c8a40ed2e2671500e788dea3326422c33ce67d57a4 -SIZE (savoirfairelinux-opendht-v3.1.7_GH0.tar.gz) = 483941 +TIMESTAMP = 1712477063 +SHA256 (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = ab543cc391824fa1a8b1a593f897c26a033352acff889940c009cb63e49b4f93 +SIZE (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = 484353 diff --git a/devel/opendht/pkg-plist b/devel/opendht/pkg-plist index 1d8bfd655f9a..ec26409efde6 100644 --- a/devel/opendht/pkg-plist +++ b/devel/opendht/pkg-plist @@ -1,44 +1,44 @@ bin/dhtchat bin/dhtnode bin/dhtscanner include/opendht.h include/opendht/callbacks.h include/opendht/crypto.h include/opendht/crypto/secure_vector.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/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.3 -lib/libopendht.so.3.1.7 +lib/libopendht.so.3.1.11 libdata/pkgconfig/opendht.pc share/man/man1/dhtnode.1.gz diff --git a/devel/py-opendht/Makefile b/devel/py-opendht/Makefile index 4408cd19fd85..1131a665170a 100644 --- a/devel/py-opendht/Makefile +++ b/devel/py-opendht/Makefile @@ -1,29 +1,35 @@ PORTNAME= opendht DISTVERSIONPREFIX= v -DISTVERSION= 3.1.7 +DISTVERSION= 3.1.11 CATEGORIES= devel net PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} 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/boost/predef/other/endian.h:devel/boost-libs LIB_DEPENDS= libopendht.so:devel/opendht \ libgnutls.so:security/gnutls USES= cmake compiler:c++17-lang localbase python -USE_PYTHON= distutils cython autoplist pytest # 4 tests fail, see https://github.com/savoirfairelinux/opendht/issues/683 +USE_PYTHON= distutils cython autoplist unittest # 4 tests fail, see https://github.com/savoirfairelinux/opendht/issues/683 USE_GITHUB= yes GH_ACCOUNT= savoirfairelinux WRKSRC_SUBDIR= python +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +TEST_WRKSRC= ${WRKSRC}/tests + +post-extract: + @${MV} ${WRKSRC}/tests/opendht_tests.py ${WRKSRC}/tests/test_opendht.py + post-stage: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/opendht*.so .include diff --git a/devel/py-opendht/distinfo b/devel/py-opendht/distinfo index 3d8017fc1558..52a4ce6dfce8 100644 --- a/devel/py-opendht/distinfo +++ b/devel/py-opendht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706690400 -SHA256 (savoirfairelinux-opendht-v3.1.7_GH0.tar.gz) = 62e275a3280321a31cc1f7c8a40ed2e2671500e788dea3326422c33ce67d57a4 -SIZE (savoirfairelinux-opendht-v3.1.7_GH0.tar.gz) = 483941 +TIMESTAMP = 1712477291 +SHA256 (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = ab543cc391824fa1a8b1a593f897c26a033352acff889940c009cb63e49b4f93 +SIZE (savoirfairelinux-opendht-v3.1.11_GH0.tar.gz) = 484353