Another jdk9 patch :)

[Jiri Vanek]

On 01/13/2016 10:12 AM, Fridrich Strba wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hello, good people,
>
> Our friends moved the sun.misc.HexDumpEncoder class to
> sun.security.util.HexDumpEncoder. That is why icedtea-web's configure
> will bomb on anything that is higher then tag jdk-9+98.
>
> I fixed it in a way that allows us to use the same code for 1.7 - 1.9.
> Please check whether I did not do anything stupid.

Hello, thanx for patch. It looks reasonable.

Few nits inline:
>
> Cheers
>
> F.
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
>
> iEYEARECAAYFAlaWFPEACgkQu9a1imXPdA8FmACffOrJ1o6naVE78yFPinyo/usp
> 428An1iDTNtzVGbcHWuJjJEkDPhQF+Tj
> =Dn3W
> -----END PGP SIGNATURE-----
>
>
> icedtea-web-1.6.1-HexDumpEncoder.patch
>
>
> --- icedtea-web-1.6.1/acinclude.m4	2015-09-11 15:02:04.248280085 +0200
> +++ icedtea-web-1.6.1/acinclude.m4	2016-01-13 10:06:42.480544938 +0100
> @@ -500,6 +500,55 @@
>   AC_PROVIDE([$0])dnl
>   ])
>
> +dnl Macro to check for a Java class HexDumpEncoder
> +AC_DEFUN([IT_CHECK_FOR_HEXDUMPENCODER],[
> +AC_REQUIRE([IT_FIND_JAVAC])
> +AC_REQUIRE([IT_FIND_JAVA])
> +AC_CACHE_CHECK([if HexDumpEncoder is available], it_cv_HEXDUMPENCODER, [
> +CLASS=sun/applet/Test.java
> +BYTECODE=$(echo $CLASS|sed 's#\.java##')
> +mkdir -p tmp.$$/$(dirname $CLASS)
> +cd tmp.$$
> +cat << \EOF > $CLASS
> +[/* [#]line __oline__ "configure" */
> +package sun.applet;

Have it really to be sun.applet? Is new modular system preventing to have it in different package?
> +
> +import sun.misc.*;
> +import sun.security.util.*;
> +
> +public class Test
> +{
> +  public static void main(String[] args)
> +    throws Exception
> +  {
> +    try {
> +      System.out.println(Class.forName("sun.misc.HexDumpEncoder"));
> +    } catch (ClassNotFoundException e) {
> +      System.out.println(Class.forName("sun.security.util.HexDumpEncoder"));

Once this class is not found What is output of the macro (when used by configure). Simple "no" or 
the stacktrace?

If whole stacktrace, then I would go with something:
{
   public static void main(String[] args)
     throws Exception
   {
     try {
       System.out.println(Class.forName("sun.misc.HexDumpEncoder"));
     } catch (Exception e) {
        try {
       System.out.println(Class.forName("sun.security.util.HexDumpEncoder"));
         } catch (Exception e) {
           System.out.println("no");
           System.exit(1)
         }
     }
   }
}
But I did not tried, so I may be compeltly worng.

> +    }
> +  }
> +}
> +]
> +EOF
> +if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
> +  if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
> +      it_cv_HEXDUMPENCODER=yes;
> +  else
> +      it_cv_HEXDUMPENCODER=no;
> +  fi
> +else
> +  it_cv_HEXDUMPENCODER=no;
> +fi
> +])
> +rm -f $CLASS *.class
> +cd ..
> +# should be rmdir but has to be rm -rf due to sun.applet usage
> +rm -rf tmp.$$
> +if test x"${it_cv_HEXDUMPENCODER}" = "xno"; then
> +   AC_MSG_ERROR([HexDumpEncoder not found.])
> +fi
> +])
> +
>   AC_DEFUN_ONCE([IT_CHECK_FOR_MERCURIAL],
>   [
>     AC_PATH_TOOL([HG],[hg])
> --- icedtea-web-1.6.1/configure.ac	2015-09-11 15:02:04.250280108 +0200
> +++ icedtea-web-1.6.1/configure.ac	2016-01-13 09:45:55.600618707 +0100
> @@ -68,7 +68,7 @@
>
>   dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
>   dnl IT563 - NetX uses sun.security code
> -dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
> +dnl IT605 - NetX depends on sun.misc HexDumpEncoder or sun.security.util.HexDumpEncoder
>   dnl IT570 - NetX depends on sun.applet.AppletViewPanel
>   dnl IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java
>   dnl IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java
> @@ -83,7 +83,7 @@
>   IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants])
>   IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker])
>   IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name])
> -IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder])
> +IT_CHECK_FOR_HEXDUMPENCODER
>   IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException])
>   IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER,
>   	[com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager])
> --- icedtea-web-1.6.1/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java	2015-09-11 15:02:04.346281206 +0200
> +++ icedtea-web-1.6.1/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java	2016-01-13 09:39:09.917717835 +0100
> @@ -44,7 +44,8 @@
>   import java.security.cert.X509Certificate;
>   import java.security.MessageDigest;
>
> -import sun.misc.HexDumpEncoder;
I would put comment there
> +import sun.misc.*;
and there, expalining why "*" is used. Most IDes is marking it as warning, so there is risk of 
evaluating thsoe stars and so reintroduce the bug.

> +import sun.security.util.*;
>   import sun.security.x509.*;
>   import javax.swing.*;
>   import javax.swing.event.*;
>


Thanx!

   J.