Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2016-01-28 17:24:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old) and /work/SRC/openSUSE:Factory/.icedtea-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icedtea-web" Changes: -------- --- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2015-11-12 19:40:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2016-01-28 17:25:26.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Jan 18 08:12:44 UTC 2016 - [email protected] + +- Let java-VERSION-openjdk-plugin supplement java-VERSION-openjdk + only and not the generic java-openjdk (bsc#929464) + +------------------------------------------------------------------- +Wed Jan 13 08:26:03 UTC 2016 - [email protected] + +- Added patch: + * icedtea-web-1.6.1-HexDumpEncoder.patch + - Adapt to the move of HexDumpEncoder from sun.misc to + sun.security.utils from jdk-9+99. + +------------------------------------------------------------------- @@ -111 +125 @@ -- Update to 1.5.2 +- Update to 1.5.2 (fate#318956) java-1_7_0-openjdk-plugin.changes: same change java-1_8_0-openjdk-plugin.changes: same change New: ---- icedtea-web-1.6.1-HexDumpEncoder.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.ZQVHLI/_old 2016-01-28 17:25:27.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQVHLI/_new 2016-01-28 17:25:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icedtea-web # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ java-1_7_0-openjdk-plugin.spec ++++++ --- /var/tmp/diff_new_pack.ZQVHLI/_old 2016-01-28 17:25:27.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQVHLI/_new 2016-01-28 17:25:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-1_7_0-openjdk-plugin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,7 @@ Url: http://icedtea.classpath.org Source0: http://icedtea.classpath.org/download/source/icedtea-web-%{version}.tar.gz Patch0: icedtea-web-1.6.1-doInit.patch +Patch1: icedtea-web-1.6.1-HexDumpEncoder.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRequires: %{java_name}-devel >= %{javaver} # IcedTeaPlugin build requirements. @@ -56,8 +57,8 @@ # Postun requires alternatives to uninstall tool alternatives. Requires(postun): update-alternatives Suggests: icedtea-web-javadoc -# bnc#737105/FATE#313084 -Supplements: packageand(browser(npapi):java-openjdk) +# bnc#737105/FATE#313084/bsc#929464 +Supplements: packageand(browser(npapi):%{java_name}) Provides: icedtea-web = %{version}-%{release} Provides: java-plugin = %{javaver} Obsoletes: icedtea-web < %{version}-%{release} @@ -83,6 +84,7 @@ %prep %setup -q -n icedtea-web-%{version} %patch0 -p1 +%patch1 -p1 %patch1000 -p1 %build java-1_8_0-openjdk-plugin.spec: same change ++++++ icedtea-web-1.6.1-HexDumpEncoder.patch ++++++ --- a/acinclude.m4 Thu Jan 14 12:22:37 2016 +0100 +++ b/acinclude.m4 Thu Jan 14 16:28:48 2016 +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; + +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")); + } + } +} +] +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]) --- a/configure.ac Thu Jan 14 12:22:37 2016 +0100 +++ b/configure.ac Thu Jan 14 16:28:48 2016 +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]) --- a/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 14 12:22:37 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 14 16:28:48 2016 +0100 @@ -43,8 +43,15 @@ import java.security.cert.CertPath; import java.security.cert.X509Certificate; import java.security.MessageDigest; +/** + * Do not remove this two unused imports, nor expands its "*" call. + * It is workaround to allow itw to run on jdk8 and older and also on jdk9 and newer + */ -import sun.misc.HexDumpEncoder; +// jdk8 is using sun.misc.HexDumpEncoder, +import sun.misc.*; +// jdk9 is using sun.security.util.HexDumpEncoder +import sun.security.util.*; import sun.security.x509.*; import javax.swing.*; import javax.swing.event.*;
