From nobody Sun Oct 08 09:41:04 2023 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 4S3HGn18pSz4w35p; Sun, 8 Oct 2023 09:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S3HGn0l3Qz3R5V; Sun, 8 Oct 2023 09:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696758065; 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=l+AC6tYNNMgZC3DrfKYwddTNBfaOY6bqNoXXjG2KMcY=; b=bFpwvRPxxBDZrZLaMLvmvYcXM1yUN4/sesyISuJtv1ci2DZcQg34BqgPCMBUfHCrAdCpoN 7+7wuOQC99NUcV5ou3WokJ5F2TJuWsP3whD+i4xaEcs1vlZElRxUK9Weq6eRLpj2qVKpE1 ZRaDFUEstySaxtYs3+iw0wKlLvOncC2i3yyn3CqJP34w73S8AZJinFY6oJ7/ZK0HoTFHYu Lq/IT3qzER2B7VC+C7Zd0dXU2s1O+A0Rld37yCf6BOMgmDFjR73BTyhkFaTgjmAPPOmUT+ 0gbBHKq0zY3QkyZI1ExTu0jY5uUopwERgCbGyM4jHJzeE1llVIY3SoUh2wKAHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696758065; a=rsa-sha256; cv=none; b=AxBNi9ldmGLAgzuAAc0qCAMwOhG3VxfX1rbbX/fDv4OuntOtW9XbP75mKJeyUmMpvfyArM otYJAIO32Y2NMARx9mpb1ftq00KUTBaDcKIeVTVO+c1ATmUfcx+vkuK5z18XNnwt0rX7BK W7KQk3aPyKRzjtS0imM5mNgMlP1WOWIhS+bwZThAYLEH3dpg6w/Ux82FzfGWvCBv+VJR9p PUbKpq5/3lSQZXgRHKAwjBQIteboGawP/BiwrUWQPdwsMXdE09Ub+UsE8dkVCF2iFs7cn7 upzayqsFMyclkBZkLZDVu3pR8NjnsFk2nXkOTyApTYH2KMqamo2u/IAYV3bGFQ== 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=1696758065; 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=l+AC6tYNNMgZC3DrfKYwddTNBfaOY6bqNoXXjG2KMcY=; b=STcEpNId/zaYvO58hwv3zIURDIHhhue2BeHe5VzrSDmbQkVtpBaXZO3O1TkYFkS0JlHhqU XtNX7Qldl5478G+sbegC1aqB1ZWW52uRjA0PqEZARkoDZaP7+aY5q/IRsEeyPp80WkjOsu Ryh8Y33pQktRMjMxT0kzTDsi5dT++frPlqfq1UNIFDBu2t8WTSfgh5aw8y9jvBBa1+QaTN leEm2ImnqVTa10GutLtc19rHno8A5nK8+md2ks52qBUtAjYQ4ggC0W+3IUPFd6mB/nVSrv pc0eDMLY20Q8uqh3fyyvyDyV01J+zDEo4tJ5/MT8hLilWI5ui76GVfBnoqkE+g== 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 4S3HGm6y64z17Xq; Sun, 8 Oct 2023 09:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3989f4IA012115; Sun, 8 Oct 2023 09:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3989f4BM012112; Sun, 8 Oct 2023 09:41:04 GMT (envelope-from git) Date: Sun, 8 Oct 2023 09:41:04 GMT Message-Id: <202310080941.3989f4BM012112@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 4cabb777e1f9 - main - net/arataga: Fix compatibility with fmt 10+ 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cabb777e1f92057f56bfecbda8b44318f18abde Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cabb777e1f92057f56bfecbda8b44318f18abde commit 4cabb777e1f92057f56bfecbda8b44318f18abde Author: Daniel Engberg AuthorDate: 2023-10-08 09:14:56 +0000 Commit: Daniel Engberg CommitDate: 2023-10-08 09:40:40 +0000 net/arataga: Fix compatibility with fmt 10+ Partially backport upstream commit 62f65e0842985750697476cc59b830205b7b4826 to fix build with fmt 10+ Reference: https://github.com/Stiffstream/arataga/commit/62f65e0842985750697476cc59b830205b7b4826.patch PR: 273878 Approved by: portmgr (maintainer timeout, 3+ weeks) Sponsored by: Blinkinblox --- net/arataga/Makefile | 2 +- ...git-01-62f65e0842985750697476cc59b830205b7b4826 | 120 +++++++++++++++++++++ 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/net/arataga/Makefile b/net/arataga/Makefile index 6e1b8cf84e88..c91a360ef3fa 100644 --- a/net/arataga/Makefile +++ b/net/arataga/Makefile @@ -1,7 +1,7 @@ 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 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 ++{}; ++ +