From 4939bff2f7f71622363ceca9fafc4156b7eedf7c Mon Sep 17 00:00:00 2001
From: eric846 <56563761+eric846@users.noreply.github.com>
Date: Fri, 19 Sep 2025 19:33:27 +0000
Subject: [PATCH 1/2] Updating Envoy version to c111d5e (Sep 19, 2025)

Signed-off-by: eric846 <56563761+eric846@users.noreply.github.com>
---
 .bazelrc               | 2 ++
 bazel/repositories.bzl | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 9213a4bfe..98ee1dc78 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -38,6 +38,7 @@ build --tool_java_language_version=11
 build --copt=-DABSL_MIN_LOG_LEVEL=4
 # Global C++ standard and common warning suppressions
 build --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
+build --cxxopt=-Wno-error=missing-requires --host_cxxopt=-Wno-error=missing-requires
 build --copt=-Wno-deprecated-declarations
 build --define envoy_mobile_listener=enabled
 build --experimental_repository_downloader_retries=2
@@ -192,6 +193,7 @@ build:asan --linkopt='-L/opt/llvm/lib/clang/18/lib/x86_64-unknown-linux-gnu'
 build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
 build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
 build:macos --define tcmalloc=disabled
+build:macos --cxxopt=-Wno-nullability-completeness
 
 # macOS ASAN/UBSAN
 build:macos-asan --config=asan
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 0a23fed69..0254764b3 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "f0ea3c7bc33254a03c32e4fe7ac43a48545bd1d7"
-ENVOY_SHA = "22117ece88ab10744a4abb58f7d080d2d25d6fd75d1bc5d8d2a01055abaf77f1"
+ENVOY_COMMIT = "c111d5e358e208a23403f28e55a4492f4dfe8edb"
+ENVOY_SHA = "7501b644369b1a68b74b2f52f5548a8728b80db321a4966f471028854b30fe21"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.8"  # June 18th, 2025
 HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94"

From 969d389c3307580be8198889a9691309386431ee Mon Sep 17 00:00:00 2001
From: eric846 <56563761+eric846@users.noreply.github.com>
Date: Fri, 19 Sep 2025 20:20:48 +0000
Subject: [PATCH 2/2] remove .bazelrc changes

Signed-off-by: eric846 <56563761+eric846@users.noreply.github.com>
---
 .bazelrc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 98ee1dc78..9213a4bfe 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -38,7 +38,6 @@ build --tool_java_language_version=11
 build --copt=-DABSL_MIN_LOG_LEVEL=4
 # Global C++ standard and common warning suppressions
 build --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
-build --cxxopt=-Wno-error=missing-requires --host_cxxopt=-Wno-error=missing-requires
 build --copt=-Wno-deprecated-declarations
 build --define envoy_mobile_listener=enabled
 build --experimental_repository_downloader_retries=2
@@ -193,7 +192,6 @@ build:asan --linkopt='-L/opt/llvm/lib/clang/18/lib/x86_64-unknown-linux-gnu'
 build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
 build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
 build:macos --define tcmalloc=disabled
-build:macos --cxxopt=-Wno-nullability-completeness
 
 # macOS ASAN/UBSAN
 build:macos-asan --config=asan