From adefbcf7525ae022a111f89a6d507dbec33a2471 Mon Sep 17 00:00:00 2001
From: Billy Lynch <billy@chainguard.dev>
Date: Tue, 8 Oct 2024 12:58:58 -0400
Subject: [PATCH] protobuf: bump to 3.28.0, disable upb.

I don't know why automation didn't handle this, but bumps protobuf to
latest released version.

Also removes upb which is causing issues with downstream dependencies
(otel-nginx).
---
 falco.yaml        |  2 +-
 grpc.yaml         |  6 +++---
 php-8.1-grpc.yaml |  2 +-
 php-8.2-grpc.yaml |  2 +-
 php-8.3-grpc.yaml |  2 +-
 protobuf-c.yaml   |  2 +-
 protobuf.yaml     | 25 +++++++------------------
 7 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/falco.yaml b/falco.yaml
index a6f4a53d41..9852b206de 100644
--- a/falco.yaml
+++ b/falco.yaml
@@ -1,7 +1,7 @@
 package:
   name: falco
   version: 0.39.0 # on update check if we can remove the 'Patch falcosecurity-libs' pipeline below if https://github.com/falcosecurity/libs/pull/2079 is merged
-  epoch: 1
+  epoch: 2
   description: Cloud Native Runtime Security
   copyright:
     - license: Apache-2.0
diff --git a/grpc.yaml b/grpc.yaml
index 1bea036ba7..4110ddcb6a 100644
--- a/grpc.yaml
+++ b/grpc.yaml
@@ -1,7 +1,7 @@
 package:
   name: grpc
-  version: 1.66.2
-  epoch: 0
+  version: 1.67.0
+  epoch: 2
   description: The C based gRPC
   copyright:
     - license: Apache-2.0 AND BSD-3-Clause AND MIT
@@ -48,7 +48,7 @@ pipeline:
     with:
       repository: https://github.com/grpc/grpc
       tag: v${{package.version}}
-      expected-commit: f686ffe7e703fb1440dabea419579e566a8becc3
+      expected-commit: 74f245857247b4b3e28a753d85d06ae2d5a55434
 
   - runs: |
       cd third_party
diff --git a/php-8.1-grpc.yaml b/php-8.1-grpc.yaml
index b5b8d688a7..c6b5b34481 100644
--- a/php-8.1-grpc.yaml
+++ b/php-8.1-grpc.yaml
@@ -1,7 +1,7 @@
 package:
   name: php-8.1-grpc
   version: 1.66.2
-  epoch: 1
+  epoch: 2
   description: "A PHP extension for gRPC"
   copyright:
     - license: Apache-2.0
diff --git a/php-8.2-grpc.yaml b/php-8.2-grpc.yaml
index 5fe593c894..1eb61ff14b 100644
--- a/php-8.2-grpc.yaml
+++ b/php-8.2-grpc.yaml
@@ -1,7 +1,7 @@
 package:
   name: php-8.2-grpc
   version: 1.66.2
-  epoch: 1
+  epoch: 2
   description: "A PHP extension for gRPC"
   copyright:
     - license: Apache-2.0
diff --git a/php-8.3-grpc.yaml b/php-8.3-grpc.yaml
index 247f8baf5d..63107b9740 100644
--- a/php-8.3-grpc.yaml
+++ b/php-8.3-grpc.yaml
@@ -1,7 +1,7 @@
 package:
   name: php-8.3-grpc
   version: 1.66.2
-  epoch: 1
+  epoch: 2
   description: "A PHP extension for gRPC"
   copyright:
     - license: Apache-2.0
diff --git a/protobuf-c.yaml b/protobuf-c.yaml
index 523d3a4d4e..f4ce2b7ed0 100644
--- a/protobuf-c.yaml
+++ b/protobuf-c.yaml
@@ -1,7 +1,7 @@
 package:
   name: protobuf-c
   version: 1.5.0
-  epoch: 9
+  epoch: 11
   description: Protocol Buffers implementation in C
   copyright:
     - license: BSD-2-Clause
diff --git a/protobuf.yaml b/protobuf.yaml
index 3c17b75465..27e1f90cdb 100644
--- a/protobuf.yaml
+++ b/protobuf.yaml
@@ -1,7 +1,7 @@
 package:
   name: protobuf
-  version: 3.27.4
-  epoch: 0
+  version: 3.28.2
+  epoch: 2
   description: Library for extensible, efficient structure packing
   copyright:
     - license: BSD-3-Clause
@@ -34,7 +34,7 @@ pipeline:
     with:
       repository: https://github.com/protocolbuffers/protobuf
       tag: v${{package.version}}
-      expected-commit: 80d48ae92d3007caac5eab0a8f8ee4e57f3a921e
+      expected-commit: 9fff46d7327c699ef970769d5c9fd0e44df08fc7
 
   - runs: |
       cd third_party
@@ -47,7 +47,8 @@ pipeline:
         -DBUILD_SHARED_LIBS=True \
         -DCMAKE_BUILD_TYPE=Release \
         -Dprotobuf_ABSL_PROVIDER=package \
-        -Dprotobuf_BUILD_TESTS=OFF
+        -Dprotobuf_BUILD_TESTS=OFF \
+        -Dprotobuf_BUILD_LIBUPB=OFF
       ninja -C build
       DESTDIR=${{targets.destdir}} ninja -C build install
 
@@ -79,8 +80,8 @@ subpackages:
         - name: Verify protoc installation
           runs: |
             protoc --version || exit 1
-            protoc-27.4.0 --version
-            protoc-27.4.0 --help
+            protoc-28.2.0 --version
+            protoc-28.2.0 --help
         - name: Compile sample proto file
           runs: |
             echo 'syntax = "proto3"; message Test { string name = 1; }' > test.proto
@@ -127,15 +128,3 @@ test:
   pipeline:
     - runs: |
         protoc --help
-        protoc-gen-upb --version
-        protoc-gen-upb --help
-        protoc-gen-upb-27.4.0 --version
-        protoc-gen-upb-27.4.0 --help
-        protoc-gen-upb_minitable --version
-        protoc-gen-upb_minitable --help
-        protoc-gen-upb_minitable-27.4.0 --version
-        protoc-gen-upb_minitable-27.4.0 --help
-        protoc-gen-upbdefs --version
-        protoc-gen-upbdefs --help
-        protoc-gen-upbdefs-27.4.0 --version
-        protoc-gen-upbdefs-27.4.0 --help