Merge ~vpa1977/ubuntu/+source/icedtea-web:java21-ftbfs into ubuntu/+source/icedtea-web:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]
 - basic functionality test:
$wget https://docs.oracle.com/javase/tutorialJWS/samples/deployment/dynamictree_webstartJWSProject/dynamictree_webstart.jnlp

$/usr/share/icedtea-web/bin/javaws.sh dynamictree_webstart.jnlp
The applet should start without exceptions.
----
ARNING: package sun.applet not in java.desktop
WARNING: package com.sun.net.ssl.internal.ssl not in java.base
WARNING: A command line option has enabled the Security Manager
WARNING: The Security Manager is deprecated and will be removed in a future release
Gtk-Message: 00:27:28.931: Failed to load module "canberra-gtk-module"
WARNING: A terminally deprecated method in java.lang.System has been called
WARNING: System::setSecurityManager has been called by net.sourceforge.jnlp.runtime.JNLPRuntime
WARNING: Please consider reporting this to the maintainers of net.sourceforge.jnlp.runtime.JNLPRuntime
WARNING: System::setSecurityManager will be removed in a future release
Unable to use Firefox's proxy settings. Using "DIRECT" as proxy type.
Codebase matches codebase manifest attribute, but application is unsigned. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
The 'permissions' attribute is 'sandbox' and the applet is signed. Forcing sandbox.
The 'permissions' attribute is 'sandbox' and the applet is signed. Forcing sandbox.
Starting application [webstartComponentArch.DynamicTreeApplication] ...
----
Test pass.

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15789203/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/icedtea-web/+bug/2053208/comments/1

