Merge ~pushkarnk/ubuntu/+source/openjdk-lts:ubuntu/devel into ubuntu/+source/openjdk-lts:ubuntu/devel

[Pushkar Kulkarni]

6f03b36... by Pushkar Kulkarni on 2025-04-17

d/rules: point --with-jtreg to /usr/share/jtreg

5431409... by Pushkar Kulkarni on 2025-04-17

d/rules: Disable dtrace on jammy armhf

83a3323... by Pushkar Kulkarni on 2025-04-17

Disable tests failing due to upstream bugs

6c121ae... by Pushkar Kulkarni on 2025-04-17

Honour DEB_BUILD_OPTIONS=parallel=N while running jtreg tests

32f020c... by Pushkar Kulkarni on 2025-04-17

New upstream version 11.0.27+6

7fbc7ea... by Pushkar Kulkarni on 2025-04-17

Update upstream source from tag 'upstream/11.0.27+6'

Update to upstream version '11.0.27+6'
with Debian dir 17efdee0f4e61a15fea7c624c07faf09c4895613

c412370... by Pushkar Kulkarni on 2025-04-17

d/rules: update git_tag

0155f5f... by Pushkar Kulkarni on 2025-04-17

update changelog

Unmerged commits

0155f5f... by Pushkar Kulkarni on 2025-04-17

update changelog

c412370... by Pushkar Kulkarni on 2025-04-17

d/rules: update git_tag

7fbc7ea... by Pushkar Kulkarni on 2025-04-17

Update upstream source from tag 'upstream/11.0.27+6'

Update to upstream version '11.0.27+6'
with Debian dir 17efdee0f4e61a15fea7c624c07faf09c4895613

32f020c... by Pushkar Kulkarni on 2025-04-17

New upstream version 11.0.27+6

6c121ae... by Pushkar Kulkarni on 2025-04-17

Honour DEB_BUILD_OPTIONS=parallel=N while running jtreg tests

83a3323... by Pushkar Kulkarni on 2025-04-17

Disable tests failing due to upstream bugs

5431409... by Pushkar Kulkarni on 2025-04-17

d/rules: Disable dtrace on jammy armhf

6f03b36... by Pushkar Kulkarni on 2025-04-17

d/rules: point --with-jtreg to /usr/share/jtreg

diff --git a/debian/changelog b/debian/changelog
index 855ab64..674fd72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+openjdk-lts (11.0.27+6~us1-0ubuntu1) plucky; urgency=medium
+
+  * OpenJDK 11.0.27 release, build 6. Release notes:
+    https://mail.openjdk.org/pipermail/jdk-updates-dev/2025-April/043306.html
+
+    - CVEs:
+      + CVE-2025-21587
+      + CVE-2025-30691
+      + CVE-2025-30698
+
+  [ Vladimir Petko ]
+  * d/rules: point --with-jtreg to /usr/share/jtreg
+  * d/rules: Disable dtrace on jammy armhf (was not enabled before and cannot
+    be built due to a GCC ICE (see LP #2091225)
+  * d/t/problems.csv: Disable tests failing due to upstream bugs.
+
+  [ Matthias Klose ]
+  * Honour DEB_BUILD_OPTIONS=parallel=N while running jtreg tests (Helmut
+    Grohne). Addresses: #1095920
+
+ -- Pushkar Kulkarni <[e-mail]>  Thu, 17 Apr 2025 14:10:13 +0530
+
 openjdk-lts (11.0.26+4-1ubuntu1) plucky; urgency=medium
 
   * OpenJDK 11.0.26 release, build 4. Release notes:
diff --git a/debian/rules b/debian/rules
index 14d1b24..743aadc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -415,7 +415,16 @@ 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 GCC ICE in jammy: https://launchpad.net/bugs/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
 
 # FIXME: --with-jvm-variants=server,zero not supported upstream
@@ -451,7 +460,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), ppc64 ppc64el))
 endif
 
 ifeq ($(with_check),yes)
-  ifneq (,$(filter $(distrel), precise trusty xenial bionic eoan etch wheezy jessie stretch buster))
+  ifneq (,$(filter $(distrel), precise trusty xenial eoan etch wheezy jessie stretch buster))
     COMMON_CONFIGURE_ARGS += --with-jtreg=/usr
   else
     COMMON_CONFIGURE_ARGS += --with-jtreg=/usr/share/jtreg
@@ -1957,7 +1966,7 @@ endif
 	dh_builddeb -a $(nodemo) $(nojrez) #$(bd_options)
 
 git_project		= jdk11u
