From nobody Sun Aug 25 08:05:04 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ws5vP72CLz5VY38; Sun, 25 Aug 2024 08:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ws5vN6NJrz4sMJ; Sun, 25 Aug 2024 08:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724573104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WCj+6BBKOEygStq0zE6NO+TMmR4ttXhr1T8fp6MOZo=; b=VJteWgc8kiIhkNIYsqO6Pwepg5TWfZhdxqy8fv54ySrLA2HAbhQBpO60pJVVkBzjGURhEh m4CWJa90K6tF6OY8MCvMlpVSL4eWtI/+C34BL26C8oQe3IfVgYejad3lQebVN3wlrpgAD2 A4PHH1T9ZaLDMGDEwd/qQScCGJc3Sy1TsF3sH5loveFmbQzNYa8V6B/mqJLFhjcif/nWoX wdnORTXqXyDZ5yby57CrZroboL49blc9mQeoQy9rpC3K+Q6lBfg9PQAsNwwMjUrlEMJhJG DzBAeLXtHf9voYW2mgjVoVMMF7Nj1ebM1n2mnWyK1LGx98qiMLaK5+dw9l4V8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724573104; a=rsa-sha256; cv=none; b=e3VcI/E658fbT99cT9cJRCQjrEEereCje4rcm5Z5b4KGqYt0O/Nq2Cs0+E2X/TnkuvjUFE 88vhBgqirGTb76yig7h95eoSgsH4O4QX2Rm5ufol4kSWEfPM7BS7dIDdded9ppFENoWlpj pgBual+C5XYUF1zDkT8g9byjWJ/Ad8zxD5aKWJ3lrsT2Z2LalpKd1/T/B/2rsqyywM/pU2 mj1JUMre6YTdVPolPV9pJpC6lW1TGOATILBhvopKFTNYulmLCgRA/zH/74Qs1zfUoDGLbX Poz5UrgaC4GoVh3zw29QOjBEgxsbsIjDBX16MXhHpJgYJvHRsV/5RqJTWJHUVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724573104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WCj+6BBKOEygStq0zE6NO+TMmR4ttXhr1T8fp6MOZo=; b=MY00uw/M+xsLAg3hV8a8UDPa853P7Y7siZ3UZsp9dTg0PD6KKm9yQKhZLTXHzA265NSXiL 1YuU0ylRd3SvQ3/xNBMMJxM1ZxJ2WspAZTIPtNHDvOItUG7ys3ysay3ArLv/iZoQ+V3xGO JMdf9DGVn+x1dY0JPdUhdrFnJf58h6l+QgCmiG/INx3LXpYfFUZbwF1NCQ/9LbYz+A2FS4 PwQILLhDywVuOd06bcpzRIo1kQDVPBBaHHIWc9xNE2a4k5qcc3pAp7TJ1PYhWKFByO/zp4 2A4UF82y7a+Zml/dXGsFXvVei+GCiK1XGqSBe7pIbfkN26xFJ9hhiF3NgFos6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ws5vN5yQ9zFXG; Sun, 25 Aug 2024 08:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47P854gw079614; Sun, 25 Aug 2024 08:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47P854mx079611; Sun, 25 Aug 2024 08:05:04 GMT (envelope-from git) Date: Sun, 25 Aug 2024 08:05:04 GMT Message-Id: <202408250805.47P854mx079611@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7f3db0b69d43 - main - www/restinio: update 0.6.18 =?utf-8?Q?=E2=86=92?= 0.7.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f3db0b69d43fe825c49c1c5c73cbfb9c2d42107 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f3db0b69d43fe825c49c1c5c73cbfb9c2d42107 commit 7f3db0b69d43fe825c49c1c5c73cbfb9c2d42107 Author: Yuri Victorovich AuthorDate: 2024-08-25 06:23:28 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-25 08:04:52 +0000 www/restinio: update 0.6.18 → 0.7.2 --- www/restinio/Makefile | 25 ++++++++++++++++++------- www/restinio/distinfo | 6 +++--- www/restinio/files/patch-CMakeLists.txt | 11 +++++++++++ www/restinio/pkg-plist | 23 ++++++++++------------- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/www/restinio/Makefile b/www/restinio/Makefile index 533fa37be08b..6ab637c9577f 100644 --- a/www/restinio/Makefile +++ b/www/restinio/Makefile @@ -1,25 +1,28 @@ PORTNAME= restinio -DISTVERSION= 0.6.18 +DISTVERSION= 0.7.2 CATEGORIES= www devel MASTER_SITES= https://github.com/Stiffstream/${PORTNAME}/releases/download/v.${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-full MAINTAINER= yuri@FreeBSD.org -COMMENT= Asynchronous HTTP/WebSocket server C++14 library +COMMENT= Asynchronous HTTP/WebSocket server C++17 library WWW= https://stiffstream.com/en/products/restinio.html LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE -BUILD_DEPENDS= libfmt>0:devel/libfmt \ +BUILD_DEPENDS= asio>0:net/asio \ + libfmt>0:devel/libfmt \ sobjectizer>0:devel/sobjectizer LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libhttp_parser.so:www/http-parser \ + libllhttp.so:www/llhttp \ libpcre2-8.so:devel/pcre2 RUN_DEPENDS= libfmt>0:devel/libfmt \ sobjectizer>0:devel/sobjectizer +TEST_DEPENDS= catch2>0:devel/catch2 -USES= cmake:testing compiler:c++14-lang localbase:ldflags tar:bz2 +USES= cmake:testing compiler:c++17-lang localbase:ldflags tar:bz2 EXTRACT_AFTER_ARGS= --exclude ${PORTNAME}-${DISTVERSION}/dev/asio \ --exclude ${PORTNAME}-${DISTVERSION}/dev/asio_mxxru \ @@ -37,9 +40,15 @@ EXTRACT_AFTER_ARGS= --exclude ${PORTNAME}-${DISTVERSION}/dev/asio \ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} WRKSRC_SUBDIR= dev -CMAKE_ARGS= -DRESTINIO_USE_BOOST_ASIO=shared -CMAKE_ON= RESTINIO_FIND_DEPS RESTINIO_USE_EXTERNAL_HTTP_PARSER RESTINIO_USE_EXTERNAL_SOBJECTIZER -CMAKE_OFF= RESTINIO_BENCH RESTINIO_INSTALL_BENCHES RESTINIO_TEST +CMAKE_ARGS= -DRESTINIO_USE_BOOST_ASIO=shared \ + -DRESTINIO_DEP_FMT=system \ + -DRESTINIO_DEP_SOBJECTIZER=find \ + -DRESTINIO_DEP_CATCH2=find \ + -DRESTINIO_DEP_LLHTTP=find +CMAKE_ON= RESTINIO_FIND_DEPS +CMAKE_OFF= RESTINIO_BENCH \ + RESTINIO_INSTALL_BENCHES \ + RESTINIO_TEST CMAKE_TESTING_ON= RESTINIO_TEST OPTIONS_DEFINE= SAMPLES @@ -52,4 +61,6 @@ SAMPLES_CMAKE_BOOL= RESTINIO_SAMPLE RESTINIO_INSTALL_SAMPLES SAMPLES_VARS_OFF= NO_ARCH=yes SAMPLES_BUILD_DEPENDS= json-dto>0:devel/json-dto +# many tests fail due to port being in use, see https://github.com/Stiffstream/restinio/issues/223 + .include diff --git a/www/restinio/distinfo b/www/restinio/distinfo index 47c5483993fa..bfd280430b58 100644 --- a/www/restinio/distinfo +++ b/www/restinio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690094464 -SHA256 (restinio-0.6.18-full.tar.bz2) = ca6b05b7ae65385bf652073c9b5749968047673fee2b05f1921ed57bd7601bcb -SIZE (restinio-0.6.18-full.tar.bz2) = 1697858 +TIMESTAMP = 1724552273 +SHA256 (restinio-0.7.2-full.tar.bz2) = cb55952210665e7dcc4ea07595dd05a94146b53067b611c36256058864f01d41 +SIZE (restinio-0.7.2-full.tar.bz2) = 1681391 diff --git a/www/restinio/files/patch-CMakeLists.txt b/www/restinio/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..47f942a05442 --- /dev/null +++ b/www/restinio/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2024-08-25 04:30:48 UTC ++++ CMakeLists.txt +@@ -209,7 +209,7 @@ if (RESTINIO_WITH_SOBJECTIZER) + elseif (RESTINIO_DEP_SOBJECTIZER STREQUAL "find") + find_package(sobjectizer CONFIG REQUIRED) + +- set(RESTINIO_SOBJECTIZER_LIB_LINK_NAME "sobjectizer::StaticLib") ++ set(RESTINIO_SOBJECTIZER_LIB_LINK_NAME "sobjectizer::SharedLib") + elseif (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + if (NOT RESTINIO_SOBJECTIZER_LIB_LINK_NAME) + message(FATAL_ERROR "The RESTINIO_SOBJECTIZER_LIB_LINK_NAME has to be " diff --git a/www/restinio/pkg-plist b/www/restinio/pkg-plist index ce7b85145498..67d24bffd2d4 100644 --- a/www/restinio/pkg-plist +++ b/www/restinio/pkg-plist @@ -1,5 +1,4 @@ -%%SAMPLES%%bin/dh2048.pem -%%SAMPLES%%bin/key.pem +%%SAMPLES%%bin/sample.async_chained_handlers %%SAMPLES%%bin/sample.async_handling_with_sobjectizer %%SAMPLES%%bin/sample.chained_handlers %%SAMPLES%%bin/sample.compression @@ -31,14 +30,13 @@ %%SAMPLES%%bin/sample.websocket %%SAMPLES%%bin/sample.websocket_detailed %%SAMPLES%%bin/sample.websocket_wss -%%SAMPLES%%bin/server.pem -%%SAMPLES%%bin/test_decompression.sh -%%SAMPLES%%bin/wss_dh2048.pem -%%SAMPLES%%bin/wss_key.pem -%%SAMPLES%%bin/wss_server.pem +include/nonstd/expected.hpp include/restinio/all.hpp include/restinio/asio_include.hpp include/restinio/asio_timer_manager.hpp +include/restinio/async_chain/common.hpp +include/restinio/async_chain/fixed_size.hpp +include/restinio/async_chain/growable_size.hpp include/restinio/buffers.hpp include/restinio/cast_to.hpp include/restinio/chunked_input_info.hpp @@ -46,7 +44,9 @@ include/restinio/common_types.hpp include/restinio/compiler_features.hpp include/restinio/connection_count_limiter.hpp include/restinio/connection_state_listener.hpp +include/restinio/core.hpp include/restinio/default_strands.hpp +include/restinio/detect_os.hpp include/restinio/exception.hpp include/restinio/expected.hpp include/restinio/helpers/easy_parser.hpp @@ -105,7 +105,6 @@ include/restinio/message_builders.hpp include/restinio/null_logger.hpp include/restinio/null_mutex.hpp include/restinio/null_timer_manager.hpp -include/restinio/optional.hpp include/restinio/os.hpp include/restinio/ostream_logger.hpp include/restinio/path2regex/path2regex.hpp @@ -129,10 +128,6 @@ include/restinio/string_view.hpp include/restinio/sync_chain/fixed_size.hpp include/restinio/sync_chain/growable_size.hpp include/restinio/tcp_connection_ctx_base.hpp -include/restinio/third_party/expected-lite/expected.hpp -include/restinio/third_party/optional-lite/optional.hpp -include/restinio/third_party/string-view-lite/string_view.hpp -include/restinio/third_party/variant-lite/variant.hpp include/restinio/timer_common.hpp include/restinio/tls.hpp include/restinio/tls_fwd.hpp @@ -154,7 +149,6 @@ include/restinio/utils/tagged_scalar.hpp include/restinio/utils/tuple_algorithms.hpp include/restinio/utils/utf8_checker.hpp include/restinio/value_or.hpp -include/restinio/variant.hpp include/restinio/version.hpp include/restinio/websocket/impl/utf8.hpp include/restinio/websocket/impl/ws_connection.hpp @@ -163,6 +157,9 @@ include/restinio/websocket/impl/ws_parser.hpp include/restinio/websocket/impl/ws_protocol_validator.hpp include/restinio/websocket/message.hpp include/restinio/websocket/websocket.hpp +lib/cmake/expected-lite/expected-lite-config-version.cmake +lib/cmake/expected-lite/expected-lite-config.cmake +lib/cmake/expected-lite/expected-lite-targets.cmake lib/cmake/restinio/restinio-config-version.cmake lib/cmake/restinio/restinio-config.cmake lib/cmake/restinio/restinio-targets.cmake