Merge ~vpa1977/ubuntu/+source/openjdk-lts:update-to-ea into ubuntu/+source/openjdk-lts:ubuntu/devel

[Vladimir Petko]

Update to the new upstream snapshot.

Changes:
  * New upstream snapshot 11.0.24~6ea (LP: #2069917).
  * d/p/*: refresh patches.
  * d/rules, d/control: use jtreg7, enable jtreg.
  * d/JB-demo.overrides.in: add jar-contains-source override for
    SwingSet demo jar.
  * d/rules, d/copyright-generator/copyright-gen.py, d/copyright:
    exclude test/jdk/sun/management/windows/revokeall.exe from orig
    tarball, format d/copyright-generator/copyright-gen.py.
  * d/p/8307977-proposed.diff: rename to jdk-8307977-proposed.patch.
  * d/p/jdk-8334502.patch: fix iso8601_utctime armhf function.
  * d/p/jtreg-location.diff: drop patch as it is no longer needed for
    jtreg7.

PPA: ppa:vpa1977/default-jdk-21[1]

Testing:
 - jtreg test summary [2]
 - lintian [3]
 - rebuilt openjdk-lts with itself [4]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+sourcepub/16229355/+listing-archive-extra
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/467870/comments/1261172
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/467870/comments/1260923
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+sourcepub/16226031/+listing-archive-extra

[Vladimir Petko (vpa1977)]

lintian output:

E: openjdk-11-doc: copyright-file-contains-full-gpl-license
E: openjdk-11-jre-headless: copyright-file-contains-full-gpl-license
W: openjdk-lts source: build-depends-on-obsolete-package Build-Depends: pkg-config => pkgconf
W: openjdk-11-doc: changelog-distribution-does-not-match-changes-file oracular != mantic [usr/share/doc/openjdk-11-doc/changelog.Debian.gz:1]
W: openjdk-11-jre-headless: changelog-distribution-does-not-match-changes-file oracular != mantic [usr/share/doc/openjdk-11-jre-headless/changelog.Debian.gz:1]
W: openjdk-lts changes: distribution-and-changes-mismatch mantic oracular
W: openjdk-11-doc: embedded-javascript-library please use libjs-jquery [usr/share/doc/openjdk-11-jre-headless/api/jquery/external/jquery/jquery.js]
W: openjdk-11-doc: embedded-javascript-library please use libjs-jquery [usr/share/doc/openjdk-11-jre-headless/api/jquery/jquery-3.6.1.min.js]
W: openjdk-11-doc: embedded-javascript-library please use libjs-jquery-ui [usr/share/doc/openjdk-11-jre-headless/api/jquery/jquery-ui.min.css]
W: openjdk-11-doc: embedded-javascript-library please use libjs-jquery-ui [usr/share/doc/openjdk-11-jre-headless/api/jquery/jquery-ui.min.js]
W: openjdk-11-doc: embedded-javascript-library please use node-jszip [usr/share/doc/openjdk-11-jre-headless/api/jquery/jszip/dist/jszip.js]
W: openjdk-11-doc: embedded-javascript-library please use node-jszip [usr/share/doc/openjdk-11-jre-headless/api/jquery/jszip/dist/jszip.min.js]
W: openjdk-11-doc: embedded-javascript-library please use node-jszip-utils [usr/share/doc/openjdk-11-jre-headless/api/jquery/jszip-utils/dist/jszip-utils-ie.js]
W: openjdk-11-doc: embedded-javascript-library please use node-jszip-utils [usr/share/doc/openjdk-11-jre-headless/api/jquery/jszip-utils/dist/jszip-utils-ie.min.js]
W: openjdk-11-doc: embedded-javascript-library please use node-jszip-utils [usr/share/doc/openjdk-11-jre-headless/api/jquery/jszip-utils/dist/jszip-utils.js]
W: openjdk-11-doc: embedded-javascript-library please use node-jszip-utils [usr/share/doc/openjdk-11-jre-headless/api/jquery/jszip-utils/dist/jszip-utils.min.js]
W: openjdk-11-jre-headless: mismatched-override package-contains-empty-directory usr/share/binfmts/ [usr/share/lintian/overrides/openjdk-11-jre-headless:2]
W: openjdk-lts source: package-uses-deprecated-debhelper-compat-version 9
W: openjdk-lts source: patch-file-present-but-not-mentioned-in-series [debian/patches/alpha-float-const.diff]
P: openjdk-11-dbg: renamed-tag library-in-debug-or-profile-should-not-be-stripped => stripped-library [usr/share/lintian/overrides/openjdk-11-dbg:2]
P: openjdk-11-jre-headless: renamed-tag debug-package-should-be-named-dbg => debug-suffix-not-dbg [usr/share/lintian/overrides/openjdk-11-jre-headless:11]
P: openjdk-11-demo: repeated-path-segment nbproject [usr/share/doc/openjdk-11-jre-headless/demo/nbproject/jfc/FileChooserDemo/nbproject/]
P: openjdk-11-demo: repeated-path-segment nbproject [usr/share/doc/openjdk-11-jre-headless/demo/nbproject/jfc/Font2DTest/nbproject/]
P: openjdk-11-demo: repeated-path-segment nbproject [usr/share/doc/openjdk-11-jre-headless/demo/nbproject/jfc/Metalworks/nbproject/]
P: openjdk-11-demo: repeated-pa...

[Vladimir Petko (vpa1977)]

amd64 --> /~vpa1977/+archive/ubuntu/default-jdk-21/+build/28592170
----------------cut----------------------------------------------
Platform: amd64
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 1,968
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 3,930
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jaxp ---------------
Test results: passed: 445
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jdk ---------------
(xfwm4:468146): dbind-WARNING **: 02:21:14.879: AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
(xfwm4:468146): xfwm4-WARNING **: 02:21:15.378: Another compositing manager is running on screen 0
(xfwm4:468146): xfwm4-WARNING **: 02:21:15.380: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
FAILED: sun/security/ec/TestEC.java
Test results: passed: 5,372; failed: 1
FAILED: sun/security/ec/TestEC.java
Test results: failed: 1
FAILED: sun/security/ec/TestEC.java
Test results: failed: 1
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Killed
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
 Command being timed: "/usr/bin/make -f debian/rules -k jtregcheck TEST_SUITES=hotspot langtools jaxp jdk JTREG_OPTIONS="
 User time (seconds): 21968.41
 System time (seconds): 1358.08
 Percent of CPU this job got: 138%
 Elapsed (wall clock) time (h:mm:ss or m:ss): 4:41:30
 Average shared text size (kbytes): 0
 Average unshared data size (kbytes): 0
 Average stack size (kbytes): 0
 Average total size (kbytes): 0
 Maximum resident set size (kbytes): 6547144
 Average resident set size (kbytes): 0
 Major (requiring I/O) page faults: 731
 Minor (reclaiming a frame) page faults: 344633897
 Voluntary context switches: 55009386
 Involuntary context switches: 22865322
 Swaps: 0
 File system inputs: 1515800
 File system outputs: 69591736
 Socket messages sent: 0
 Socket messages received: 0
 Signals delivered: 0
 Page size (bytes): 4096
 Exit status: 0
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 1,968
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtoo...

db41e2b... by Vladimir Petko on 2024-06-25

* d/rules: include /usr/share/dpkg/buildflags.mk to avoid configure failure due to the undefined variables.

[Pushkar Kulkarni (pushkarnk)]

LGTM

review: Approve

Unmerged commits

a23a97a... by Vladimir Petko on 2024-06-19

changelog

db41e2b... by Vladimir Petko on 2024-06-25

* d/rules: include /usr/share/dpkg/buildflags.mk to avoid configure failure due to the undefined variables.

9e41747... by Vladimir Petko on 2024-06-19

* Rename 8307977-proposed.diff to jdk-8307977-proposed.patch.

cada002... by Vladimir Petko on 2024-06-19

* d/p/jdk-8334502.patch: fix iso8601_utctime armhf function.

92907c8... by Vladimir Petko on 2024-06-19

  * d/rules: bump git tag

23475ef... by Vladimir Petko on 2024-06-19

  * Exclude test/jdk/sun/management/windows/revokeall.exe from orig tarball.

8ce103c... by Vladimir Petko on 2024-06-17

override jar-contains-source for SwingSet demos

44391b5... by Vladimir Petko on 2024-05-23

refresh reproducible headers patch

f103b01... by Vladimir Petko on 2024-05-23

drop jtreg location patch (openjdk-11 switched to jtreg7)

6783921... by Vladimir Petko on 2024-05-23

update control: jtreg7

diff --git a/debian/JB-demo.overrides.in b/debian/JB-demo.overrides.in
index e148b99..db41403 100644
--- a/debian/JB-demo.overrides.in
+++ b/debian/JB-demo.overrides.in
@@ -6,3 +6,6 @@
 
 # example jar file with sources and documentation
 @basename@-demo binary: codeless-jar
+
+# example jar file with sources and documentation
+@basename@-demo binary: jar-contains-source
diff --git a/debian/changelog b/debian/changelog
index 093bab1..d62bce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+openjdk-lts (11.0.24~6ea-1ubuntu2) oracular; urgency=medium
+
+  * d/rules: include /usr/share/dpkg/buildflags.mk to avoid configure
+    failure due to the undefined variables.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 26 Jun 2024 08:34:02 +1200
+
+openjdk-lts (11.0.24~6ea-1ubuntu1) oracular; urgency=medium
+
+  * New upstream snapshot 11.0.24~6ea (LP: #2069917).
+  * d/p/*: refresh patches.
+  * d/rules, d/control: use jtreg7, enable jtreg.
+  * d/JB-demo.overrides.in: add jar-contains-source override for
+    SwingSet demo jar.
+  * d/rules, d/copyright-generator/copyright-gen.py, d/copyright:
+    exclude test/jdk/sun/management/windows/revokeall.exe from orig
+    tarball, format d/copyright-generator/copyright-gen.py.
+  * d/p/8307977-proposed.diff: rename to jdk-8307977-proposed.patch.
+  * d/p/jdk-8334502.patch: fix iso8601_utctime armhf function.
+  * d/p/jtreg-location.diff: drop patch as it is no longer needed for
+    jtreg7.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 20 Jun 2024 10:30:43 +1200
+
 openjdk-lts (11.0.23+9-1ubuntu1) noble; urgency=high
 
   * OpenJDK 11.0.23 release, build 9.
@@ -235,7 +259,7 @@ openjdk-lts (11.0.18+10-0ubuntu1) lunar; urgency=medium
   * debian/watch: use jdk11u repository as upstream.
   * debian/rules: add lunar to jtreg version selection.
 
- -- Vladimir Petko <[e-mail]>  Thu, 19 Jan 2023 21:24:22 +1300 
+ -- Vladimir Petko <[e-mail]>  Thu, 19 Jan 2023 21:24:22 +1300
 
 openjdk-lts (11.0.17+8-1ubuntu2) kinetic-security; urgency=medium
 
@@ -597,7 +621,7 @@ openjdk-lts (11.0.9+10-0ubuntu1) groovy; urgency=medium
     debian/patches/generated-headers.patch,
     debian/patches/icc_loading_with_symlink.diff,
     debian/patches/jdk-getAccessibleValue.diff,
-    debian/patches/jexec.diff, debian/patches/jtreg-location.diff, 
+    debian/patches/jexec.diff, debian/patches/jtreg-location.diff,
     debian/patches/reproducible-build-user.diff, debian/patches/riscv64.diff,
     debian/patches/s390x-opt.diff, debian/patches/system-pcsclite.diff,
     debian/patches/workaround_expand_exec_shield_cs_limit.diff,
@@ -637,7 +661,7 @@ openjdk-lts (11.0.8+10-0ubuntu1) groovy; urgency=medium
     - JDK-8241522: Manifest improved jar headers redux
    * d/p/default-jvm-cfg.diff: updated patch.
    * d/p/8214571.diff, d/p/8228407.diff: applied by upstream, removed patches.
- 
+
  -- Tiago Stürmer Daitx <[e-mail]>  Wed, 15 Jul 2020 00:56:32 +0000
 
 openjdk-lts (11.0.7+10-3ubuntu1) focal; urgency=medium
@@ -5724,4 +5748,3 @@ icedtea (7~b14-20070704-1) unstable; urgency=low
   * Initial version.
 
  -- Michael Koch <[e-mail]>  Wed, 04 Jul 2007 08:25:31 -0100
-
diff --git a/debian/control b/debian/control
index 4350733..a78c49c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 11),
   m4, lsb-release, zip, unzip,
   sharutils, gawk, cpio, pkg-config, procps, wdiff, fastjar (>= 2:0.96-0ubuntu2),
   time, strip-nondeterminism, debugedit (>= 4.16),
-  file,
+  jtreg7 <!nocheck>, libtestng7-java <!nocheck>, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, libasmtools-java <!nocheck>, googletest <!nocheck>, google-mock <!nocheck>, xvfb  <!nocheck>,
   autoconf, automake, autotools-dev, ant, ant-optional,
   g++-13 <!cross>,
   openjdk-11-jdk-headless:native | openjdk-10-jdk-headless:native,
diff --git a/debian/copyright b/debian/copyright
index 2a4ea8f..baa1633 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Files-Excluded:
   .github/*
   .gitattributes
+  test/jdk/sun/management/windows/revokeall.exe
   src/java.base/share/native/libzip/zlib/*
   src/java.desktop/share/native/libsplashscreen/giflib/*
   src/java.desktop/share/native/libsplashscreen/libpng/*
diff --git a/debian/copyright-generator/copyright-gen.py b/debian/copyright-generator/copyright-gen.py
index 5b2b782..597b675 100755
--- a/debian/copyright-generator/copyright-gen.py
+++ b/debian/copyright-generator/copyright-gen.py
@@ -32,6 +32,7 @@ common_licenses = {};
 excluded_files = [
   ".github/*",
   ".gitattributes",
+  "test/jdk/sun/management/windows/revokeall.exe",
   "src/java.base/share/native/libzip/zlib/*",
   "src/java.desktop/share/native/libsplashscreen/giflib/*",
   "src/java.desktop/share/native/libsplashscreen/libpng/*",
diff --git a/debian/patches/8307977-proposed.diff b/debian/patches/jdk-8307977-proposed.patch
similarity index 100%
rename from debian/patches/8307977-proposed.diff
rename to debian/patches/jdk-8307977-proposed.patch
diff --git a/debian/patches/jdk-8334502.patch b/debian/patches/jdk-8334502.patch
new file mode 100644
index 0000000..6f7f070
--- /dev/null
+++ b/debian/patches/jdk-8334502.patch
@@ -0,0 +1,23 @@
+Description: use int instead of time_t to print timezone info
+ printf() call uses %02d format specifier that requires an int parameter.
+Author: Vladimir Petko <[e-mail]>
+Bug: https://bugs.openjdk.org/browse/JDK-8334502
+Last-Update: 2024-06-19
+
+diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
+index bdf93e1d3b4..d928dc55dce 100644
+--- a/src/hotspot/share/runtime/os.cpp
++++ b/src/hotspot/share/runtime/os.cpp
+@@ -209,8 +209,8 @@ char* os::iso8601_time(jlong milliseconds_since_19700101, char* buffer, size_t b
+     abs_local_to_UTC = -(abs_local_to_UTC);
+   }
+   // Convert time zone offset seconds to hours and minutes.
+-  const time_t zone_hours = (abs_local_to_UTC / seconds_per_hour);
+-  const time_t zone_min =
++  const int zone_hours = (abs_local_to_UTC / seconds_per_hour);
++  const int zone_min =
+     ((abs_local_to_UTC % seconds_per_hour) / seconds_per_minute);
+
+   // Print an ISO 8601 date and time stamp into the buffer
+--
+2.43.0
diff --git a/debian/patches/jtreg-location.diff b/debian/patches/jtreg-location.diff
deleted file mode 100644
index c680291..0000000
--- a/debian/patches/jtreg-location.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/make/autoconf/toolchain.m4
-+++ b/make/autoconf/toolchain.m4
-@@ -1076,7 +1076,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
-       AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg does not exist])
-     fi
- 
--    if test ! -e "$JT_HOME/lib/jtreg.jar"; then
-+    if test ! -e "$JT_HOME/share/java/jtreg.jar"; then
-       AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg is not a valid jtreg home])
-     fi
- 
-@@ -1095,7 +1095,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
-         AC_MSG_WARN([Ignoring JT_HOME pointing to invalid directory: $JT_HOME])
-         JT_HOME=
-       else
--        if test ! -e "$JT_HOME/lib/jtreg.jar"; then
-+        if test ! -e "$JT_HOME/share/java/jtreg.jar"; then
-           AC_MSG_WARN([Ignoring JT_HOME which is not a valid jtreg home: $JT_HOME])
-           JT_HOME=
-         elif test ! -x "$JT_HOME/bin/jtreg"; then
-@@ -1115,7 +1115,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
-       if test "x$JTREGEXE" != x; then
-         # That's good, now try to derive JT_HOME
-         JT_HOME=`(cd $($DIRNAME $JTREGEXE)/.. && pwd)`
--        if test ! -e "$JT_HOME/lib/jtreg.jar"; then
-+        if test ! -e "$JT_HOME/share/java/jtreg.jar"; then
-           AC_MSG_WARN([Ignoring jtreg from path since a valid jtreg home cannot be found])
-           JT_HOME=
-           JTREGEXE=
---- a/make/RunTests.gmk
-+++ b/make/RunTests.gmk
-@@ -740,7 +740,7 @@ define SetupRunJtregTestBody
- 
-   $1_COMMAND_LINE := \
-       $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
--          -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
-+          -Dprogram=jtreg -jar $$(JT_HOME)/share/java/jtreg.jar \
-           $$($1_JTREG_BASIC_OPTIONS) \
-           -testjdk:$$(JDK_IMAGE_DIR) \
-           -dir:$$(JTREG_TOPDIR) \
---- a/make/test/BuildFailureHandler.gmk
-+++ b/make/test/BuildFailureHandler.gmk
-@@ -39,7 +39,7 @@ FH_BASEDIR := $(TOPDIR)/test/failure_han
- FH_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/failure_handler
- FH_JAR := $(FH_SUPPORT)/jtregFailureHandler.jar
- 
--JTREG_JAR := $(JT_HOME)/lib/jtreg.jar
-+JTREG_JAR := $(JT_HOME)/share/java/jtreg.jar
- ifeq ($(wildcard $(JTREG_JAR)), )
-   $(error Cannot build failure handler without jtreg)
- endif
diff --git a/debian/patches/nss-limited-ecc-tests.patch b/debian/patches/nss-limited-ecc-tests.patch
index 7a75015..e1564dd 100644
--- a/debian/patches/nss-limited-ecc-tests.patch
+++ b/debian/patches/nss-limited-ecc-tests.patch
@@ -1,14 +1,3 @@
---- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
-+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
-@@ -99,7 +99,7 @@
-     // NSS version info
-     public static enum ECCState { None, Basic, Extended };
-     static double nss_version = -1;
--    static ECCState nss_ecc_status = ECCState.Extended;
-+    static ECCState nss_ecc_status = ECCState.Basic;
- 
-     // The NSS library we need to search for in getNSSLibDir()
-     // Default is "libsoftokn3.so", listed as "softokn3"
 --- a/test/jdk/sun/security/pkcs11/ec/TestECDH.java
 +++ b/test/jdk/sun/security/pkcs11/ec/TestECDH.java
 @@ -124,8 +124,12 @@
diff --git a/debian/patches/reproducible-copyright-headers.diff b/debian/patches/reproducible-copyright-headers.diff
index 020e3bf..96aed85 100644
--- a/debian/patches/reproducible-copyright-headers.diff
+++ b/debian/patches/reproducible-copyright-headers.diff
@@ -43,8 +43,8 @@ Forwarded: no
 +import java.util.TimeZone;
  import java.util.TreeMap;
  import java.util.stream.Collectors;
- 
-@@ -246,8 +250,15 @@
+ import java.util.regex.Pattern;
+@@ -266,8 +270,15 @@
          + "}";
  
      private static String getOpenJDKCopyright() {
diff --git a/debian/patches/reproducible-javadoc-timestamp.diff b/debian/patches/reproducible-javadoc-timestamp.diff
index f425eca..f94846c 100644
--- a/debian/patches/reproducible-javadoc-timestamp.diff
+++ b/debian/patches/reproducible-javadoc-timestamp.diff
@@ -20,7 +20,7 @@ Forwarded: no
 +            if (System.getenv("SOURCE_DATE_EPOCH") != null) {
 +                dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
 +            }
-             tree.addContent(HtmlTree.META(
+             tree.add(HtmlTree.META(
                      (htmlVersion == HtmlVersion.HTML5) ? "dc.created" : "date",
                      dateFormat.format(now)));
 @@ -298,7 +304,14 @@
diff --git a/debian/patches/series b/debian/patches/series
index 8886a00..a639a7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ multiple-pkcs11-library-init.diff
 s390x-thread-stack-size.diff
 s390x-opt.diff
 jdk-getAccessibleValue.diff
-jtreg-location.diff
 jdk-i18n-pt_BR.diff
 disable-doclint-by-default.diff
 8199220.diff
@@ -40,5 +39,6 @@ ldap-timeout-test-use-ip.patch
 test-use-ip-address.patch
 nss-limited-ecc-tests.patch
 loong64-autoconf-config.diff
-8307977-proposed.diff
+jdk-8307977-proposed.patch
 use_clock64_fns_armhf.patch
+jdk-8334502.patch
diff --git a/debian/rules b/debian/rules
index 7dfa769..5f6b296 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+include /usr/share/dpkg/buildflags.mk
 
 unexport LANG LC_ALL
 
@@ -77,7 +78,7 @@ else
   is_default = yes
 endif
 
-is_upstream_release = yes
+is_upstream_release = no
 
 srcdir		= .
 builddir	= build
@@ -152,7 +153,7 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
   NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
-jtreg_pkg = jtreg6
+jtreg_pkg = jtreg7
 testng_pkg= libtestng7-java
 
 with_check = $(if $(findstring nocheck, $(DEB_BUILD_OPTIONS)),,yes)
@@ -169,7 +170,7 @@ with_docs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),,yes)
 ifneq (,$(filter $(distrel), precise trusty))
   with_docs =
 endif
-with_check = disabled for this upload
+#with_check = disabled for this upload
 
 with_wqy_zenhai = $(if $(filter $(distrel),lenny),,yes)
 
@@ -1938,7 +1939,7 @@ endif
 
 
 git_project		= jdk11u
-git_tag			= jdk-11.0.23+9
+git_tag			= jdk-11.0.24+6
 package_version		= $(subst jdk-,,$(git_tag))
 package_version		= $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
 ifneq ($(is_upstream_release),yes)
@@ -1977,6 +1978,7 @@ get-orig:
 	  rm -v -rf $$d/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE; \
 	  rm -v -rf $$d/.github; \
 	  rm -v -f $$d/.gitattributes; \
+	  rm -v -f $$d/test/jdk/sun/management/windows/revokeall.exe; \
 	esac; \
 	mv $$d $(topdir); \
 	XZ_OPT=-9v tar cfJ ../$(basename)_$(package_version).orig.tar.xz $(topdir); \