git: 37e74360ea9d - main - www/envoy: add five more soon to-be-needed patches

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Thu, 15 Jun 2023 12:35:30 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=37e74360ea9d0514baaf4df008077e4bacc5a04e

commit 37e74360ea9d0514baaf4df008077e4bacc5a04e
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-06-15 12:34:46 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
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