Merge ~vpa1977/ubuntu/+source/openjdk-23:ubuntu/devel into ubuntu/+source/openjdk-23:ubuntu/devel

[Vladimir Petko]

Changes:
 - fix typo in the problemlist (skips failing test)
 - disable dtrace on Jammy armhf - the build fails due to the internal compiler error.

PPA: ppa:vpa1977/october-21 [1]

Testing:
 - build for armhf jammy must succeed [2]
 - DebugOptions.java should be skipped [2]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21/+packages
[2] https://launchpadlibrarian.net/772463055/buildlog_ubuntu-jammy-armhf.openjdk-23_23.0.2+7-1ubuntu1~22.04_BUILDING.txt.gz

[Pushkar Kulkarni (pushkarnk)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 4596781..5021c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-23 (23.0.2+7-1ubuntu1) plucky; urgency=medium
+
+  * d/rules: disable dtrace on jammy armhf (LP: #2091226).
+  * d/t/problems.csv: fix typo - remove jdk prefix for
+    sun/security/util/Debug/DebugOptions.java.
+
+ -- Vladimir Petko <[e-mail]>  Fri, 24 Jan 2025 11:58:07 +1300
+
 openjdk-23 (23.0.2+7-1) unstable; urgency=medium
 
   * OpenJDK 23.0.2 release, build 7. Release notes:
diff --git a/debian/control b/debian/control
index f9b96a4..58b362f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: openjdk-23
 Section: java
 Priority: optional
-Maintainer: OpenJDK Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OpenJDK Team <[e-mail]>
 Uploaders: Matthias Klose <[e-mail]>
 Build-Depends: debhelper (>= 11),
   m4, lsb-release, zip, unzip,
diff --git a/debian/control.in b/debian/control.in
index 8f35549..aaf3d86 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: @basename@
 Section: java
 Priority: optional
-Maintainer: OpenJDK Team <@basename@@packages.debian.org>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OpenJDK Team <@basename@@packages.debian.org>
 Uploaders: Matthias Klose <[e-mail]>
 Build-Depends: @bd_debhelper@
   m4, lsb-release, zip, unzip,
diff --git a/debian/rules b/debian/rules
index 8539a6d..394e8e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -394,7 +394,17 @@ no_dtrace_archs = powerpc ppc64 ppc64el sh4 s390x
 # PPC*, S390x and SH do not support dtrace probes
 # https://github.com/openjdk/jdk/pull/13228
 ifeq (,$(filter $(DEB_HOST_ARCH),$(no_dtrace_archs)))
-  COMMON_CONFIGURE_ARGS += --enable-dtrace
+#  disable dtrace due to the internal compile error in jammy
+#  https://bugs.launchpad.net/ubuntu/+source/openjdk-23/+bug/2091225
+  ifneq (,$(filter $(DEB_HOST_ARCH),armhf))
+    ifneq (,$(filter $(distrel),jammy))
+        COMMON_CONFIGURE_ARGS += --disable-dtrace
+    else
+        COMMON_CONFIGURE_ARGS += --enable-dtrace
+    endif
+  else
+    COMMON_CONFIGURE_ARGS += --enable-dtrace
+  endif
 endif
 
 COMMON_CONFIGURE_ARGS += --with-jni-libpath=/usr/lib/$(DEB_HOST_MULTIARCH)/jni:/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/jni:/lib:/usr/lib
diff --git a/debian/tests/problems.csv b/debian/tests/problems.csv
index a748a7f..ca0cba5 100644
--- a/debian/tests/problems.csv
+++ b/debian/tests/problems.csv
@@ -82,5 +82,5 @@ FAILED: java/foreign/TestUpcallAsync.java,, asserts due to the invalid structure
 FAILED: java/foreign/TestUpcallStack.java,, asserts due to the invalid structure size. Ignore as this is a preview API and the issue does not occur in openjdk-22. I will add it to the problemlist.,:openjdk-21,:armhf,:release-all
 FAILED: java/foreign/TestVarArgs.java,, asserts due to the invalid structure size. Ignore as this is a preview API and the issue does not occur in openjdk-22. I will add it to the problemlist.,:openjdk-21,:armhf,:release-all
 FAILED: runtime/os/TestTrimNative.java#trimNative,, java.lang.RuntimeException: We found fewer (periodic) trim lines in UL log than expected (expected at least 13  found 11). This looks like a flaky test - it asserts number of lines from the periodic trimmer  e.g. src/hotspot/share/runtime/trimNativeHeap.hpp:56 which causes the test to fail due to the slow VM. Test passes locally.,:openjdk-21,:armhf,:release-all
-FAILED: jdk/sun/security/util/Debug/DebugOptions.java,JDK-8339713,Stack overflow error on 32-bit platforms,:openjdk-17:openjdk-21:openjdk-23:openjdk-24:openjdk-25:,:armhf:i386:s390x,:release-all
+FAILED: sun/security/util/Debug/DebugOptions.java,JDK-8339713,Stack overflow error on 32-bit platforms,:openjdk-17:openjdk-21:openjdk-23:openjdk-24:openjdk-25:,:armhf:i386:s390x,:release-all
 Error: jdk/jshell/TerminalNoExecTest.java,,BackingStoreException: Couldn't get file lock - possibly because the LP (non-root) container has no home directory,:openjdk-23:openjdk-24:openjdk-25:,:arch-all,:release-all