From nobody Thu Jun 15 12:35:30 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 4Qhhb72yjNz4dg8N; Thu, 15 Jun 2023 12:35:31 +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 4Qhhb71ZV5z4G3x; Thu, 15 Jun 2023 12:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686832531; 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=sToMSBUT4hz5i4NnRxr6v8xM6ps7ZzHFXA777w+69B0=; b=yZuxLbNPNr2G7K3wA3L2J2ZM7/Thy1RLg7YK7mR5JZM0jtJNLvUN7eqhEoptnbiWJpSfmp c43Lzce68Ms1J12N9xWkg8cz9iY6MKNTcAcvscwAhjUfrLlX5Tqa2soWc/xx5UrLp2VirP 9T4+7qt/xSHuEB63TvVUeBsPUG2LTPjDnX0LulGqA1wj5W4w5Dbt5X+sSjFeTSVbquSX21 BRGSCUZ44Y7yl/K5+Ue69JmmMTBaxQ6Lraakf4qOK1HfQVSMIUw09nPd/Hr5TzdsVhRy+c 3FDmhg5F89auEaflTcMCVAMiSk0g9ZOa900qp4mzDiDJglpLJRN9IdLc5O9THg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686832531; 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=sToMSBUT4hz5i4NnRxr6v8xM6ps7ZzHFXA777w+69B0=; b=Lgno2QHGApDcCUoEOVKIiEc7+0rXcPmOm3e6ThjE24/PEZgFJ9pvoCPJElnDl6SrNSKJGy 2UDrmGeeMWgK6f1Z4E/OdVTjwH8rZWkby7dmTRHlmYEjW0UYB54q2l++dd9UqPdSyOBrZH HaCf/4yxT/rLYuVVtOyaKWYsfDr/LKEdqs4ZLazjkrzEGltB1xlE9dCksdpqievLlhUjjE X427EhOGBi/JXVFLFVFGrdrG0IbMTC/t3Is/4o6kUe3V2XAFt4GqS26+Ik7/GgJJ6qzArM Z0Y36ED0m9CjfqdTskxnpo+sSODZmm5OKseDTlRj9oSSscmlmJVRyI6/p3Hhtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686832531; a=rsa-sha256; cv=none; b=Ip9LDBdCQBBcqzJ22b45zmkLYqC7591QFogIyC1tp+JbnIJ9ALwKn3VS/raANE4kBCocSm qncaLLjcoUNXQxRTGiDc7jycNJttthxjlYbiQK4Yh2EnWXZC539sHAmoCfAsAHAJDB2oi9 SdjiRzcuRAnIMG3DDh7//bAUc3kruxbXtud97XIoe9jZ/8ez4poPlZyBv7vh6GDaLX2OCf QfbNtW7810U15tdr+SjfAkMoJRDPplEzN3zRkFDlIJgseUdA7p4qRaejtQIsvu2wDpP7WL L91uXcXQdO570athRBSN9E9hF4JJ2xDDUc7UVWp4UWJiCRxc674VQ2kquOpZUQ== 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 4Qhhb70fNxzmCh; Thu, 15 Jun 2023 12:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35FCZUQr089039; Thu, 15 Jun 2023 12:35:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35FCZU9d089038; Thu, 15 Jun 2023 12:35:30 GMT (envelope-from git) Date: Thu, 15 Jun 2023 12:35:30 GMT Message-Id: <202306151235.35FCZU9d089038@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 37e74360ea9d - main - www/envoy: add five more soon to-be-needed patches 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37e74360ea9d0514baaf4df008077e4bacc5a04e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=37e74360ea9d0514baaf4df008077e4bacc5a04e commit 37e74360ea9d0514baaf4df008077e4bacc5a04e Author: Alexey Dokuchaev AuthorDate: 2023-06-15 12:34:46 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-06-15 12:34:46 +0000 www/envoy: add five more soon to-be-needed patches Replace more of those REGISTER_FACTORY macros which our default compiler does not seem to digest with LEGACY_REGISTER_FACTORY. --- ...ce_extensions_filters_listener_http__inspector_config.cc | 13 +++++++++++++ ...urce_extensions_filters_listener_original__dst_config.cc | 12 ++++++++++++ ...listener_original__src_original__src__config__factory.cc | 12 ++++++++++++ ...ce_extensions_filters_listener_proxy__protocol_config.cc | 13 +++++++++++++ ...rce_extensions_filters_listener_tls__inspector_config.cc | 13 +++++++++++++ 5 files changed, 63 insertions(+) diff --git a/www/envoy/files/patch-source_extensions_filters_listener_http__inspector_config.cc b/www/envoy/files/patch-source_extensions_filters_listener_http__inspector_config.cc new file mode 100644 index 000000000000..72a1687ceb40 --- /dev/null +++ b/www/envoy/files/patch-source_extensions_filters_listener_http__inspector_config.cc @@ -0,0 +1,13 @@ +--- source/extensions/filters/listener/http_inspector/config.cc.orig 2023-04-27 12:00:08 UTC ++++ source/extensions/filters/listener/http_inspector/config.cc +@@ -38,9 +38,7 @@ class HttpInspectorConfigFactory : public Server::Conf + /** + * Static registration for the http inspector filter. @see RegisterFactory. + */ +-REGISTER_FACTORY(HttpInspectorConfigFactory, +- Server::Configuration::NamedListenerFilterConfigFactory){ +- "envoy.listener.http_inspector"}; ++LEGACY_REGISTER_FACTORY(HttpInspectorConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.http_inspector"); + + } // namespace HttpInspector + } // namespace ListenerFilters diff --git a/www/envoy/files/patch-source_extensions_filters_listener_original__dst_config.cc b/www/envoy/files/patch-source_extensions_filters_listener_original__dst_config.cc new file mode 100644 index 000000000000..a4ad14e2db17 --- /dev/null +++ b/www/envoy/files/patch-source_extensions_filters_listener_original__dst_config.cc @@ -0,0 +1,12 @@ +--- source/extensions/filters/listener/original_dst/config.cc.orig 2023-04-27 12:00:08 UTC ++++ source/extensions/filters/listener/original_dst/config.cc +@@ -56,8 +56,7 @@ class OriginalDstConfigFactory : public Server::Config + /** + * Static registration for the original dst filter. @see RegisterFactory. + */ +-REGISTER_FACTORY(OriginalDstConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory){ +- "envoy.listener.original_dst"}; ++LEGACY_REGISTER_FACTORY(OriginalDstConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.original_dst"); + + } // namespace OriginalDst + } // namespace ListenerFilters diff --git a/www/envoy/files/patch-source_extensions_filters_listener_original__src_original__src__config__factory.cc b/www/envoy/files/patch-source_extensions_filters_listener_original__src_original__src__config__factory.cc new file mode 100644 index 000000000000..1b422a1de043 --- /dev/null +++ b/www/envoy/files/patch-source_extensions_filters_listener_original__src_original__src__config__factory.cc @@ -0,0 +1,12 @@ +--- source/extensions/filters/listener/original_src/original_src_config_factory.cc.orig 2023-04-27 12:00:08 UTC ++++ source/extensions/filters/listener/original_src/original_src_config_factory.cc +@@ -32,8 +32,7 @@ ProtobufTypes::MessagePtr OriginalSrcConfigFactory::cr + /** + * Static registration for the original_src filter. @see RegisterFactory. + */ +-REGISTER_FACTORY(OriginalSrcConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory){ +- "envoy.listener.original_src"}; ++LEGACY_REGISTER_FACTORY(OriginalSrcConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.original_src"); + + } // namespace OriginalSrc + } // namespace ListenerFilters diff --git a/www/envoy/files/patch-source_extensions_filters_listener_proxy__protocol_config.cc b/www/envoy/files/patch-source_extensions_filters_listener_proxy__protocol_config.cc new file mode 100644 index 000000000000..cb2fc8dee2b5 --- /dev/null +++ b/www/envoy/files/patch-source_extensions_filters_listener_proxy__protocol_config.cc @@ -0,0 +1,13 @@ +--- source/extensions/filters/listener/proxy_protocol/config.cc.orig 2023-04-27 12:00:08 UTC ++++ source/extensions/filters/listener/proxy_protocol/config.cc +@@ -46,9 +46,7 @@ class ProxyProtocolConfigFactory : public Server::Conf + /** + * Static registration for the proxy protocol filter. @see RegisterFactory. + */ +-REGISTER_FACTORY(ProxyProtocolConfigFactory, +- Server::Configuration::NamedListenerFilterConfigFactory){ +- "envoy.listener.proxy_protocol"}; ++LEGACY_REGISTER_FACTORY(ProxyProtocolConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.proxy_protocol"); + + } // namespace ProxyProtocol + } // namespace ListenerFilters diff --git a/www/envoy/files/patch-source_extensions_filters_listener_tls__inspector_config.cc b/www/envoy/files/patch-source_extensions_filters_listener_tls__inspector_config.cc new file mode 100644 index 000000000000..5969a5545104 --- /dev/null +++ b/www/envoy/files/patch-source_extensions_filters_listener_tls__inspector_config.cc @@ -0,0 +1,13 @@ +--- source/extensions/filters/listener/tls_inspector/config.cc.orig 2023-04-27 12:00:08 UTC ++++ source/extensions/filters/listener/tls_inspector/config.cc +@@ -46,9 +46,7 @@ class TlsInspectorConfigFactory : public Server::Confi + /** + * Static registration for the TLS inspector filter. @see RegisterFactory. + */ +-REGISTER_FACTORY(TlsInspectorConfigFactory, +- Server::Configuration::NamedListenerFilterConfigFactory){ +- "envoy.listener.tls_inspector"}; ++LEGACY_REGISTER_FACTORY(TlsInspectorConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.tls_inspector"); + + } // namespace TlsInspector + } // namespace ListenerFilters