Merge ~vpa1977/ubuntu/+source/bazel-bootstrap:ubuntu/devel into ubuntu/+source/bazel-bootstrap:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Cherry-pick upstream patch to resolve Java 21 ftbfs

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15788140/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/bazel-bootstrap/+bug/2053202/comments/1

diff --git a/debian/changelog b/debian/changelog
index 04ce192..153fcd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bazel-bootstrap (4.2.3+ds-9ubuntu1) noble; urgency=medium
+
+  * d/p/handle_synthetic_method_parameters_that_dont_have_names.patch:
+    apply upstream patch to resolve Java 21 ftbfs (LP: #2053202).
+
+ -- Vladimir Petko <[e-mail]>  Fri, 05 Jan 2024 15:57:39 +1300
+
 bazel-bootstrap (4.2.3+ds-9) unstable; urgency=high
 
   [ Markus Koschany ]
diff --git a/debian/control b/debian/control
index ef19ccf..a6f2767 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: bazel-bootstrap
 Section: devel
 Priority: optional
-Maintainer: Debian Bazel Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Bazel Team <[e-mail]>
 Uploaders:
  Debian Bazel Team <[e-mail]>,
  Olek Wojnar <[e-mail]>
diff --git a/debian/patches/handle_synthetic_method_parameters_entries_that_dont_have_names.patch b/debian/patches/handle_synthetic_method_parameters_entries_that_dont_have_names.patch
new file mode 100644
index 0000000..199d9e1
--- /dev/null
+++ b/debian/patches/handle_synthetic_method_parameters_entries_that_dont_have_names.patch
@@ -0,0 +1,30 @@
+Description: Handle synthetic method parameters entries that don't have names
+ > If the value of the name_index item is zero, then this parameters element indicates a formal parameter with no name.
+ https://docs.oracle.com/javase/specs/jvms/se20/html/jvms-4.html#jvms-4.7.24
+Author: Liam Miller-Cushon <[e-mail]>
+Origin: upstream, https://github.com/bazelbuild/bazel/commit/3954a18fa6b0e3d1a1005cc3409ebc95f6adf3af
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057490
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bazel-bootstrap/+bug/2053202
+Last-Update: 2024-01-05
+--- a/third_party/ijar/classfile.cc
++++ b/third_party/ijar/classfile.cc
+@@ -1168,7 +1168,8 @@
+     u1 parameters_count = get_u1(p);
+     for (int ii = 0; ii < parameters_count; ++ii) {
+       MethodParameter* parameter = new MethodParameter;
+-      parameter->name_ = constant(get_u2be(p));
++      int name_id = get_u2be(p);
++      parameter->name_ = name_id == 0 ? NULL : constant(name_id);
+       parameter->access_flags_ = get_u2be(p);
+       attr->parameters_.push_back(parameter);
+     }
+@@ -1180,7 +1181,7 @@
+     u1 *payload_start = p - 4;
+     put_u1(p, parameters_.size());
+     for (MethodParameter* parameter : parameters_) {
+-      put_u2be(p, parameter->name_->slot());
++      put_u2be(p, parameter->name_ == NULL ? 0 : parameter->name_->slot());
+       put_u2be(p, parameter->access_flags_);
+     }
+     put_u4be(payload_start, p - 4 - payload_start);  // backpatch length
diff --git a/debian/patches/series b/debian/patches/series
index 2ca3fef..6a3cef0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ grpc-absl_synchronization.patch
 exclude_build_data.patch
 fix-install_base_key-generation.patch
 javax.annotations.patch
+handle_synthetic_method_parameters_entries_that_dont_have_names.patch