-git_tag			= jdk-11.0.26+4
+git_tag			= jdk-11.0.27+6
 package_version		= $(subst jdk-,,$(git_tag))
 package_version		= $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
 ifneq ($(is_upstream_release),yes)
diff --git a/debian/tests/jtreg-autopkgtest.in b/debian/tests/jtreg-autopkgtest.in
index 610c517..877fc52 100755
--- a/debian/tests/jtreg-autopkgtest.in
+++ b/debian/tests/jtreg-autopkgtest.in
@@ -30,7 +30,13 @@ if [[ "armel" == *"${host_arch}"* ]]; then
   jt_options+=" -Xmx256M"
 fi
 if dpkg --compare-versions ${jtreg_version} ge 4.2; then
-  jt_options+=" -conc:auto"
+  njobs=auto
+  for opt in ${DEB_BUILD_OPTIONS:-}; do
+    if test "${opt#parallel=}" != "$opt"; then
+      njobs="${opt#parallel=}"
+    fi
+  done
+  jt_options+=" -conc:$njobs"
 fi
 
 # check java binary
diff --git a/debian/tests/jtreg-autopkgtest.sh b/debian/tests/jtreg-autopkgtest.sh
index 30cefa2..f5affb4 100755
--- a/debian/tests/jtreg-autopkgtest.sh
+++ b/debian/tests/jtreg-autopkgtest.sh
@@ -30,7 +30,13 @@ if [[ "armel" == *"${host_arch}"* ]]; then
   jt_options+=" -Xmx256M"
 fi
 if dpkg --compare-versions ${jtreg_version} ge 4.2; then
-  jt_options+=" -conc:auto"
+  njobs=auto
+  for opt in ${DEB_BUILD_OPTIONS:-}; do
+    if test "${opt#parallel=}" != "$opt"; then
+      njobs="${opt#parallel=}"
+    fi
+  done
+  jt_options+=" -conc:$njobs"
 fi
 
 # check java binary
diff --git a/debian/tests/problems.csv b/debian/tests/problems.csv
index a748a7f..b9bd2f7 100644
--- a/debian/tests/problems.csv
+++ b/debian/tests/problems.csv
@@ -33,6 +33,7 @@ FAILED: java/nio/file/Files/InterruptCopy.java,JDK-8166162,Container issue,:open
 FAILED: java/nio/file/Files/Misc.java,JDK-8166162,Container issue,:openjdk-lts:openjdk-11::openjdk-17:openjdk-21:openjdk-22:openjdk-23:openjdk-24:openjdk-25:,:arch-all,:release-all
 FAILED: java/nio/file/Files/TemporaryFiles.java,JDK-8166162,Container issue,:openjdk-lts:openjdk-11::openjdk-17:openjdk-21:openjdk-22:openjdk-23:openjdk-24:openjdk-25:,:arch-all,:release-all
 FAILED: java/nio/file/FileStore/Basic.java,JDK-8166162,Container issue,:openjdk-lts:openjdk-11::openjdk-17:openjdk-21:openjdk-22:openjdk-23:openjdk-24:openjdk-25:,:arch-all,:release-all
+FAILED: com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java,JDK-8166162,Container issue,:openjdk-lts:openjdk-11::openjdk-17:openjdk-21:openjdk-22:openjdk-23:openjdk-24:openjdk-25:,:arch-all,:release-all
 FAILED: runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java,,flaky test (?) existing comment,:openjdk-17,:arch-all,:release-all
 FAILED: runtime/cds/appcds/jcmd/JCmdTestFileSafety.java,,flaky test (?) existing comment,:openjdk-17,i386:arm64:amd64:ppc64el,:release-all
 FAILED: runtime/cds/appcds/jcmd/JCmdTestStaticDump.java,,flaky test (?) existing comment,:openjdk-17,:arch-all,:release-all
@@ -74,6 +75,7 @@ FAILED: java/foreign/TestDowncallStack.java,, asserts due to the invalid structu
 FAILED: java/foreign/TestDowncallScope.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/TestSegments.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/TestLinker.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/nested/TestNested.java,CODETOOLS-7903948, test is compiled without --enable-preview flag,:openjdk-21,:arch-all,:release-all
 FAILED: java/foreign/TestAddressDereference.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/TestUpcallHighArity.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/TestUpcallStructScope.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
@@ -84,3 +86,4 @@ FAILED: java/foreign/TestVarArgs.java,, asserts due to the invalid structure siz
 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
 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
+FAILED: applications/ctw/modules/jdk_jfr.java,JDK-8352567, Unimplemented SharedRuntime::generate_jfr_write_checkpoint for S390x, :openjdk-25:,:s390x,:release-all