Control: tags 1100044 + pending
Dear maintainer,
I've prepared an NMU for grpc (versioned as 1.51.1-5.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Or, of course you could take the approach from my previous patch, and
upgrade to a newer upstream release.
Regards.
Stefano
diff -Nru grpc-1.51.1/debian/changelog grpc-1.51.1/debian/changelog
--- grpc-1.51.1/debian/changelog 2024-11-11 13:25:37.000000000 -0400
+++ grpc-1.51.1/debian/changelog 2025-03-10 15:12:33.000000000 -0400
@@ -1,3 +1,10 @@
+grpc (1.51.1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Patch: Support abseil 20240722.0. (closes: #1100044)
+
+ -- Stefano Rivera <stefa...@debian.org> Mon, 10 Mar 2025 15:12:33 -0400
+
grpc (1.51.1-5) unstable; urgency=medium
[ Stefano Rivera <stefa...@debian.org> ]
diff -Nru grpc-1.51.1/debian/patches/abseil-20240722.0.patch grpc-1.51.1/debian/patches/abseil-20240722.0.patch
--- grpc-1.51.1/debian/patches/abseil-20240722.0.patch 1969-12-31 20:00:00.000000000 -0400
+++ grpc-1.51.1/debian/patches/abseil-20240722.0.patch 2025-03-10 15:12:33.000000000 -0400
@@ -0,0 +1,30 @@
+From: DanilChapovalov <danilc...@webrtc.org>
+Date: Fri, 29 Sep 2023 18:43:57 +0200
+Subject: [Build] Add missing absl includes (#34499)
+
+To avoid depending on transitive includes, specially avoid relying on
+transitive include status.h -> str_cat.h that is removed in the latest
+version of abseil
+
+Origin: upstream, 784e3b1c40fff4cb1381ddc6b9917b29bafab8f2
+---
+ src/core/lib/iomgr/tcp_posix.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc
+index 72e1b66..769c15f 100644
+--- a/src/core/lib/iomgr/tcp_posix.cc
++++ b/src/core/lib/iomgr/tcp_posix.cc
+@@ -20,6 +20,12 @@
+
+ #include <grpc/impl/codegen/grpc_types.h>
+
++#include "absl/base/thread_annotations.h"
++#include "absl/status/status.h"
++#include "absl/strings/str_cat.h"
++#include "absl/strings/string_view.h"
++#include "absl/types/optional.h"
++
+ #include "src/core/lib/gprpp/global_config_generic.h"
+ #include "src/core/lib/iomgr/exec_ctx.h"
+ #include "src/core/lib/iomgr/port.h"
diff -Nru grpc-1.51.1/debian/patches/abseil-20240722.1.patch grpc-1.51.1/debian/patches/abseil-20240722.1.patch
--- grpc-1.51.1/debian/patches/abseil-20240722.1.patch 1969-12-31 20:00:00.000000000 -0400
+++ grpc-1.51.1/debian/patches/abseil-20240722.1.patch 2025-03-10 15:12:33.000000000 -0400
@@ -0,0 +1,24 @@
+From: Esun Kim <vebl...@google.com>
+Date: Thu, 14 Sep 2023 17:25:41 -0700
+Subject: [Fix] Added missing #include (#34359)
+
+One more missing #include
+
+Origin: upstream, 9a7ecfad0086fed7a77aa0db8a9a024b5622b29c
+---
+ test/core/tsi/crl_ssl_transport_security_test.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc
+index 8633042..456a7f6 100644
+--- a/test/core/tsi/crl_ssl_transport_security_test.cc
++++ b/test/core/tsi/crl_ssl_transport_security_test.cc
+@@ -19,6 +19,8 @@
+ #include <gmock/gmock.h>
+ #include <gtest/gtest.h>
+
++#include "absl/strings/str_cat.h"
++
+ #include <grpc/grpc.h>
+ #include <grpc/support/alloc.h>
+ #include <grpc/support/log.h>
diff -Nru grpc-1.51.1/debian/patches/abseil-20240722.2.patch grpc-1.51.1/debian/patches/abseil-20240722.2.patch
--- grpc-1.51.1/debian/patches/abseil-20240722.2.patch 1969-12-31 20:00:00.000000000 -0400
+++ grpc-1.51.1/debian/patches/abseil-20240722.2.patch 2025-03-10 15:12:33.000000000 -0400
@@ -0,0 +1,22 @@
+From: Stefano Rivera <stefa...@debian.org>
+Date: Mon, 10 Mar 2025 12:55:36 -0400
+Subject: Another missing #include
+
+Can't find the upstream equivalent to this, it must be buried elsewhere
+in the include stack.
+---
+ test/cpp/end2end/xds/xds_server.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h
+index 6fe7167..db7fd97 100644
+--- a/test/cpp/end2end/xds/xds_server.h
++++ b/test/cpp/end2end/xds/xds_server.h
+@@ -27,6 +27,7 @@
+ #include <gtest/gtest.h>
+
+ #include "absl/types/optional.h"
++#include "absl/strings/numbers.h"
+
+ #include <grpc/support/log.h>
+
diff -Nru grpc-1.51.1/debian/patches/series grpc-1.51.1/debian/patches/series
--- grpc-1.51.1/debian/patches/series 2024-11-11 13:25:37.000000000 -0400
+++ grpc-1.51.1/debian/patches/series 2025-03-10 15:12:33.000000000 -0400
@@ -19,3 +19,6 @@
python3.13-pipes.patch
gcc-14.patch
gcc-14-2.patch
+abseil-20240722.0.patch
+abseil-20240722.1.patch
+abseil-20240722.2.patch
