Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2014-02-19 07:02:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-09-23 09:32:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2014-02-19 07:02:04.000000000 +0100 @@ -1,0 +2,26 @@ +Tue Feb 18 10:16:53 UTC 2014 - [email protected] + +- update to 1.4.2 (bnc#864364) +* Dialogs center on screen before becoming visible +* Support for u45 new manifest attributes (Application-Name) +* Custom applet permission policies panel in itweb-settings control panel +* Plugin + - PR1271: icedtea-web does not handle 'javascript:'-protocol URLs + - RH976833: Multiple applets on one page cause deadlock + - Enabled javaconsole +* Security Updates + - CVE-2013-6493/RH1010958: insecure temporary file use flaw in LiveConnect implementation +* Except above also: + - Christmas splashscreen extension + - fixed classloading deadlocks + - cleaned code from warnings + - pipes moved to XDG runtime dir +* Patches changes: + * rebased icedtea-web-1.1-moonlight-symbol-clash.patch + * add icedtea-web-1.4.2-mkdir.patch + * add icedtea-web-1.4.2-softkiller-link.patch +* build with rhino support +* use fdupes +* run make run-netx-dist-tests in %check on openSUSE > 13.1 + +------------------------------------------------------------------- Old: ---- icedtea-web-1.4.1.tar.gz New: ---- icedtea-web-1.4.2-mkdir.patch icedtea-web-1.4.2-softkiller-link.patch icedtea-web-1.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.2o7OUM/_old 2014-02-19 07:02:05.000000000 +0100 +++ /var/tmp/diff_new_pack.2o7OUM/_new 2014-02-19 07:02:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icedtea-web # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -56,7 +56,7 @@ %define pluginname IcedTeaPlugin.so Name: icedtea-web -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: Java Web Start and plugin implementation License: GPL-2.0-with-classpath-exception @@ -68,9 +68,13 @@ # 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 +#PATCH-FIX-UPSTREAM: make ~/.icedtea/security before run netx tests +Patch2: icedtea-web-1.4.2-mkdir.patch +#PATCH-FIX-UPSTREAM: add -lX11 on the end of cc's command line +Patch3: icedtea-web-1.4.2-softkiller-link.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: java-1_7_0-%{origin}-devel + # owns javadocdir # javapackages-tools now includes jpackage-utils %if 0%{?suse_version} > 1230 @@ -78,9 +82,23 @@ %else BuildRequires: jpackage-utils %endif +BuildRequires: java-1_7_0-%{origin}-devel +# because of patch2 +BuildRequires: autoconf +# junit 4 available post 13.1 +%if 0%{suse_version} > 1310 +BuildRequires: ant-junit +BuildRequires: junit > 4 +%endif +BuildRequires: fdupes +BuildRequires: gcc-c++ BuildRequires: libX11-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.9.0 +BuildRequires: procps +BuildRequires: rhino +BuildRequires: update-desktop-files +BuildRequires: zip BuildRequires: zlib-devel # IcedTeaPlugin build requirements. @@ -94,13 +112,6 @@ BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel %endif -%if %defined suse_version -BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: procps -BuildRequires: update-desktop-files -BuildRequires: zip -%endif # to make sure the new package is installed in time of post Requires(post): java-1_7_0-%{origin} @@ -138,10 +149,14 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %patch1000 -p1 %build +# because of patch2 +autoreconf -fiv %{configure} \ --with-jdk-home=%{_jvmdir}/%{sdkdir} \ --with-jre-home=%{_jvmdir}/jre/ \ @@ -167,15 +182,20 @@ %suse_update_desktop_file $d done +%fdupes -s %{buildroot}/ + # needs for sle-11-sp1 and openSUSE evergreen export NO_BRP_CHECK_BYTECODE_VERSION=true %check %{__make} check %{__make} run-cpp-unit-tests -#FIXME: disabled for the moment as certificate related tests does fail on missing files et all -#export LC_ALL=en_US.UTF-8 -#%{__make} run-netx-dist-tests + +%if 0%{suse_version} > 1310 +#needs junit4 +export LC_ALL=en_US.UTF-8 +%{__make} run-netx-dist-tests +%endif %posttrans # java-1_6_0-openjdk-plugin -> icedtea-web is remove of the first package ++++++ icedtea-web-1.1-moonlight-symbol-clash.patch ++++++ --- /var/tmp/diff_new_pack.2o7OUM/_old 2014-02-19 07:02:05.000000000 +0100 +++ /var/tmp/diff_new_pack.2o7OUM/_new 2014-02-19 07:02:05.000000000 +0100 @@ -5,11 +5,11 @@ plugin/icedteanp/IcedTeaPluginUtils.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) -Index: icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaNPPlugin.cc +Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.cc =================================================================== ---- icedtea-web-1.4pre1.orig/plugin/icedteanp/IcedTeaNPPlugin.cc -+++ icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaNPPlugin.cc -@@ -227,8 +227,8 @@ static gint instance_counter = 1; +--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaNPPlugin.cc ++++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.cc +@@ -218,8 +218,8 @@ static gint instance_counter = 1; static GPid appletviewer_pid = -1; static guint appletviewer_watch_id = -1; @@ -20,7 +20,7 @@ (strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0); pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER; -@@ -1412,14 +1412,14 @@ plugin_start_appletviewer (ITNPPluginDat +@@ -1420,14 +1420,14 @@ plugin_start_appletviewer (ITNPPluginDat command_line.push_back(COVERAGE_AGENT); #endif @@ -37,10 +37,10 @@ command_line.push_back(debug_flags); } -Index: icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaNPPlugin.h +Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.h =================================================================== ---- icedtea-web-1.4pre1.orig/plugin/icedteanp/IcedTeaNPPlugin.h -+++ icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaNPPlugin.h +--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaNPPlugin.h ++++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.h @@ -94,7 +94,7 @@ extern pthread_t itnp_plugin_thread_id; extern pthread_mutex_t pluginAsyncCallMutex; @@ -50,36 +50,10 @@ // Browser function table. extern NPNetscapeFuncs browser_functions; -Index: icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaPluginUtils.cc +Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.cc =================================================================== ---- icedtea-web-1.4pre1.orig/plugin/icedteanp/IcedTeaPluginUtils.cc -+++ icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaPluginUtils.cc -@@ -399,7 +399,7 @@ IcedTeaPluginUtilities::getUTF16LEString - - wchar_t c; - -- if (plugin_debug) printf("Converted UTF-16LE string: "); -+ if (icedtea_plugin_debug) printf("Converted UTF-16LE string: "); - - result_unicode_str->clear(); - for (int i = begin; i < begin+length; i+=2) -@@ -413,14 +413,14 @@ IcedTeaPluginUtilities::getUTF16LEString - (c >= 'A' && c <= 'Z') || - (c >= '0' && c <= '9')) - { -- if (plugin_debug) printf("%c", c); -+ if (icedtea_plugin_debug) printf("%c", c); - } - - result_unicode_str->push_back(c); - } - - // not routing via debug print macros due to wide-string issues -- if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length()); -+ if (icedtea_plugin_debug) printf(". Length=%d\n", result_unicode_str->length()); - } - - /* +--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaPluginUtils.cc ++++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.cc @@ -434,7 +434,7 @@ IcedTeaPluginUtilities::printStringVecto { @@ -107,16 +81,41 @@ return; if (NPVARIANT_IS_VOID(variant)) -Index: icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaPluginUtils.h +Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.h =================================================================== ---- icedtea-web-1.4pre1.orig/plugin/icedteanp/IcedTeaPluginUtils.h -+++ icedtea-web-1.4pre1/plugin/icedteanp/IcedTeaPluginUtils.h +--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaPluginUtils.h ++++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.h @@ -62,7 +62,7 @@ exception statement from your version. * - #define PLUGIN_DEBUG(...) \ - do \ - { \ -- if (plugin_debug) \ -+ if (icedtea_plugin_debug) \ - { \ + #define PLUGIN_DEBUG(...) \ + do \ + { \ +- if (plugin_debug) \ ++ if (icedtea_plugin_debug) \ + { \ fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \ - fprintf (stderr, __VA_ARGS__); \ + fprintf (stderr, __VA_ARGS__); \ +Index: icedtea-web-1.4.2/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc +=================================================================== +--- icedtea-web-1.4.2.orig/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc ++++ icedtea-web-1.4.2/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc +@@ -172,14 +172,14 @@ void doDebugErrorRun() { + } + + TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on) { +- bool plugin_debug_backup = plugin_debug; +- plugin_debug = true; ++ bool plugin_debug_backup = icedtea_plugin_debug; ++ icedtea_plugin_debug = true; + doDebugErrorRun(); +- plugin_debug = plugin_debug_backup; ++ icedtea_plugin_debug = plugin_debug_backup; + } + TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off) { +- bool plugin_debug_backup = plugin_debug; +- plugin_debug = false; ++ bool plugin_debug_backup = icedtea_plugin_debug; ++ icedtea_plugin_debug = false; + doDebugErrorRun(); +- plugin_debug = plugin_debug_backup; ++ icedtea_plugin_debug = plugin_debug_backup; + } ++++++ icedtea-web-1.4.2-mkdir.patch ++++++ From: [email protected] Subject: mkdir public keystore dir before keytool runs If ~/.icedtea/security does not exists, keytool fails to run. --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: icedtea-web-1.4.2/Makefile.am =================================================================== --- icedtea-web-1.4.2.orig/Makefile.am +++ icedtea-web-1.4.2/Makefile.am @@ -39,7 +39,8 @@ export PRIVATE_KEYSTORE_PASS=123456789 export EXPORTED_TEST_CERT_PREFIX=icedteatests export EXPORTED_TEST_CERT_SUFFIX=crt export TEST_CERT_ALIAS=icedteaweb -export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs +export PUBLIC_KEYSTORE_DIR=${HOME}/.icedtea/security +export PUBLIC_KEYSTORE=$(PUBLIC_KEYSTORE_DIR)/trusted.certs export PUBLIC_KEYSTORE_PASS=changeit export SOFTKILLER=softkiller @@ -642,6 +643,7 @@ stamps/junit-jnlp-dist-signed.stamp: touch $@ stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp stamps/netx-dist.stamp stamps/plugin.stamp + mkdir -p $(PUBLIC_KEYSTORE_DIR) ; \ types=($(ALL_NONCUSTOM_REPRODUCERS)); \ for which in "$${types[@]}" ; do \ . $(abs_top_srcdir)/NEW_LINE_IFS ; \ ++++++ icedtea-web-1.4.2-softkiller-link.patch ++++++ From: [email protected] Subject: Put linker flag on the end of command line With original order, binutils 2.24 with --as-needed flag will Index: icedtea-web-1.4.2/tests/softkiller/Makefile =================================================================== --- icedtea-web-1.4.2.orig/tests/softkiller/Makefile +++ icedtea-web-1.4.2/tests/softkiller/Makefile @@ -2,7 +2,7 @@ # (this function does not exist in C89/ANSI C) softkiller: softkiller.c - $(CC) -Wall -pedantic -std=c99 -o $@ -lX11 $< + $(CC) -Wall -pedantic -std=c99 -o $@ $< -lX11 clean: rm softkiller ++++++ icedtea-web-1.4.1.tar.gz -> icedtea-web-1.4.2.tar.gz ++++++ ++++ 15261 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
