www/envoy: do not use pinned version 1.49.2 of gRPC vs `devel/grpc' port

While here, split v2/v3 API .proto files similarly to what upstream does.

4 files changed, 82 insertions, 116 deletions

diff --git a/www/envoy/Makefile b/www/envoy/Makefile
index 8b70454201e4..3c290d63dceb 100644
--- a/www/envoy/Makefile
+++ b/www/envoy/Makefile
@@ -15,7 +15,8 @@ BROKEN_i386=	makes a lot of 64-bit assumptions (patches welcome)
 BROKEN_SSL=	base openssl libressl libressl-devel
 BROKEN_SSL_REASON=	requires BoringSSL
 
-BUILD_DEPENDS=	${NONEXISTENT}:devel/protobuf:patch \
+BUILD_DEPENDS=	${NONEXISTENT}:devel/grpc:patch \
+		${NONEXISTENT}:devel/protobuf:patch \
 		${LOCALBASE}/include/flatbuffers/reflection.h:devel/flatbuffers \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \
 		${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog \
@@ -38,16 +39,16 @@ CPE_VENDOR=	${PORTNAME}proxy
 SHEBANG_FILES=	examples/*/verify.sh examples/grpc-bridge/client/client.py \
 		examples/shared/postgres/docker-healthcheck.sh
 USE_GITHUB=	yes
-
 GH_ACCOUNT=	${PORTNAME}proxy bufbuild:pgv cncf:xds googleapis:gapis \
 		census-instrumentation:ocp prometheus:pcm google:quiche \
-		open-telemetry:otp google:cel grpc:grpc
+		open-telemetry:otp google:cel
 GH_PROJECT=	protoc-gen-validate:pgv xds:xds googleapis:gapis \
 		opencensus-proto:ocp client_model:pcm quiche:quiche \
-		opentelemetry-proto:otp cel-cpp:cel grpc:grpc
+		opentelemetry-proto:otp cel-cpp:cel
 GH_TAGNAME=	v0.10.1:pgv 46e39c7:xds 114a745:gapis v0.4.1:ocp 147c58e:pcm \
-		37de4f7:quiche v0.19.0:otp 11f9d66:cel v1.49.2:grpc
+		37de4f7:quiche v0.19.0:otp 11f9d66:cel
 
+_GRPC_WRKSRC=		${MAKE} -C ${PORTSDIR}/devel/grpc -V WRKSRC
 _PROTOBUF_WRKSRC=	${MAKE} -C ${PORTSDIR}/devel/protobuf -V WRKSRC
 
 PLIST_FILES=	bin/envoy
@@ -59,12 +60,11 @@ post-extract:
 	${LN} -s \
 		 ../../client_model-147c58e/io \
 		 ../../googleapis-114a745/google \
-		 ../../grpc-1.49.2/src \
 		 ../../opencensus-proto-0.4.1/src/opencensus \
 		 ../../opentelemetry-proto-0.19.0/opentelemetry \
 		 ../../protoc-gen-validate-0.10.1/validate \
-		 ../../xds-46e39c7/udpa \
-		 ../../xds-46e39c7/xds ${WRKSRC}/api
+		 ../../xds-46e39c7/udpa ../../xds-46e39c7/xds \
+		 ${_GRPC_WRKSRC:sh}/src ${WRKSRC}/api
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,__APPLE__,__${OPSYS}__,' \
diff --git a/www/envoy/distinfo b/www/envoy/distinfo
index c8544ddfa3ac..fd1c6e912885 100644
--- a/www/envoy/distinfo
+++ b/www/envoy/distinfo
@@ -19,5 +19,3 @@ SHA256 (open-telemetry-opentelemetry-proto-v0.19.0_GH0.tar.gz) = 464bc2b348e674a
 SIZE (open-telemetry-opentelemetry-proto-v0.19.0_GH0.tar.gz) = 26558
 SHA256 (google-cel-cpp-11f9d66_GH0.tar.gz) = 1968c7a34d3e1fd64f7309c81191f9d74a509e16cc8f91b3e986ca7309aeac40
 SIZE (google-cel-cpp-11f9d66_GH0.tar.gz) = 441644
-SHA256 (grpc-grpc-v1.49.2_GH0.tar.gz) = cdeb805385fba23242bf87073e68d590c446751e09089f26e5e0b3f655b0f089
-SIZE (grpc-grpc-v1.49.2_GH0.tar.gz) = 8357385
diff --git a/www/envoy/files/makefile-genproto b/www/envoy/files/makefile-genproto
index 6fb7f6894d43..aa3dad630e7b 100644
--- a/www/envoy/files/makefile-genproto
+++ b/www/envoy/files/makefile-genproto
@@ -1,7 +1,7 @@
 PROTOC_FLAGS=	$(addprefix -I,$(VPATH))
 VPATH=	api ../quiche-37de4f7
 
-API_PB_HEADERS=	\
+API_V2_PB_HEADERS=\
 	envoy/admin/v2alpha/certs.pb.h \
 	envoy/admin/v2alpha/clusters.pb.h \
 	envoy/admin/v2alpha/config_dump.pb.h \
@@ -9,16 +9,6 @@ API_PB_HEADERS=	\
 	envoy/admin/v2alpha/metrics.pb.h \
 	envoy/admin/v2alpha/mutex_stats.pb.h \
 	envoy/admin/v2alpha/server_info.pb.h \
-	envoy/admin/v3/certs.pb.h \
-	envoy/admin/v3/clusters.pb.h \
-	envoy/admin/v3/config_dump.pb.h \
-	envoy/admin/v3/config_dump_shared.pb.h \
-	envoy/admin/v3/init_dump.pb.h \
-	envoy/admin/v3/listeners.pb.h \
-	envoy/admin/v3/memory.pb.h \
-	envoy/admin/v3/metrics.pb.h \
-	envoy/admin/v3/mutex_stats.pb.h \
-	envoy/admin/v3/server_info.pb.h \
 	envoy/annotations/deprecation.pb.h \
 	envoy/annotations/resource.pb.h \
 	envoy/api/v2/auth/cert.pb.h \
@@ -59,8 +49,71 @@ API_PB_HEADERS=	\
 	envoy/api/v2/scoped_route.pb.h \
 	envoy/config/accesslog/v2/als.pb.h \
 	envoy/config/accesslog/v2/file.pb.h \
-	envoy/config/accesslog/v3/accesslog.pb.h \
 	envoy/config/bootstrap/v2/bootstrap.pb.h \
+	envoy/config/filter/accesslog/v2/accesslog.pb.h \
+	envoy/config/filter/fault/v2/fault.pb.h \
+	envoy/config/filter/http/buffer/v2/buffer.pb.h \
+	envoy/config/filter/http/fault/v2/fault.pb.h \
+	envoy/config/filter/http/health_check/v2/health_check.pb.h \
+	envoy/config/filter/http/lua/v2/lua.pb.h \
+	envoy/config/filter/http/rate_limit/v2/rate_limit.pb.h \
+	envoy/config/filter/http/router/v2/router.pb.h \
+	envoy/config/filter/http/squash/v2/squash.pb.h \
+	envoy/config/filter/http/transcoder/v2/transcoder.pb.h \
+	envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.h \
+	envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h \
+	envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.h \
+	envoy/config/filter/network/rate_limit/v2/rate_limit.pb.h \
+	envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h \
+	envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h \
+	envoy/config/listener/v2/api_listener.pb.h \
+	envoy/config/metrics/v2/metrics_service.pb.h \
+	envoy/config/metrics/v2/stats.pb.h \
+	envoy/config/overload/v2alpha/overload.pb.h \
+	envoy/config/ratelimit/v2/rls.pb.h \
+	envoy/config/trace/v2/datadog.pb.h \
+	envoy/config/trace/v2/dynamic_ot.pb.h \
+	envoy/config/trace/v2/http_tracer.pb.h \
+	envoy/config/trace/v2/lightstep.pb.h \
+	envoy/config/trace/v2/opencensus.pb.h \
+	envoy/config/trace/v2/service.pb.h \
+	envoy/config/trace/v2/trace.pb.h \
+	envoy/config/trace/v2/zipkin.pb.h \
+	envoy/data/accesslog/v2/accesslog.pb.h \
+	envoy/data/cluster/v2alpha/outlier_detection_event.pb.h \
+	envoy/data/core/v2alpha/health_check_event.pb.h \
+	envoy/service/accesslog/v2/als.pb.h \
+	envoy/service/discovery/v2/ads.pb.h \
+	envoy/service/discovery/v2/hds.pb.h \
+	envoy/service/discovery/v2/sds.pb.h \
+	envoy/service/load_stats/v2/lrs.pb.h \
+	envoy/service/metrics/v2/metrics_service.pb.h \
+	envoy/service/ratelimit/v2/rls.pb.h \
+	envoy/type/hash_policy.pb.h \
+	envoy/type/http.pb.h \
+	envoy/type/matcher/metadata.pb.h \
+	envoy/type/matcher/number.pb.h \
+	envoy/type/matcher/regex.pb.h \
+	envoy/type/matcher/string.pb.h \
+	envoy/type/matcher/value.pb.h \
+	envoy/type/metadata/v2/metadata.pb.h \
+	envoy/type/percent.pb.h \
+	envoy/type/range.pb.h \
+	envoy/type/semantic_version.pb.h \
+	envoy/type/tracing/v2/custom_tag.pb.h
+
+API_V3_PB_HEADERS=\
+	envoy/admin/v3/certs.pb.h \
+	envoy/admin/v3/clusters.pb.h \
+	envoy/admin/v3/config_dump.pb.h \
+	envoy/admin/v3/config_dump_shared.pb.h \
+	envoy/admin/v3/init_dump.pb.h \
+	envoy/admin/v3/listeners.pb.h \
+	envoy/admin/v3/memory.pb.h \
+	envoy/admin/v3/metrics.pb.h \
+	envoy/admin/v3/mutex_stats.pb.h \
+	envoy/admin/v3/server_info.pb.h \
+	envoy/config/accesslog/v3/accesslog.pb.h \
 	envoy/config/bootstrap/v3/bootstrap.pb.h \
 	envoy/config/cluster/v3/circuit_breaker.pb.h \
 	envoy/config/cluster/v3/cluster.pb.h \
@@ -87,53 +140,21 @@ API_PB_HEADERS=	\
 	envoy/config/endpoint/v3/endpoint.pb.h \
 	envoy/config/endpoint/v3/endpoint_components.pb.h \
 	envoy/config/endpoint/v3/load_report.pb.h \
-	envoy/config/filter/accesslog/v2/accesslog.pb.h \
-	envoy/config/filter/fault/v2/fault.pb.h \
-	envoy/config/filter/http/buffer/v2/buffer.pb.h \
-	envoy/config/filter/http/fault/v2/fault.pb.h \
-	envoy/config/filter/http/health_check/v2/health_check.pb.h \
-	envoy/config/filter/http/lua/v2/lua.pb.h \
-	envoy/config/filter/http/rate_limit/v2/rate_limit.pb.h \
-	envoy/config/filter/http/router/v2/router.pb.h \
-	envoy/config/filter/http/squash/v2/squash.pb.h \
-	envoy/config/filter/http/transcoder/v2/transcoder.pb.h \
-	envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.h \
-	envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h \
-	envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.h \
-	envoy/config/filter/network/rate_limit/v2/rate_limit.pb.h \
-	envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.h \
-	envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h \
-	envoy/config/listener/v2/api_listener.pb.h \
 	envoy/config/listener/v3/api_listener.pb.h \
 	envoy/config/listener/v3/listener.pb.h \
 	envoy/config/listener/v3/listener_components.pb.h \
 	envoy/config/listener/v3/quic_config.pb.h \
 	envoy/config/listener/v3/udp_listener_config.pb.h \
-	envoy/config/metrics/v2/metrics_service.pb.h \
-	envoy/config/metrics/v2/stats.pb.h \
 	envoy/config/metrics/v3/metrics_service.pb.h \
 	envoy/config/metrics/v3/stats.pb.h \
-	envoy/config/overload/v2alpha/overload.pb.h \
 	envoy/config/overload/v3/overload.pb.h \
-	envoy/config/ratelimit/v2/rls.pb.h \
 	envoy/config/rbac/v3/rbac.pb.h \
 	envoy/config/route/v3/route.pb.h \
 	envoy/config/route/v3/route_components.pb.h \
 	envoy/config/route/v3/scoped_route.pb.h \
-	envoy/config/trace/v2/datadog.pb.h \
-	envoy/config/trace/v2/dynamic_ot.pb.h \
-	envoy/config/trace/v2/http_tracer.pb.h \
-	envoy/config/trace/v2/lightstep.pb.h \
-	envoy/config/trace/v2/opencensus.pb.h \
-	envoy/config/trace/v2/service.pb.h \
-	envoy/config/trace/v2/trace.pb.h \
-	envoy/config/trace/v2/zipkin.pb.h \
 	envoy/config/trace/v3/http_tracer.pb.h \
-	envoy/data/accesslog/v2/accesslog.pb.h \
 	envoy/data/accesslog/v3/accesslog.pb.h \
-	envoy/data/cluster/v2alpha/outlier_detection_event.pb.h \
 	envoy/data/cluster/v3/outlier_detection_event.pb.h \
-	envoy/data/core/v2alpha/health_check_event.pb.h \
 	envoy/data/core/v3/health_check_event.pb.h \
 	envoy/data/dns/v3/dns_table.pb.h \
 	envoy/extensions/access_loggers/file/v3/file.pb.h \
@@ -179,12 +200,8 @@ API_PB_HEADERS=	\
 	envoy/extensions/udp_packet_writer/v3/udp_default_writer_factory.pb.h \
 	envoy/extensions/upstreams/http/v3/http_protocol_options.pb.h \
 	envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.h \
-	envoy/service/accesslog/v2/als.pb.h \
 	envoy/service/accesslog/v3/als.pb.h \
 	envoy/service/cluster/v3/cds.pb.h \
-	envoy/service/discovery/v2/ads.pb.h \
-	envoy/service/discovery/v2/hds.pb.h \
-	envoy/service/discovery/v2/sds.pb.h \
 	envoy/service/discovery/v3/ads.pb.h \
 	envoy/service/discovery/v3/discovery.pb.h \
 	envoy/service/endpoint/v3/eds.pb.h \
@@ -192,23 +209,14 @@ API_PB_HEADERS=	\
 	envoy/service/extension/v3/config_discovery.pb.h \
 	envoy/service/health/v3/hds.pb.h \
 	envoy/service/listener/v3/lds.pb.h \
-	envoy/service/load_stats/v2/lrs.pb.h \
 	envoy/service/load_stats/v3/lrs.pb.h \
-	envoy/service/metrics/v2/metrics_service.pb.h \
 	envoy/service/metrics/v3/metrics_service.pb.h \
-	envoy/service/ratelimit/v2/rls.pb.h \
 	envoy/service/ratelimit/v3/rls.pb.h \
 	envoy/service/route/v3/rds.pb.h \
 	envoy/service/route/v3/srds.pb.h \
 	envoy/service/runtime/v3/rtds.pb.h \
 	envoy/service/secret/v3/sds.pb.h \
-	envoy/type/hash_policy.pb.h \
-	envoy/type/http.pb.h \
 	envoy/type/http/v3/path_transformation.pb.h \
-	envoy/type/matcher/metadata.pb.h \
-	envoy/type/matcher/number.pb.h \
-	envoy/type/matcher/regex.pb.h \
-	envoy/type/matcher/string.pb.h \
 	envoy/type/matcher/v3/filter_state.pb.h \
 	envoy/type/matcher/v3/http_inputs.pb.h \
 	envoy/type/matcher/v3/metadata.pb.h \
@@ -217,13 +225,7 @@ API_PB_HEADERS=	\
 	envoy/type/matcher/v3/regex.pb.h \
 	envoy/type/matcher/v3/string.pb.h \
 	envoy/type/matcher/v3/value.pb.h \
-	envoy/type/matcher/value.pb.h \
-	envoy/type/metadata/v2/metadata.pb.h \
 	envoy/type/metadata/v3/metadata.pb.h \
-	envoy/type/percent.pb.h \
-	envoy/type/range.pb.h \
-	envoy/type/semantic_version.pb.h \
-	envoy/type/tracing/v2/custom_tag.pb.h \
 	envoy/type/tracing/v3/custom_tag.pb.h \
 	envoy/type/v3/hash_policy.pb.h \
 	envoy/type/v3/http.pb.h \
@@ -232,7 +234,9 @@ API_PB_HEADERS=	\
 	envoy/type/v3/ratelimit_unit.pb.h \
 	envoy/type/v3/semantic_version.pb.h \
 	envoy/type/v3/token_bucket.pb.h \
-	envoy/watchdog/v3/abort_action.pb.h \
+	envoy/watchdog/v3/abort_action.pb.h
+
+MISC_PB_HEADERS=\
 	google/api/annotations.pb.h \
 	google/api/expr/v1alpha1/checked.pb.h \
 	google/api/expr/v1alpha1/syntax.pb.h \
@@ -244,6 +248,9 @@ API_PB_HEADERS=	\
 	opentelemetry/proto/common/v1/common.pb.h \
 	opentelemetry/proto/logs/v1/logs.pb.h \
 	opentelemetry/proto/resource/v1/resource.pb.h \
+	quiche/quic/core/proto/cached_network_parameters.pb.h \
+	quiche/quic/core/proto/crypto_server_config.pb.h \
+	quiche/quic/core/proto/source_address_token.pb.h \
 	src/proto/grpc/health/v1/health.pb.h \
 	udpa/annotations/migrate.pb.h \
 	udpa/annotations/security.pb.h \
@@ -265,16 +272,11 @@ API_PB_HEADERS=	\
 	xds/type/matcher/v3/string.pb.h \
 	xds/type/v3/typed_struct.pb.h
 
-MISC_PB_HEADERS=\
-	quiche/quic/core/proto/cached_network_parameters.pb.h \
-	quiche/quic/core/proto/crypto_server_config.pb.h \
-	quiche/quic/core/proto/source_address_token.pb.h
-
 %.pb.h: %.proto
 	protoc $(PROTOC_FLAGS) --cpp_out=$(subst /$*,,$(basename $<)) $<
 # XXX: we're not ready for semantic validation just yet :(
 	echo >> $(basename $<).pb.validate.h
 
-all: $(API_PB_HEADERS) $(MISC_PB_HEADERS)
+all: $(API_V2_PB_HEADERS) $(API_V3_PB_HEADERS) $(MISC_PB_HEADERS)
 
 .phony: all
diff --git a/www/envoy/files/makefile-main b/www/envoy/files/makefile-main
index 3fe9ad310fc4..f44f6982c1a2 100644
--- a/www/envoy/files/makefile-main
+++ b/www/envoy/files/makefile-main
@@ -1,14 +1,12 @@
 LOCALBASE?=	/usr/local
-CXXFLAGS+=	-std=c++17 -Wall -Wextra -Wno-unused-parameter \
-		-DBUILD_SCM_REVISION=\"c7e8e73\" \
+CXXFLAGS+=	-std=c++17 -Wall -Wextra -Wno-unused-parameter
+CPPFLAGS+=	-DBUILD_SCM_REVISION=\"c7e8e73\" \
 		-DBUILD_SCM_STATUS=\"Modified\" \
 		-DNDEBUG -DENVOY_SSL_VERSION=\"BoringSSL\" \
 		-DSPDLOG_FMT_EXTERNAL -DENVOY_ENABLE_QUIC \
 		-DENVOY_ADMIN_HTML \
 		-I.. -I../api -I../bazel/external/http_parser \
 		-I../../cel-cpp-11f9d66 \
-		-I../../grpc-1.49.2/src/core/ext/upb-generated \
-		-I../../grpc-1.49.2/third_party/upb \
 		-I../../quiche-37de4f7 \
 		-I../../quiche-37de4f7/quiche/common/platform/default \
 		-I../.. -I$(LOCALBASE)/include
@@ -231,38 +229,6 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		opentelemetry/proto/common/v1/common.pb.o \
 		opentelemetry/proto/logs/v1/logs.pb.o \
 		opentelemetry/proto/resource/v1/resource.pb.o \
-		src/core/lib/channel/channel_stack.o \
-		src/core/lib/gpr/env_posix.o \
-		src/core/lib/gprpp/global_config_env.o \
-		src/core/lib/gprpp/status_helper.o \
-		src/core/lib/gprpp/time.o \
-		src/core/lib/iomgr/combiner.o \
-		src/core/lib/iomgr/error.o \
-		src/core/lib/iomgr/exec_ctx.o \
-		src/core/lib/iomgr/executor.o \
-		src/core/lib/iomgr/iomgr.o \
-		src/core/lib/iomgr/iomgr_internal.o \
-		src/core/lib/iomgr/polling_entity.o \
-		src/core/lib/iomgr/pollset.o \
-		src/core/lib/iomgr/pollset_set.o \
-		src/core/lib/iomgr/timer.o \
-		src/core/lib/iomgr/timer_manager.o \
-		src/core/lib/slice/percent_encoding.o \
-		src/core/lib/slice/slice.o \
-		src/core/lib/slice/slice_buffer.o \
-		src/core/lib/surface/api_trace.o \
-		src/core/lib/surface/byte_buffer.o \
-		src/core/lib/surface/byte_buffer_reader.o \
-		src/core/lib/surface/call.o \
-		src/core/lib/surface/completion_queue.o \
-		src/core/lib/surface/completion_queue_factory.o \
-		src/core/lib/surface/event_string.o \
-		src/core/lib/surface/validate_metadata.o \
-		src/core/lib/transport/connectivity_state.o \
-		src/core/lib/transport/error_utils.o \
-		src/core/lib/transport/metadata_batch.o \
-		src/core/lib/transport/transport.o \
-		src/core/lib/transport/transport_op_string.o \
 		udpa/annotations/migrate.pb.o \
 		udpa/annotations/security.pb.o \
 		udpa/annotations/sensitive.pb.o \