diff --git a/debian/changelog b/debian/changelog
index d294113..454d91d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+icedtea-web (1.8.8-2ubuntu1) noble; urgency=medium
+
+  * d/p/jdk-21-*: add Java 21 compatibility patches (LP: #2053208).
+
+ -- Vladimir Petko <[e-mail]>  Thu, 15 Feb 2024 20:50:42 +1300
+
 icedtea-web (1.8.8-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 175a02f..54b8350 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: icedtea-web
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Matthias Klose <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12),
diff --git a/debian/patches/jdk-21-autoconf.patch b/debian/patches/jdk-21-autoconf.patch
new file mode 100644
index 0000000..2c3f9af
--- /dev/null
+++ b/debian/patches/jdk-21-autoconf.patch
@@ -0,0 +1,74 @@
+Description: Support compilation with JDK 21
+ Modify autoconf scripts to support compilation with JDK 21.
+ Upstream has removed autoconf/make-based building, but hasn't
+ released it yet. So, this patch need not be forwarded upstream. 
+Author: Pushkar Kulkarni <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052691 
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -846,10 +846,12 @@
+   AC_MSG_RESULT($JAVA_VERSION)
+   if test "${JAVA_VERSION}" -eq "8"; then
+     HAVE_JAVA8="yes"
++  elif test "$JAVA_VERSION" -ge "21"; then
++    HAVE_JAVA21="yes"
+   elif test "$JAVA_VERSION" -ge "9"; then
+     HAVE_JAVA9="yes"
+   fi
+-  if test -z "$HAVE_JAVA8" -a -z "$HAVE_JAVA9"; then
++  if test -z "$HAVE_JAVA8" -a -z "$HAVE_JAVA9" -a -z "$HAVE_JAVA21"; then
+     AC_MSG_ERROR([JDK8 or newer is required, detected was: $JAVA_VERSION])
+   fi
+   if ! test -z "$HAVE_JAVA8"; then
+@@ -861,6 +863,7 @@
+   AC_SUBST(VERSION_DEFS)
+   AM_CONDITIONAL([HAVE_JAVA8], test x"${HAVE_JAVA8}" = "xyes")
+   AM_CONDITIONAL([HAVE_JAVA9], test x"${HAVE_JAVA9}" = "xyes")
++  AM_CONDITIONAL([HAVE_JAVA21], test x"${HAVE_JAVA21}" = "xyes")
+ ])
+ 
+ AC_DEFUN_ONCE([IT_FIND_KEYTOOL],
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,11 +149,14 @@
+ dnl IT575 - Plugin depends on com.sun/jndi.toolkit.url.UrlUtil
+ dnl IT576 - Plugin depends on sun.applet.AppletImageRef
+ dnl IT578 - Remove need for patching AppletPanel for Plugin/Webstart
+-if test x"$HAVE_JAVA9" = xyes ; then
++if test x"$HAVE_JAVA9" = xyes -o x"$HAVE_JAVA21" = xyes ; then
+   JAVA_BASE=java.base
+   JAVA_DESKTOP=java.desktop
+   JAVA_NAMING=java.naming
+ fi
++if test x"$HAVE_JAVA21" = xyes ; then
++  JDK_JARTOOL=jdk.jartool
++fi
+ IT_CHECK_FOR_CLASS(JAVA_NET_COOKIEMANAGER, [java.net.CookieManager], [some.pkg], [])
+ IT_CHECK_FOR_CLASS(JAVA_NET_HTTPCOOKIE, [java.net.HttpCookie], [some.pkg], [])
+ IT_CHECK_FOR_CLASS(JAVA_NET_COOKIEHANDLER, [java.net.CookieHandler], [some.pkg], [])
+@@ -163,13 +166,17 @@
+ IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name], [some.pkg], [$JAVA_BASE])
+ IT_CHECK_FOR_CLASS(SUN_SECURITY_ACTION_GETPROPERTYACTION, [sun.security.action.GetPropertyAction], [some.pkg], [$JAVA_BASE])
+ # the classname cant be substitued by variable, as it is substituted to inner class
+-if test x"$HAVE_JAVA9" = xyes ; then
++if test x"$HAVE_JAVA21" = xyes ; then
+   IT_CHECK_FOR_CLASS(HEXDUMPENCODER, [sun.security.util.HexDumpEncoder], [some.pkg], [$JAVA_BASE])
+-  IT_CHECK_FOR_CLASS(SUN_MISC_JARINDEX, [jdk.internal.util.jar.JarIndex], [some.pkg], [$JAVA_BASE])
+ else
+-  IT_CHECK_FOR_CLASS(HEXDUMPENCODER, [sun.misc.HexDumpEncoder], [some.pkg], [$JAVA_BASE])
+-  IT_CHECK_FOR_CLASS(SUN_MISC_JARINDEX, [sun.misc.JarIndex], [some.pkg], [$JAVA_BASE])
+-  IT_CHECK_FOR_CLASS(SUN_MISC_LAUNCHER, [sun.misc.Launcher], [some.pkg], [$JAVA_BASE])
++  if test x"$HAVE_JAVA9" = xyes ; then
++    IT_CHECK_FOR_CLASS(HEXDUMPENCODER, [sun.security.util.HexDumpEncoder], [some.pkg], [$JAVA_BASE])
++    IT_CHECK_FOR_CLASS(SUN_MISC_JARINDEX, [jdk.internal.util.jar.JarIndex], [some.pkg], [$JAVA_BASE])
++  else
++    IT_CHECK_FOR_CLASS(HEXDUMPENCODER, [sun.misc.HexDumpEncoder], [some.pkg], [$JAVA_BASE])
++    IT_CHECK_FOR_CLASS(SUN_MISC_JARINDEX, [sun.misc.JarIndex], [some.pkg], [$JAVA_BASE])
++    IT_CHECK_FOR_CLASS(SUN_MISC_LAUNCHER, [sun.misc.Launcher], [some.pkg], [$JAVA_BASE])
++  fi
+ fi
+ IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException], [some.pkg], [$JAVA_BASE])
+ IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE, [sun.net.www.protocol.jar.URLJarFile], [some.pkg], [$JAVA_BASE])
diff --git a/debian/patches/jdk-21-jarindex.patch b/debian/patches/jdk-21-jarindex.patch
new file mode 100644
index 0000000..9c90fb3
--- /dev/null
+++ b/debian/patches/jdk-21-jarindex.patch
@@ -0,0 +1,38 @@
+Description: Support for compilation with JDK 21
+ Adds a dummy implementation of JarIndex to support compilation with JDK 21.
+ Most of the JDK's JarIndex functionality was moved to an internal class.
+Origin: upstream, https://github.com/AdoptOpenJDK/IcedTea-Web/commits/b2fb1428e81620c15025bda373f949eb79edbbb4
+Author: Stephan Classen <[e-mail]>
+Bug: https://github.com/AdoptOpenJDK/IcedTea-Web/pull/925
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052691
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java
++++ b/netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java
+@@ -28,7 +28,7 @@
+                 jarIndexClass = Class.forName("jdk.internal.util.jar.JarIndex");
+             } catch (ClassNotFoundException exx) {
+                 OutputController.getLogger().log(exx);
+-                throw new RuntimeException("JarIndex not found!");
++                jarIndexClass = JarIndexDummy.class;
+             }
+         }
+     }
+@@ -71,4 +71,17 @@
+         return (LinkedList<String>) o;
+     }
+
++    /**
++     * Because starting of JAVA 21 the JarIndex is no longer supported we provide a dummy implementation which always returns {@code null}.
++     */
++    @SuppressWarnings("unused")
++    private static class JarIndexDummy {
++        public static Object getJarIndex(JarFile jar) {
++            return null;
++        }
++
++        public Object get(String fileName) {
++            return null;
++        }
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 247c316..5ac9511 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ java11-compatibility.diff
 reproducible-documentation.patch
 remove-pack200-support.patch
 build-with-java17.diff
+jdk-21-autoconf.patch
+jdk-21-jarindex.patch