commit java-1_6_0-openjdk for openSUSE:Factory
Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Tue Feb 1 18:16:20 CET 2011. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-01-18 10:20:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-01 15:14:14.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Feb 1 08:14:18 UTC 2011 - mvyskocil@suse.cz + +- fix bnc#667313 - VUL-0: embargoed java icedtea issues +- Security updates + * RH672262, CVE-2011-0025: IcedTea jarfile signature verification bypass +- Backports + * S6687968: PNGImageReader leaks native memory through an Inflater + * S6541476, RH665355: PNG imageio plugin incorrectly handles iTXt chunk + * S6782079: PNG: reading metadata may cause OOM on truncated images +- Fixes + * PR619: Improper finalization by the plugin can crash the browser + +------------------------------------------------------------------- +Mon Jan 31 09:22:53 UTC 2011 - mvyskocil@suse.cz + +- fix bmo#582130 - symbol clash between moonlight and icedtea plugin + * icedtea6-1.9.4-moonlight-symbol-clash.patch +- mark cursor.properties a config + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- icedtea6-1.9.4.tar.bz2 New: ---- icedtea6-1.9.4-moonlight-symbol-clash.patch icedtea6-1.9.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.e1MqZv/_old 2011-02-01 18:15:37.000000000 +0100 +++ /var/tmp/diff_new_pack.e1MqZv/_new 2011-02-01 18:15:37.000000000 +0100 @@ -31,7 +31,7 @@ # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.9.4 +%define icedteaver 1.9.5 %define icedteasnapshot %{nil} %define openjdkver b20 %define openjdkdate 21_jun_2010 @@ -209,8 +209,13 @@ # PATCH-FIX-OPENSUSE: gcc 4.5 warnings Patch128: openjdk-6-src-b20-may-be-used-uninitialized.patch Patch129: openjdk-6-src-b20-array-subscript-has-type-char.patch -#PATCH-FIX-OPENSUSE: bnc#635365 +#PATCH-FIX-UPSTREAM: bnc#635365 +# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=613 Patch130: icedtea6-1.9.4-realpath.patch +#PATCH-FIX-UPSTREAM: +# https://bugzilla.mozilla.org/show_bug.cgi?id=582130 +# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 +Patch131: icedtea6-1.9.4-moonlight-symbol-clash.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -489,6 +494,7 @@ %patch0 -b .optflags %patch124 -p1 -b .no-return-in-non-void %patch130 -p1 -b .realpath +%patch131 -p1 -b .realpath %patch1000 -p1 cp %{SOURCE6} . @@ -535,6 +541,7 @@ quilt import ${1} ${2} quilt push } + qpatch -p0 %{PATCH104} qpatch -p0 %{PATCH107} %ifarch %ix86 @@ -1047,6 +1054,7 @@ %config(noreplace) %{_jvmdir}/%{jredir}/lib/*.properties %config(noreplace) %{_jvmdir}/%{jredir}/lib/management/jmxremote.access %config(noreplace) %{_jvmdir}/%{jredir}/lib/management/management.properties +%config(noreplace) %{_jvmdir}/%{jredir}/lib/images/cursors/cursors.properties %if %{suse_version} >= 1120 # links to the demo and sample dirs in noarch subpackages %{_jvmdir}/%{sdkdir}/demo ++++++ icedtea6-1.9.4-moonlight-symbol-clash.patch ++++++ Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-01-31 10:08:56.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-01-31 10:11:29.603519684 +0100 @@ -234,7 +234,7 @@ static GPid appletviewer_pid = -1; static guint appletviewer_watch_id = -1; -int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL; +int icedtea_plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL; pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER; @@ -1534,7 +1534,7 @@ gchar** command_line; gchar** environment; - if (plugin_debug) + if (icedtea_plugin_debug) { command_line = (gchar**) malloc(sizeof(gchar*)*8); command_line[0] = g_strdup(appletviewer_executable); @@ -1580,7 +1580,7 @@ g_free (command_line[1]); command_line[1] = NULL; - if (plugin_debug) + if (icedtea_plugin_debug) { g_free (command_line[2]); command_line[2] = NULL; Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.h =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaNPPlugin.h 2010-12-01 20:08:14.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.h 2011-01-31 10:11:29.595520091 +0100 @@ -96,7 +96,7 @@ extern pthread_cond_t cond_message_available; // debug switch -extern int plugin_debug; +extern int icedtea_plugin_debug; // Browser function table. extern NPNetscapeFuncs browser_functions; Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaPluginUtils.cc 2010-12-01 20:08:15.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc 2011-01-31 10:11:29.595520091 +0100 @@ -401,7 +401,7 @@ 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) @@ -415,14 +415,14 @@ (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()); } /* @@ -436,7 +436,7 @@ { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; std::string* str = new std::string(); @@ -612,7 +612,7 @@ IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector<std::string*>* str_ptr_vector) { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; std::string* str = new std::string(); @@ -636,7 +636,7 @@ IcedTeaPluginUtilities::printNPVariant(NPVariant variant) { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; if (NPVARIANT_IS_VOID(variant)) Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.h =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaPluginUtils.h 2010-12-01 20:08:15.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.h 2011-01-31 10:11:29.599519887 +0100 @@ -69,7 +69,7 @@ #define PLUGIN_DEBUG(...) \ do \ { \ - if (plugin_debug) \ + if (icedtea_plugin_debug) \ { \ fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \ fprintf (stderr, __VA_ARGS__); \ ++++++ icedtea6-1.9.4.tar.bz2 -> icedtea6-1.9.5.tar.bz2 ++++++ ++++ 5675 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de