Ubuntu
openjdk-lts package

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

  1. Git
  2. lp:~pushkarnk/ubuntu/+source/openjdk-lts
  3. merge-11.0.25+9
  4. Merge into ubuntu/devel
Proposed by Pushkar Kulkarni
Status: Needs review
Proposed branch: ~pushkarnk/ubuntu/+source/openjdk-lts:merge-11.0.25+9
Merge into: ubuntu/+source/openjdk-lts:ubuntu/devel
Prerequisite: ~pushkarnk/ubuntu/+source/openjdk-lts:upstream
Diff against target: 96 lines (+27/-6)
4 files modified
debian/changelog (+17/-0)
debian/control (+1/-1)
debian/rules (+8/-5)
debian/tests/problems.csv (+1/-0)
Reviewer Review Type Date Requested Status
Vladimir Petko (community) Approve
git-ubuntu import Pending
Review via email: mp+475407@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vladimir Petko (vpa1977) :
review: Approve
Reply

Unmerged commits

25f2139... by Pushkar Kulkarni

update changelog

d7d8df5... by Pushkar Kulkarni

debian packaging merge from salsa

558ed29... by Pushkar Kulkarni

New upstream version 11.0.25+9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index ef1c054..bd336ac 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,20 @@
6+openjdk-lts (11.0.25+9-1ubuntu1) oracular; urgency=medium
7+
8+ * OpenJDK 11.0.25 release, build 9.
9+
10+ - CVEs
11+ + CVE-2024-21208, 8328286: Enhance HTTP client
12+ + CVE-2024-21210, 8328544: Improve handling of vectorization
13+ + CVE-2024-21217, 8331446: Improve deserialization support
14+ + CVE-2024-21235, 8332644: Improve graph optimizations
15+
16+ [ Vladimir Petko ]
17+ * d/rules: do not include dtrace support for S390x (JDK-8305174).
18+ * d/t/problems.csv: Disable jdk/sun/security/util/Debug/DebugOptions.java
19+ due to JDK-8339713.
20+
21+ -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com> Thu, 17 Oct 2024 22:51:26 +0530
22+
23 openjdk-lts (11.0.25~5ea-1ubuntu1) oracular; urgency=medium
24
25 * OpenJDK 11.0.25+5 build (early access) (LP: #2080298).
26diff --git a/debian/control b/debian/control
27index 651f62d..85b71c7 100644
28--- a/debian/control
29+++ b/debian/control
30@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 11),
31 openjdk-11-jdk-headless:native | openjdk-10-jdk-headless:native,
32 libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, libelf-dev, libfontconfig-dev, libfreetype-dev, libharfbuzz-dev,
33 libffi-dev,
34- zlib1g-dev:native, zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, systemtap-sdt-dev [!sh4],
35+ zlib1g-dev:native, zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, systemtap-sdt-dev [!ppc64 !ppc64el !sh4 !s390x],
36 libnss3-dev (>= 2:3.17.1),
37 openjdk-11-jdk-headless <cross>,
38 Build-Depends-Indep: graphviz, pandoc,
39diff --git a/debian/rules b/debian/rules
40index f569509..ab686c8 100755
41--- a/debian/rules
42+++ b/debian/rules
43@@ -79,7 +79,6 @@ else
44 endif
45
46 is_upstream_release = yes
47-is_upstream_release =
48
49 srcdir = .
50 builddir = build
51@@ -407,12 +406,16 @@ else ifeq ($(with_nss),no)
52 CONFIGURE_ARGS += --disable-nss
53 endif
54
55-CONFIGURE_ARGS += --enable-dtrace
56-
57 COMMON_CONFIGURE_ARGS =
58 DEFAULT_CONFIGURE_ARGS =
59 ZERO_CONFIGURE_ARGS =
60
61+# S390x does not support dtrace probes
62+# https://github.com/openjdk/jdk/pull/13228
63+ifeq (,$(filter $(DEB_HOST_ARCH), powerpc ppc64 ppc64el s390x))
64+ CONFIGURE_ARGS += --enable-dtrace
65+endif
66+
67 # FIXME: --with-jvm-variants=server,zero not supported upstream
68 ifneq (,$(filter $(DEB_HOST_ARCH),$(hotspot_archs)))
69 ifneq (,$(filter $(DEB_HOST_ARCH),i386))
70@@ -699,7 +702,7 @@ ifeq ($(with_nss),yes)
71 bd_nss = libnss3-dev (>= 2:3.17.1),
72 endif
73 endif
74-bd_systemtap = systemtap-sdt-dev [!sh4],
75+bd_systemtap = systemtap-sdt-dev [!powerpc !ppc64 !ppc64el !sh4 !s390x],
76
77 ifeq (,$(filter $(distrel),jessie stretch buster precise trusty xenial bionic focal groovy))
78 with_debugedit = yes
79@@ -1935,7 +1938,7 @@ endif
80 dh_builddeb -a $(nodemo) $(nojrez) #$(bd_options)
81
82 git_project = jdk11u
83-git_tag = jdk-11.0.25+5
84+git_tag = jdk-11.0.25+9
85 package_version = $(subst jdk-,,$(git_tag))
86 package_version = $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
87 ifneq ($(is_upstream_release),yes)
88diff --git a/debian/tests/problems.csv b/debian/tests/problems.csv
89index 332d54a..7076a91 100644
90--- a/debian/tests/problems.csv
91+++ b/debian/tests/problems.csv
92@@ -82,3 +82,4 @@ FAILED: java/foreign/TestUpcallAsync.java,, asserts due to the invalid structure
93 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
94 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
95 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
96+FAILED: jdk/sun/security/util/Debug/DebugOptions.java,JDK-8339713,Stack overflow error on 32-bit platforms,:openjdk-21:openjdk-23,:armhf:i386,:release-all

Subscribers

People subscribed via source and target branches