From 5fadd0fd759e53177d00b739e8645b7e15d6493a Mon Sep 17 00:00:00 2001
From: Alan Parra <alan.parra@goteleport.com>
Date: Tue, 23 May 2023 10:38:04 -0300
Subject: [PATCH 1/2] Revert protoc downgrade

---
 build.assets/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.assets/Makefile b/build.assets/Makefile
index 668c26a5f378f..e110812701463 100644
--- a/build.assets/Makefile
+++ b/build.assets/Makefile
@@ -34,7 +34,7 @@ BUF_VERSION ?= 1.19.0
 GOGO_PROTO_TAG ?= v1.3.2
 NODE_GRPC_TOOLS_VERSION ?= 1.12.4
 NODE_PROTOC_TS_VERSION ?= 5.0.1
-PROTOC_VER ?= 3.20.2
+PROTOC_VER ?= 3.20.3
 
 UID := $$(id -u)
 GID := $$(id -g)

From 76732428a6a6f7fbb9e942efbf4b464c82335c60 Mon Sep 17 00:00:00 2001
From: Alan Parra <alan.parra@goteleport.com>
Date: Tue, 23 May 2023 10:53:06 -0300
Subject: [PATCH 2/2] Use correct protoc URL for arm64

---
 build.assets/Dockerfile-grpcbox | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.assets/Dockerfile-grpcbox b/build.assets/Dockerfile-grpcbox
index b04d52a5ed31b..6611235862e71 100644
--- a/build.assets/Dockerfile-grpcbox
+++ b/build.assets/Dockerfile-grpcbox
@@ -23,7 +23,8 @@ ARG PROTOC_VER # eg, "3.20.2"
 RUN VERSION="$PROTOC_VER" && \
   PB_REL='https://github.com/protocolbuffers/protobuf/releases' && \
   PB_FILE="$(mktemp protoc-XXXXXX.zip)" && \
-  curl -fsSL -o "$PB_FILE" "$PB_REL/download/v$VERSION/protoc-$VERSION-linux-$(uname -m).zip"  && \
+  ARCH="$(if [ "$(uname -m)" = aarch64 ]; then echo aarch_64; else uname -m; fi)" && \
+  curl -fsSL -o "$PB_FILE" "$PB_REL/download/v$VERSION/protoc-$VERSION-linux-$ARCH.zip"  && \
   unzip "$PB_FILE" -d /usr/local && \
   rm -f "$PB_FILE"