diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index 4c73a3fe68c3..d04c4e9c95cc 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,61 +1,61 @@ PORTNAME= opendht DISTVERSIONPREFIX= v DISTVERSION= 3.3.1 -PORTREVISION= 3 +PORTREVISION= 4 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 \ libllhttp.so:www/llhttp \ 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 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= INDEX PROXY_CLIENT PROXY_SERVER PUSH_NOTIFICATIONS DOCS OPTIONS_DEFAULT= INDEX PROXY_CLIENT PROXY_SERVER PUSH_NOTIFICATIONS DOCS INDEX_DESC= Build DHT indexation feature INDEX_CMAKE_BOOL= OPENDHT_INDEX PROXY_CLIENT_DESC= Enable DHT proxy client PROXY_CLIENT_CMAKE_BOOL= OPENDHT_PROXY_CLIENT 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= * # several tests fail, see https://github.com/savoirfairelinux/opendht/issues/721 # tests throw exceptions, see https://github.com/savoirfairelinux/opendht/issues/751 .include diff --git a/www/restbed/Makefile b/www/restbed/Makefile index 6fea957240fa..94c782bfb71f 100644 --- a/www/restbed/Makefile +++ b/www/restbed/Makefile @@ -1,31 +1,34 @@ PORTNAME= restbed -DISTVERSION= 4.8 +DISTVERSION= 5.0.0 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org COMMENT= Asynchronous RESTful functionality to C++11 applications WWW= https://github.com/Corvusoft/restbed LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= asio>0:net/asio +RUN_DEPENDS= asio>0:net/asio + USES= cmake:testing compiler:c++14-lang ssl USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= Corvusoft -GH_TUPLE= Corvusoft:asio-dependency:a4d820d:a/dependency/asio \ - Corvusoft:catch-dependency:d10b9bd:c/dependency/catch CMAKE_ON= BUILD_SHARED CMAKE_OFF= BUILD_TESTS CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR:STRING=lib CMAKE_TESTING_ON= BUILD_TESTS pre-test: # tests only pass when net.inet6.ip6.v6only=0, see pkg-message @if [ $$(sysctl -n net.inet6.ip6.v6only) == 1 ]; then \ ${ECHO} "tests only pass when net.inet6.ip6.v6only=0"; \ return 1; \ fi +# tests as of 5.0.0: fails to find Catch2, see https://github.com/Corvusoft/restbed/issues/556 + .include diff --git a/www/restbed/distinfo b/www/restbed/distinfo index e99a3a00ecc7..004d639b4dc1 100644 --- a/www/restbed/distinfo +++ b/www/restbed/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1629962270 -SHA256 (Corvusoft-restbed-4.8_GH0.tar.gz) = 4801833f86a67b8a123c2c01203e259eb81157e1e9ef144a3b6395cb2d838a42 -SIZE (Corvusoft-restbed-4.8_GH0.tar.gz) = 145738 +TIMESTAMP = 1775617142 +SHA256 (Corvusoft-restbed-5.0.0_GH0.tar.gz) = 1f4bec850b84080cb8259945dd73df365f2601f291521d0cb1542f3604244b3c +SIZE (Corvusoft-restbed-5.0.0_GH0.tar.gz) = 104501 SHA256 (Corvusoft-asio-dependency-a4d820d_GH0.tar.gz) = 044621ac9d15f65fb9ba4d0e5b61dd30d3dff2176df228ab49fbf0c6daa9ef3f SIZE (Corvusoft-asio-dependency-a4d820d_GH0.tar.gz) = 1536854 SHA256 (Corvusoft-catch-dependency-d10b9bd_GH0.tar.gz) = a84ddaf54a3e9a84fbcebd509d655da3beca822029675a788b31ae3b78656908 SIZE (Corvusoft-catch-dependency-d10b9bd_GH0.tar.gz) = 631559 diff --git a/www/restbed/files/patch-source_corvusoft_restbed_uri.cpp b/www/restbed/files/patch-source_corvusoft_restbed_uri.cpp deleted file mode 100644 index c4fa5a2cbc02..000000000000 --- a/www/restbed/files/patch-source_corvusoft_restbed_uri.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- source/corvusoft/restbed/uri.cpp.orig 2021-09-11 00:09:45 UTC -+++ source/corvusoft/restbed/uri.cpp -@@ -100,7 +100,7 @@ namespace restbed - - string Uri::decode( const string& value ) - { -- static const char hex_to_dec[256] = -+ static const signed char hex_to_dec[256] = - { - /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - /* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, diff --git a/www/restbed/pkg-plist b/www/restbed/pkg-plist index 51c32bef98d2..d3972758ea84 100644 --- a/www/restbed/pkg-plist +++ b/www/restbed/pkg-plist @@ -1,26 +1,20 @@ include/corvusoft/restbed/byte.hpp include/corvusoft/restbed/common.hpp -include/corvusoft/restbed/context_placeholder.hpp -include/corvusoft/restbed/context_placeholder_base.hpp -include/corvusoft/restbed/context_value.hpp -include/corvusoft/restbed/http.hpp include/corvusoft/restbed/logger.hpp include/corvusoft/restbed/request.hpp include/corvusoft/restbed/resource.hpp include/corvusoft/restbed/response.hpp -include/corvusoft/restbed/rule.hpp include/corvusoft/restbed/service.hpp include/corvusoft/restbed/session.hpp -include/corvusoft/restbed/session_manager.hpp include/corvusoft/restbed/settings.hpp include/corvusoft/restbed/ssl_settings.hpp include/corvusoft/restbed/status_code.hpp include/corvusoft/restbed/string.hpp include/corvusoft/restbed/uri.hpp include/corvusoft/restbed/web_socket.hpp include/corvusoft/restbed/web_socket_message.hpp include/restbed lib/librestbed.a lib/librestbed.so -lib/librestbed.so.4 -lib/librestbed.so.4.7 +lib/librestbed.so.5 +lib/librestbed.so.5.0