Hello community,
here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2011-10-25 16:02:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old)
and /work/SRC/openSUSE:Factory/.icedtea-web.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icedtea-web", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2011-10-11 16:54:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2011-10-25 16:02:03.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Oct 24 09:14:10 UTC 2011 - mvyskocil@suse.cz
+
+- update to 1.1.3:
+ - PR782: Support building against npapi-sdk as well
+ * drop the added patch
+ - PR794: IcedTea-Web does not work if a Web Start app jar has a
+ Class-Path element in the manifest
+- icedtea-web-npapi-sdk-r5.patch for build with npapi-sdk we have
+ in openSUSE
+
+-------------------------------------------------------------------
Old:
----
icedtea-web-1.1.2-npapi-sdk.patch
icedtea-web-1.1.2.tar.gz
New:
----
icedtea-web-1.1.3.tar.gz
icedtea-web-npapi-sdk-r5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icedtea-web.spec ++++++
--- /var/tmp/diff_new_pack.xv4TLS/_old 2011-10-25 16:02:06.000000000 +0200
+++ /var/tmp/diff_new_pack.xv4TLS/_new 2011-10-25 16:02:06.000000000 +0200
@@ -53,8 +53,8 @@
%define pluginname IcedTeaPlugin.so
Name: icedtea-web
-Version: 1.1.2
-Release: 2
+Version: 1.1.3
+Release: 1
Summary: Java Web Start and plugin implementation
Group: Development/Languages/Java
License: GPL-2.0-with-classpath-exception
@@ -65,8 +65,7 @@
# https://bugzilla.mozilla.org/show_bug.cgi?id=582130
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622
Patch1: icedtea-web-1.1-moonlight-symbol-clash.patch
-# Deprecation of xulrunner-devel
-Patch2: icedtea-web-1.1.2-npapi-sdk.patch
+Patch2: icedtea-web-npapi-sdk-r5.patch
Patch1000: icedtea-web-suse-desktop-files.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: java-1_6_0-openjdk-devel
@@ -131,9 +130,6 @@
%patch1000 -p1
%build
-%if %{with_npapisdk}
-autoreconf -f
-%endif
%{configure} \
--with-jdk-home=%{_jvmdir}/%{sdkdir} \
--with-jre-home=%{_jvmdir}/jre/ \
++++++ icedtea-web-1.1.2.tar.gz -> icedtea-web-1.1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/AUTHORS new/icedtea-web-1.1.3/AUTHORS
--- old/icedtea-web-1.1.2/AUTHORS 2011-08-31 19:28:19.000000000 +0200
+++ new/icedtea-web-1.1.3/AUTHORS 2011-09-13 22:24:39.000000000 +0200
@@ -8,6 +8,7 @@
Mark Greenwood
Andrew John Hughes
Matthias Klose
+Michał Górny < mgorny@gentoo.org >
Francis Kung
DJ Lucas
Omair Majid
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/ChangeLog new/icedtea-web-1.1.3/ChangeLog
--- old/icedtea-web-1.1.2/ChangeLog 2011-08-31 19:30:00.000000000 +0200
+++ new/icedtea-web-1.1.3/ChangeLog 2011-09-28 22:18:24.000000000 +0200
@@ -1,3 +1,39 @@
+2011-09-28 Deepak Bhole
+
+ * NEWS: Prepare to release 1.1.3
+ * configure.ac: Same
+
+2011-09-28 Deepak Bhole
+
+ PR794: IcedTea-Web does not work if a Web Start app jar has a Class-Path
+ element in the manifest.
+ * netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
+ (retrieve): Blank out the Class-Path elements in manifest.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (activateJars): Only load Class-Path elements if this is an applet.
+ (addNewJar): Add the right permissions for the cached jar file and verify
+ signatures.
+
+2011-09-23 Omair Majid
+
+ RH738814: Access denied at ssl handshake
+ * netx/net/sourceforge/jnlp/security/SecurityDialogs.java
+ (showCertWarningDialog): Add a javadoc comment.
+ * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java
+ (askUser): Wrap the call to showCertWarningDialog in a doPrivileged
+ block.
+
+2011-09-13 Deepak Bhole
+
+ PR782: Support building against npapi-sdk as well
+ Patch from Michał Górny < mgorny at gentoo dot org >
+ * acinclude.m4: Build against npapi-sdk.
+
+2011-08-31 Deepak Bhole
+
+ * NEWS: Prepare for 1.1.3
+ * configure.ac: Same
+
2011-08-31 Deepak Bhole
* NEWS: Prepare for 1.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/NEWS new/icedtea-web-1.1.3/NEWS
--- old/icedtea-web-1.1.2/NEWS 2011-08-31 19:29:26.000000000 +0200
+++ new/icedtea-web-1.1.3/NEWS 2011-09-28 22:18:39.000000000 +0200
@@ -8,6 +8,12 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release 1.1.3 (2011-09-28):
+* Plugin
+ - PR782: Support building against npapi-sdk as well
+* Common
+ - PR794: IcedTea-Web does not work if a Web Start app jar has a Class-Path element in the manifest
+
New in release 1.1.2 (2011-08-31):
* Plugin
- PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow
@@ -16,6 +22,7 @@
- PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
- PR769: IcedTea-Web does not work with some ssl sites with OpenJDK7
- RH734081: Javaws cannot use proxy settings from Firefox
+ - RH738814: Access denied at ssl handshake
New in release 1.1.1 (2011-07-20):
* Security updates:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/acinclude.m4 new/icedtea-web-1.1.3/acinclude.m4
--- old/icedtea-web-1.1.2/acinclude.m4 2011-08-31 19:28:19.000000000 +0200
+++ new/icedtea-web-1.1.3/acinclude.m4 2011-09-13 22:24:39.000000000 +0200
@@ -372,8 +372,15 @@
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
-
+ PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
+ AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
+ # XXX: use NPAPI versions instead
+ xulrunner_cv_collapsed_version=20000000
+ ])
+ ], [
+ PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+ ])
+
AC_SUBST(MOZILLA_CFLAGS)
AC_SUBST(MOZILLA_LIBS)
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/configure new/icedtea-web-1.1.3/configure
--- old/icedtea-web-1.1.2/configure 2011-08-31 19:30:55.000000000 +0200
+++ new/icedtea-web-1.1.3/configure 2011-09-28 22:18:57.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for icedtea-web 1.1.2.
+# Generated by GNU Autoconf 2.68 for icedtea-web 1.1.3.
#
# Report bugs to .
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='icedtea-web'
PACKAGE_TARNAME='icedtea-web'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='icedtea-web 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='icedtea-web 1.1.3'
PACKAGE_BUGREPORT='distro-pkg-dev@openjdk.java.net'
PACKAGE_URL='http://icedtea.classpath.org/wiki/IcedTea-Web'
@@ -1302,7 +1302,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures icedtea-web 1.1.2 to adapt to many kinds of systems.
+\`configure' configures icedtea-web 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1372,7 +1372,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of icedtea-web 1.1.2:";;
+ short | recursive ) echo "Configuration of icedtea-web 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1498,7 +1498,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-icedtea-web configure 1.1.2
+icedtea-web configure 1.1.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1637,7 +1637,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by icedtea-web $as_me 1.1.2, which was
+It was created by icedtea-web $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2452,7 +2452,7 @@
# Define the identity of the package.
PACKAGE='icedtea-web'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -6369,6 +6369,160 @@
pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"npapi-sdk\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "npapi-sdk") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "npapi-sdk" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$MOZILLA_LIBS"; then
+ pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"npapi-sdk\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "npapi-sdk") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "npapi-sdk" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "npapi-sdk" 2>&1`
+ else
+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --print-errors "npapi-sdk" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZILLA_PKG_ERRORS" >&5
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOZILLA" >&5
+$as_echo_n "checking for MOZILLA... " >&6; }
+
+if test -n "$MOZILLA_CFLAGS"; then
+ pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$MOZILLA_LIBS"; then
+ pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mozilla-plugin" 2>&1`
+ else
+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --print-errors "mozilla-plugin" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZILLA_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (mozilla-plugin) were not met:
+
+$MOZILLA_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables MOZILLA_CFLAGS
+and MOZILLA_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables MOZILLA_CFLAGS
+and MOZILLA_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.
+See \`config.log' for more details" "$LINENO" 5; }
+
+else
+ MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
+ MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOZILLA" >&5
+$as_echo_n "checking for MOZILLA... " >&6; }
+
+if test -n "$MOZILLA_CFLAGS"; then
+ pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
ac_status=$?
@@ -6452,6 +6606,27 @@
fi
+else
+ MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
+ MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xulrunner version" >&5
+$as_echo_n "checking for xulrunner version... " >&6; }
+if ${xulrunner_cv_collapsed_version+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ # XXX: use NPAPI versions instead
+ xulrunner_cv_collapsed_version=20000000
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xulrunner_cv_collapsed_version" >&5
+$as_echo "$xulrunner_cv_collapsed_version" >&6; }
+
+fi
+
fi
@@ -6801,7 +6976,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 6804 "configure" */
+/* [#]line 6979 "configure" */
package sun.applet;
import java.util.jar.Pack200;
@@ -6851,7 +7026,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 6854 "configure" */
+/* [#]line 7029 "configure" */
package sun.applet;
import java.net.CookieManager;
@@ -6901,7 +7076,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 6904 "configure" */
+/* [#]line 7079 "configure" */
package sun.applet;
import java.net.HttpCookie;
@@ -6951,7 +7126,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 6954 "configure" */
+/* [#]line 7129 "configure" */
package sun.applet;
import java.net.CookieHandler;
@@ -7001,7 +7176,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7004 "configure" */
+/* [#]line 7179 "configure" */
package sun.applet;
import sun.security.provider.X509Factory;
@@ -7051,7 +7226,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7054 "configure" */
+/* [#]line 7229 "configure" */
package sun.applet;
import sun.security.util.SecurityConstants;
@@ -7101,7 +7276,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7104 "configure" */
+/* [#]line 7279 "configure" */
package sun.applet;
import sun.security.util.HostnameChecker;
@@ -7151,7 +7326,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7154 "configure" */
+/* [#]line 7329 "configure" */
package sun.applet;
import sun.security.x509.X500Name;
@@ -7201,7 +7376,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7204 "configure" */
+/* [#]line 7379 "configure" */
package sun.applet;
import sun.misc.BASE64Encoder;
@@ -7251,7 +7426,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7254 "configure" */
+/* [#]line 7429 "configure" */
package sun.applet;
import sun.misc.HexDumpEncoder;
@@ -7301,7 +7476,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7304 "configure" */
+/* [#]line 7479 "configure" */
package sun.applet;
import sun.security.validator.ValidatorException;
@@ -7351,7 +7526,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7354 "configure" */
+/* [#]line 7529 "configure" */
package sun.applet;
import com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager;
@@ -7401,7 +7576,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7404 "configure" */
+/* [#]line 7579 "configure" */
package sun.applet;
import sun.awt.X11.XEmbeddedFrame;
@@ -7451,7 +7626,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7454 "configure" */
+/* [#]line 7629 "configure" */
package sun.applet;
import sun.misc.Ref;
@@ -7501,7 +7676,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7504 "configure" */
+/* [#]line 7679 "configure" */
package sun.applet;
import com.sun.jndi.toolkit.url.UrlUtil;
@@ -7551,7 +7726,7 @@
mkdir -p tmp.$$/$(dirname $CLASS)
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7554 "configure" */
+/* [#]line 7729 "configure" */
package sun.applet;
import sun.applet.AppletImageRef;
@@ -7601,7 +7776,7 @@
mkdir -p tmp.$$
cd tmp.$$
cat << \EOF > $CLASS
-/* [#]line 7604 "configure" */
+/* [#]line 7779 "configure" */
import java.lang.reflect.Modifier;
public class TestAppletViewer
@@ -8417,7 +8592,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by icedtea-web $as_me 1.1.2, which was
+This file was extended by icedtea-web $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8475,7 +8650,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-icedtea-web config.status 1.1.2
+icedtea-web config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/configure.ac new/icedtea-web-1.1.3/configure.ac
--- old/icedtea-web-1.1.2/configure.ac 2011-08-31 19:29:13.000000000 +0200
+++ new/icedtea-web-1.1.3/configure.ac 2011-09-28 21:56:31.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([icedtea-web],[1.1.2],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.1.3],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile netx.manifest])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
--- old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java 2011-08-31 19:28:19.000000000 +0200
+++ new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java 2011-09-28 21:27:53.000000000 +0200
@@ -94,7 +94,24 @@
if (UrlUtils.isLocalFile(localUrl)) {
// if it is known to us, just return the cached file
- return new JarFile(localUrl.getPath());
+ JarFile returnFile = new JarFile(localUrl.getPath());
+
+ try {
+
+ // Blank out the class-path because:
+ // 1) Web Start does not support it
+ // 2) For the plug-in, we want to cache files from class-path so we do it manually
+ returnFile.getManifest().getMainAttributes().putValue("Class-Path", "");
+
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Class-Path attribute cleared for " + returnFile.getName());
+ }
+
+ } catch (NullPointerException npe) {
+ // Discard NPE here. Maybe there was no manifest, maybe there were no attributes, etc.
+ }
+
+ return returnFile;
} else {
// throw new IllegalStateException("a non-local file in cache");
return null;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java 2011-08-31 19:28:19.000000000 +0200
+++ new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java 2011-09-28 21:27:53.000000000 +0200
@@ -32,6 +32,7 @@
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.PrivilegedAction;
+import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -779,7 +780,11 @@
JarFile jarFile = new JarFile(localFile.getAbsolutePath());
Manifest mf = jarFile.getManifest();
- classpaths.addAll(getClassPathsFromManifest(mf, jar.getLocation().getPath()));
+
+ if (file instanceof PluginBridge) {
+ classpaths.addAll(getClassPathsFromManifest(mf, jar.getLocation().getPath()));
+ }
+
JarIndex index = JarIndex.getJarIndex(jarFile, null);
if (index != null)
jarIndexes.add(index);
@@ -1094,7 +1099,7 @@
* is downloaded.
* @param desc the JARDesc for the new jar
*/
- private void addNewJar(JARDesc desc) {
+ private void addNewJar(final JARDesc desc) {
available.add(desc);
@@ -1104,10 +1109,72 @@
JNLPRuntime.getDefaultUpdatePolicy()
);
- URL remoteURL = desc.getLocation();
- URL cachedUrl = tracker.getCacheURL(remoteURL);
- addURL(remoteURL);
- CachedJarFileCallback.getInstance().addMapping(remoteURL, cachedUrl);
+ // Give read permissions to the cached jar file
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ Permission p = CacheUtil.getReadPermission(desc.getLocation(),
+ desc.getVersion());
+
+ resourcePermissions.add(p);
+
+ return null;
+ }
+ });
+
+ final URL remoteURL = desc.getLocation();
+ final URL cachedUrl = tracker.getCacheURL(remoteURL); // blocks till download
+
+ available.remove(desc); // Resource downloaded. Remove from available list.
+
+ try {
+
+ // Verify if needed
+
+ final JarSigner signer = new JarSigner();
+ final List<JARDesc> jars = new ArrayList<JARDesc>();
+ jars.add(desc);
+
+ // Decide what level of security this jar should have
+ // The verification and security setting functions rely on
+ // having AllPermissions as those actions normally happen
+ // during initialization. We therefore need to do those
+ // actions as privileged.
+
+ AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+ public Void run() throws Exception {
+ signer.verifyJars(jars, tracker);
+
+ if (signer.anyJarsSigned() && !signer.getAlreadyTrustPublisher()) {
+ checkTrustWithUser(signer);
+ }
+
+ final SecurityDesc security;
+ if (signer.anyJarsSigned()) {
+ security = new SecurityDesc(file,
+ SecurityDesc.ALL_PERMISSIONS,
+ file.getCodeBase().getHost());
+ } else {
+ security = new SecurityDesc(file,
+ SecurityDesc.SANDBOX_PERMISSIONS,
+ file.getCodeBase().getHost());
+ }
+
+ jarLocationSecurityMap.put(remoteURL, security);
+
+ return null;
+ }
+ });
+
+ addURL(remoteURL);
+ CachedJarFileCallback.getInstance().addMapping(remoteURL, cachedUrl);
+
+ } catch (Exception e) {
+ // Do nothing. This code is called by loadClass which cannot
+ // throw additional exceptions. So instead, just ignore it.
+ // Exception => jar will not get added to classpath, which will
+ // result in CNFE from loadClass.
+ e.printStackTrace();
+ }
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/security/SecurityDialogs.java new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/security/SecurityDialogs.java
--- old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/security/SecurityDialogs.java 2011-08-31 19:28:19.000000000 +0200
+++ new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/security/SecurityDialogs.java 2011-09-28 21:27:48.000000000 +0200
@@ -181,6 +181,8 @@
* @param accessType the type of warning dialog to show
* @param file the JNLPFile associated with this warning
* @param jarSigner the JarSigner used to verify this application
+ *
+ * @return true if the user accepted the certificate
*/
public static boolean showCertWarningDialog(AccessType accessType,
JNLPFile file, CertVerifier jarSigner) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java
--- old/icedtea-web-1.1.2/netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java 2011-08-31 19:28:19.000000000 +0200
+++ new/icedtea-web-1.1.3/netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java 2011-09-28 21:27:48.000000000 +0200
@@ -37,7 +37,9 @@
package net.sourceforge.jnlp.security;
+import java.security.AccessController;
import java.security.KeyStore;
+import java.security.PrivilegedAction;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -379,14 +381,20 @@
* @param authType The authentication algorithm
* @return user's response
*/
- private boolean askUser(X509Certificate[] chain, String authType,
- boolean isTrusted, boolean hostMatched,
- String hostName) {
- return SecurityDialogs.showCertWarningDialog(
+ private boolean askUser(final X509Certificate[] chain, final String authType,
+ final boolean isTrusted, final boolean hostMatched,
+ final String hostName) {
+ final VariableX509TrustManager trustManager = this;
+ return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+ @Override
+ public Boolean run() {
+ return SecurityDialogs.showCertWarningDialog(
AccessType.UNVERIFIED, null,
- new HttpsCertVerifier(this, chain, authType,
+ new HttpsCertVerifier(trustManager, chain, authType,
isTrusted, hostMatched,
hostName));
+ }
+ });
}
/**
++++++ icedtea-web-npapi-sdk-r5.patch ++++++
Index: icedtea-web-1.1.3/plugin/icedteanp/IcedTeaNPPlugin.cc
===================================================================
--- icedtea-web-1.1.3.orig/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-10-24 10:44:26.000000000 +0200
+++ icedtea-web-1.1.3/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-10-24 10:45:53.357149850 +0200
@@ -2262,7 +2262,7 @@
// Returns a string describing the MIME type that this plugin
// handles.
-char*
+const char*
NP_GetMIMEDescription ()
{
PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
