diff --git a/net/arataga/Makefile b/net/arataga/Makefile index 6e1b8cf84e88..c91a360ef3fa 100644 --- a/net/arataga/Makefile +++ b/net/arataga/Makefile @@ -1,60 +1,60 @@ PORTNAME= arataga PORTVERSION= 0.5.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SF/sobjectizer/oess/oess-2:oess DISTFILES= oess-2.2.3-full.tar.bz2:oess MAINTAINER= danfe@FreeBSD.org COMMENT= Performant SOCKS5/HTTP1.1 proxy server WWW= https://github.com/Stiffstream/arataga LICENSE= AGPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog \ ${LOCALBASE}/include/asio/ip/address.hpp:net/asio \ ${LOCALBASE}/include/args.hxx:devel/args LIB_DEPENDS= libso.${_SO5_LIBVER}.so:devel/sobjectizer \ libfmt.so:devel/libfmt \ libhttp_parser.so:www/http-parser TEST_DEPENDS= ${LOCALBASE}/include/doctest/doctest.h:devel/doctest USES= compiler:c++17-lang gmake MAKEFILE= ${FILESDIR}/makefile MAKE_ENV= SO5_LIBVER=${_SO5_LIBVER} WRKSRC_SUBDIR= ${PORTNAME} TEST_TARGET= run_unit_tests TEST_WRKSRC= ${WRKSRC}/../tests USE_GITHUB= yes GH_ACCOUNT= Stiffstream GH_PROJECT= noexcept-ctcheck:nectc restinio:rinio so5extra:so5e GH_TAGNAME= v.1.0.0:nectc v.0.6.16:rinio v.1.5.2:so5e _SO5_LIBVER= 5.7.4.2 PLIST_FILES= bin/${PORTNAME} PORTDOCS= *.md OPTIONS_DEFINE= DOCS post-extract: @${LN} -s ../../noexcept-ctcheck-v.1.0.0/noexcept_ctcheck \ ../../restinio-v.0.6.16/dev/restinio \ ../../so5extra-v.1.5.2/dev/so_5_extra \ ../../oess-2.2.3/dev/cpp_util_2 \ ../../oess-2.2.3/dev/oess_2 ${WRKSRC} post-patch: @${REINPLACE_CMD} -e '/^#include diff --git a/net/arataga/files/patch-git-01-62f65e0842985750697476cc59b830205b7b4826 b/net/arataga/files/patch-git-01-62f65e0842985750697476cc59b830205b7b4826 new file mode 100644 index 000000000000..425851528633 --- /dev/null +++ b/net/arataga/files/patch-git-01-62f65e0842985750697476cc59b830205b7b4826 @@ -0,0 +1,120 @@ +From 62f65e0842985750697476cc59b830205b7b4826 Mon Sep 17 00:00:00 2001 +From: Yauheni Akhotnikau +Date: Mon, 14 Aug 2023 14:28:29 +0300 +Subject: [PATCH] Update for dependencies. + +SObjectizer -> 5.8.0.1 +fmtlib -> 10.1.0 +spdlog -> 1.12.0 + +A new header file utils/string_literal_fmt.hpp with formatter for +fmtlib. +--- + arataga/acl_handler/a_handler.cpp | 1 + + arataga/acl_handler/handlers/data_transfer.cpp | 1 + + .../handlers/http/authentification_handler.cpp | 1 + + .../handlers/http/ordinary_method_handler.cpp | 1 + + arataga/acl_handler/handlers/socks5.cpp | 1 + + .../interactor/a_nameserver_interactor.cpp | 2 ++ + arataga/utils/string_literal_fmt.hpp | 17 +++++++++++++++++ + externals.rb | 6 +++--- + 8 files changed, 27 insertions(+), 3 deletions(-) + create mode 100644 arataga/utils/string_literal_fmt.hpp + +diff --git a/arataga/acl_handler/a_handler.cpp b/arataga/acl_handler/a_handler.cpp +index 35656ae..9ca791b 100644 +--- acl_handler/a_handler.cpp ++++ acl_handler/a_handler.cpp +@@ -10,6 +10,7 @@ + #include + + #include ++#include + + #include + +diff --git a/arataga/acl_handler/handlers/data_transfer.cpp b/arataga/acl_handler/handlers/data_transfer.cpp +index 1eb0950..57c1d63 100644 +--- acl_handler/handlers/data_transfer.cpp ++++ acl_handler/handlers/data_transfer.cpp +@@ -8,6 +8,7 @@ + #include + + #include ++#include + + #include + +diff --git a/arataga/acl_handler/handlers/http/authentification_handler.cpp b/arataga/acl_handler/handlers/http/authentification_handler.cpp +index dad8334..120f201 100644 +--- acl_handler/handlers/http/authentification_handler.cpp ++++ acl_handler/handlers/http/authentification_handler.cpp +@@ -9,6 +9,7 @@ + #include + + #include ++#include + + #include + #include +diff --git a/arataga/acl_handler/handlers/http/ordinary_method_handler.cpp b/arataga/acl_handler/handlers/http/ordinary_method_handler.cpp +index 0048167..dddbf14 100644 +--- acl_handler/handlers/http/ordinary_method_handler.cpp ++++ acl_handler/handlers/http/ordinary_method_handler.cpp +@@ -12,6 +12,7 @@ + #include + + #include ++#include + + #include + +diff --git a/arataga/acl_handler/handlers/socks5.cpp b/arataga/acl_handler/handlers/socks5.cpp +index 45236a5..a3bf424 100644 +--- acl_handler/handlers/socks5.cpp ++++ acl_handler/handlers/socks5.cpp +@@ -8,6 +8,7 @@ + #include + + #include ++#include + + #include + +diff --git a/arataga/dns_resolver/interactor/a_nameserver_interactor.cpp b/arataga/dns_resolver/interactor/a_nameserver_interactor.cpp +index b1b19f8..b020c38 100644 +--- dns_resolver/interactor/a_nameserver_interactor.cpp ++++ dns_resolver/interactor/a_nameserver_interactor.cpp +@@ -7,6 +7,8 @@ + + #include + ++#include ++ + #include + + #include +diff --git a/arataga/utils/string_literal_fmt.hpp b/arataga/utils/string_literal_fmt.hpp +new file mode 100644 +index 0000000..5d67e1e +--- /dev/null ++++ utils/string_literal_fmt.hpp +@@ -0,0 +1,17 @@ ++/*! ++ * @file ++ * @brief Helper for formatting/printing of string_literal via fmtlib. ++ * @since v.0.3.0.1 ++ */ ++ ++#pragma once ++ ++#include ++ ++#include ++ ++template<> ++struct fmt::formatter< arataga::utils::string_literal_t > ++ : public fmt::ostream_formatter ++{}; ++ +