Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:11.3 checked in at Mon Feb 28 17:28:26 CET 2011. -------- --- old-versions/11.3/UPDATES/all/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-01 15:15:24.000000000 +0100 +++ 11.3/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-24 16:21:11.000000000 +0100 @@ -1,0 +2,35 @@ +Thu Feb 24 15:21:02 UTC 2011 - mvyskocil@suse.cz + +- fix bnc#671714 - VUL-0: java-1_6_0-openjdk: permissions assigned to applets + with multiple JARs (icedtea6-1.9.7) +- Security updates + * S6878713, CVE-2010-4469: Hotspot backward jsr heap corruption + * S6907662, CVE-2010-4465: Swing timer-based security manager bypass + * S6994263, CVE-2010-4472: Untrusted code allowed to replace DSIG/C14N implementation + * S6981922, CVE-2010-4448: DNS cache poisoning by untrusted applets + * S6983554, CVE-2010-4450: Launcher incorrect processing of empty library path entries + * S6985453, CVE-2010-4471: Java2D font-related system property leak + * S6927050, CVE-2010-4470: JAXP untrusted component state manipulation + * RH677332, CVE-2011-0706: Multiple signers privilege escalation +- Bug fixes + * RH676659: Pass -export-dynamic flag to linker using -Wl, as option in gcc 4.6+ is broken + * G344659: Fix issue when building on SPARC + * Fix latent JAXP bug caused by missing import +- patches changes: + * obsoletes stack-protector patches (already upstreamed) + * modified openjdk-6-src-b20-initialized-after.patch + * modified openjdk-6-src-b20-no-werror.patch + * openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch + * add openjdk-6-src-b20-stringcompare.patch + * add openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch + * add openjdk-6-src-b20-gcj-workaround.patch (11.2/x86_64 workaround) + +------------------------------------------------------------------- +Tue Feb 15 09:28:02 UTC 2011 - mvyskocil@suse.cz + +- fix bnc#670304 - VUL-1: java-1_6_0-openjdk: denial of service using floats + icedtea6-1.9.6 +- Security updates + * S4421494, CVE-2010-4476: infinite loop while parsing double literal. + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- 0803c0f69b51.tar.gz icedtea6-1.9.5.tar.bz2 openjdk-6-src-b17-stack-protector-fclose.patch openjdk-6-src-b17-stack-protector.patch New: ---- 13edc857b967.tar.gz icedtea6-1.9.7.tar.gz openjdk-6-src-b20-gcj-workaround.patch openjdk-6-src-b20-stringcompare.patch openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.2evaAn/_old 2011-02-28 17:28:15.000000000 +0100 +++ /var/tmp/diff_new_pack.2evaAn/_new 2011-02-28 17:28:15.000000000 +0100 @@ -16,6 +16,8 @@ # +%define gcjbootstrap 1 + %define jit_arches %{ix86} x86_64 # Turn on/off some features depending on openSUSE version %define with_systemtap 0 @@ -26,12 +28,15 @@ %endif %endif -%define gcjbootstrap 0 +# XXX: systemtap does not work with gcj +%if %{gcjbootstrap} +%define with_systemtap 0 +%endif # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.9.5 +%define icedteaver 1.9.7 %define icedteasnapshot %{nil} %define openjdkver b20 %define openjdkdate 21_jun_2010 @@ -139,9 +144,7 @@ Group: Development/Languages/Java License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://openjdk.java.net/ -# hg clone http://icedtea.classpath.org/hg/icedtea6-%{icedteaver} icedtea6-%{icedteaver} -# tar --exclude-vcs -cjf icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 icedtea6-%{icedteaver} -Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 +Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz # # download the openjdk from http://download.java.net/openjdk/jdk6/promoted/latest/ # sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz Source1: %{fedorazip} @@ -152,7 +155,7 @@ Source5: mauve-%{mauvedate}.tar.bz2 # from Fedora rpm Source6: mauve_tests -Source7: %{hotspoturl}0803c0f69b51.tar.gz +Source7: %{hotspoturl}13edc857b967.tar.gz Source8: %{jaxpurl}jdk6-jaxp-%{openjdkver}.zip Source9: %{jafurl}jdk6-jaf-%{openjdkver}.zip Source10: %{jaxwsurl}jdk6-jaxws-%{openjdkver}.zip @@ -198,12 +201,6 @@ Patch123: openjdk-6-src-b20-no-werror.patch # PATCH-FIX-OPENSUSE: the no-return-in-non-void againd - sent to upstream Patch124: icedtea6-1.7-no-return-in-non-void.patch -# PATCH-FIX-UPSTREAM: bnc#589021 -# http://cr.openjdk.java.net/~aph/6929067-jdk7-webrev-4/ -Patch125: openjdk-6-src-b17-stack-protector.patch -# PATCH-FIX-OPENSUSE: bnc#603316 -# The stack protector patch did not close the /proc/self/maps correctly -Patch126: openjdk-6-src-b17-stack-protector-fclose.patch # PATCH-FIX-OPENSUSE: gcc 4.5 warnings Patch127: openjdk-6-src-b20-defined-but-not-used.patch # PATCH-FIX-OPENSUSE: gcc 4.5 warnings @@ -216,6 +213,12 @@ # 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-OPENSUSE: the no-return-in-non-void again - now in openjdk-ecj +Patch132: openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch +# PATCH-FIX-OPENSUSE: the string and literal compare fix +Patch133: openjdk-6-src-b20-stringcompare.patch +# PATCH-FIX-OPENSUSE: gcj on 11.2/x86_64 returns the NPE on this file - assume because of comments +Patch134: openjdk-6-src-b20-gcj-workaround.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -517,11 +520,17 @@ --enable-nss \ --enable-plugin \ %endif + --with-hotspot-build=hs19 \ --with-hotspot-src-zip=%{SOURCE7} \ --with-jaf-drop-zip=%{SOURCE9} \ --with-jaxp-drop-zip=%{SOURCE8} \ --with-jaxws-drop-zip=%{SOURCE10} \ +%if %{gcjbootstrap} + --with-gcj-home=%{_jvmdir}/java-gcj \ + --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \ +%else --with-openjdk=%{_jvmdir}/%{sdkdir} \ +%endif --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} @@ -559,11 +568,12 @@ %{PATCH121} \ %{PATCH122} \ %{PATCH123} \ - %{PATCH125} \ - %{PATCH126} \ %{PATCH127} \ %{PATCH128} \ - %{PATCH129} + %{PATCH129} \ + %{PATCH132} \ + %{PATCH133} \ + %{PATCH134} do qpatch -p1 ${PATCH} done @@ -834,6 +844,11 @@ %post #bnc#648260 - workaround sed -i '/pack200/d' /var/lib/rpm/alternatives/java +#fix of the previous workaround ;-) bnc#669716 +#this will collect all empty lines in Sun Java alternatives +if [ -f %{_libexecdir}/%{name}/javafix ]; then + /bin/sh %{_libexecdir}/%{name}/javafix +fi ext=.gz update-alternatives \ --install %{_bindir}/java java %{jrebindir}/java %{priority} \ ++++++ 0803c0f69b51.tar.gz -> 13edc857b967.tar.gz ++++++ old-versions/11.3/UPDATES/all/java-1_6_0-openjdk/0803c0f69b51.tar.gz 11.3/java-1_6_0-openjdk/13edc857b967.tar.gz differ: char 5, line 1 ++++++ openjdk-6-src-b20-gcj-workaround.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java +++ icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java @@ -1,28 +1,3 @@ -/* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - package com.sun.source.tree; /** ++++++ openjdk-6-src-b20-initialized-after.patch ++++++ --- /var/tmp/diff_new_pack.2evaAn/_old 2011-02-28 17:28:16.000000000 +0100 +++ /var/tmp/diff_new_pack.2evaAn/_new 2011-02-28 17:28:16.000000000 +0100 @@ -1,7 +1,7 @@ -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp @@ -234,18 +234,18 @@ class ReferenceProcessor : public CHeapO // constructor ReferenceProcessor(): @@ -26,10 +26,10 @@ {} ReferenceProcessor(MemRegion span, bool atomic_discovery, -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/dependencies.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/dependencies.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp @@ -411,15 +411,15 @@ class Dependencies: public ResourceObj { public: @@ -50,10 +50,10 @@ _bytes(code->dependencies_begin()) { initial_asserts(code->dependencies_size()); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp @@ -151,7 +151,7 @@ class FilterIntoCSClosure: public OopClo public: FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl, @@ -72,11 +72,11 @@ template <class T> void do_oop_nv(T* p); virtual void do_oop(oop* p) { do_oop_nv(p); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -@@ -514,7 +514,7 @@ class SymbolHashMapEntry : public CHeapO +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp +@@ -589,7 +589,7 @@ class SymbolHashMapEntry : public CHeapO void set_value(u2 value) { _value = value; } SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value) @@ -85,11 +85,11 @@ }; // End SymbolHashMapEntry class -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/generation.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/generation.hpp -@@ -671,7 +671,8 @@ class OneContigSpaceCardGeneration: publ +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp +@@ -673,7 +673,8 @@ class OneContigSpaceCardGeneration: publ int level, GenRemSet* remset, ContiguousSpace* space) : CardGeneration(rs, initial_byte_size, level, remset), @@ -99,10 +99,10 @@ {} inline bool is_in(const void* p) const; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/watermark.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/watermark.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp @@ -40,8 +40,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC { void set_point(HeapWord* p) { _point = p; } @@ -114,29 +114,28 @@ }; inline bool operator==(const WaterMark& x, const WaterMark& y) { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp -@@ -70,11 +70,11 @@ class CollectorPolicy : public CHeapObj - size_t _max_alignment; +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp +@@ -83,11 +83,11 @@ class CollectorPolicy : public CHeapObj + bool _all_soft_refs_clear; CollectorPolicy() : - _min_alignment(1), - _max_alignment(1), _initial_heap_byte_size(0), _max_heap_byte_size(0), -- _min_heap_byte_size(0) -+ _min_heap_byte_size(0), + _min_heap_byte_size(0), + _min_alignment(1), -+ _max_alignment(1) - {} - - public: -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp ++ _max_alignment(1), + _size_policy(NULL), + _should_clear_all_soft_refs(false), + _all_soft_refs_clear(false) +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp @@ -44,7 +44,7 @@ class GenerationCounters: public CHeapOb // This constructor is only meant for use with the PSGenerationCounters // constructor. The need for such an constructor should be eliminated @@ -146,10 +145,10 @@ public: GenerationCounters(const char* name, int ordinal, int spaces, -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/space.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/space.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/space.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/space.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp @@ -328,7 +328,7 @@ public: DirtyCardToOopClosure(Space* sp, OopClosure* cl, CardTableModRefBS::PrecisionStyle precision, @@ -159,10 +158,10 @@ _min_done(NULL) { NOT_PRODUCT(_last_bottom = NULL); NOT_PRODUCT(_last_explicit_min_done = NULL); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp @@ -314,8 +314,8 @@ class VM_FindDeadlocks: public VM_Operat outputStream* _out; @@ -174,10 +173,10 @@ ~VM_FindDeadlocks(); DeadlockCycle* result() { return _deadlocks; }; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp @@ -309,8 +309,8 @@ public: // A plain safepoint advertises no memory effects (NULL): const TypePtr* adr_type = NULL) @@ -199,10 +198,10 @@ { #ifndef PRODUCT _counter = NULL; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/type.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/type.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/type.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/type.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp @@ -575,7 +575,7 @@ class TypePtr : public Type { public: enum PTR { TopPTR, AnyNull, Constant, Null, NotNull, BotPTR, lastPTR }; @@ -212,10 +211,10 @@ virtual bool eq( const Type *t ) const; virtual int hash() const; // Type specific hashing static const PTR ptr_meet[lastPTR][lastPTR]; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/machnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/machnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp @@ -780,7 +780,7 @@ public: uint _block_num; @@ -225,10 +224,10 @@ labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {} -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/runtime.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/runtime.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp @@ -64,8 +64,8 @@ private: NamedCounter(const char *n, CounterTag tag = NoTag): _name(n), @@ -240,10 +239,10 @@ const char * name() const { return _name; } int count() const { return _count; } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/block.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/block.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/block.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/block.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp @@ -47,7 +47,7 @@ protected: public: Arena *_arena; // Arena to allocate in @@ -277,10 +276,10 @@ set_next(b, NULL); set_prev(b, NULL); }; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp @@ -299,9 +299,9 @@ public: : _parent(0), _next(0), _child(0), _head(head), _tail(tail), @@ -293,10 +292,10 @@ { } // Is 'l' a member of 'this'? -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/subnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/subnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp @@ -278,7 +278,7 @@ class BoolNode : public Node { virtual uint size_of() const; public: @@ -306,10 +305,10 @@ init_class_id(Class_Bool); } // Convert an arbitrary int value to a Bool or other suitable predicate. -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp @@ -139,7 +139,7 @@ class ImplicitExceptionTable VALUE_OBJ_C implicit_null_entry *adr( uint idx ) const { return &_data[2*idx]; } ReallocMark _nesting; // assertion check for reallocations @@ -319,11 +318,11 @@ // (run-time) construction from nmethod ImplicitExceptionTable( const nmethod *nm ); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp -@@ -165,13 +165,13 @@ void MatchList::output(FILE *fp) { +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +@@ -166,13 +166,13 @@ void MatchList::output(FILE *fp) { ArchDesc::ArchDesc() : _globalNames(cmpstr,hashstr, Form::arena), @@ -341,10 +340,10 @@ // Initialize the opcode to MatchList table with NULLs for( int i=0; i<_last_opcode; ++i ) { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/forms.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/forms.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp @@ -142,7 +142,7 @@ public: // Public Methods @@ -354,10 +353,10 @@ ~Form() {}; virtual bool ideal_only() const { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp @@ -29,8 +29,8 @@ //----------------------------ADLParser---------------------------------------- // Create a new ADL parser @@ -369,10 +368,10 @@ _AD._syntax_errs = _AD._semantic_errs = 0; // No errors so far this file _AD._warnings = 0; // No warnings either _curline = _ptr = NULL; // No pointers into buffer yet -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/arena.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/arena.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp @@ -71,7 +71,7 @@ Arena::Arena() { } @@ -382,10 +381,10 @@ set_size_in_bytes(a->size_in_bytes()); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp @@ -52,11 +52,11 @@ public: // doubled in size; the total amount of EXTRA times all hash functions are // computed for the doubling is no more than the current size - thus the @@ -400,10 +399,10 @@ init(); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp @@ -29,7 +29,7 @@ using namespace std; //------------------------------FileBuff--------------------------------------- @@ -422,10 +421,10 @@ _next = NULL; // No chained regions } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp @@ -182,8 +182,8 @@ void RegisterForm::output(FILE *fp) { RegDef::RegDef(char *regname, char *callconv, char *c_conv, char * idealtype, char * encode, char * concrete) : _regname(regname), _callconv(callconv), _c_conv(c_conv), ++++++ openjdk-6-src-b20-no-werror.patch ++++++ --- /var/tmp/diff_new_pack.2evaAn/_old 2011-02-28 17:28:17.000000000 +0100 +++ /var/tmp/diff_new_pack.2evaAn/_new 2011-02-28 17:28:17.000000000 +0100 @@ -1,8 +1,17 @@ -Index: icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/gcc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/linux/makefiles/gcc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/gcc.make -@@ -111,7 +111,8 @@ else +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -118,7 +118,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +@@ -130,7 +130,8 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif @@ -12,10 +21,10 @@ # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) -Index: icedtea6-1.9.1/openjdk/jdk/make/common/Defs-linux.gmk +Index: icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk =================================================================== ---- icedtea6-1.9.1.orig/openjdk/jdk/make/common/Defs-linux.gmk -+++ icedtea6-1.9.1/openjdk/jdk/make/common/Defs-linux.gmk +--- icedtea6-1.9.7.orig/openjdk/jdk/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk @@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed @@ -24,29 +33,29 @@ - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) -+# GCC_WARNINGS += -Werror ++# GCC_WARNINGS += -Wall +#endif # # Misc compiler options -Index: icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/adlc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/linux/makefiles/adlc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/adlc.make +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/adlc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make @@ -62,7 +62,8 @@ CPPFLAGS += -DASSERT # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors -CFLAGS_WARN = -Werror +# XXX: Who could fix all those stupid errors on gcc 4.5? -+#CFLAGS_WARN = -Werror ++#CFLAGS_WARN = -Wall CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ -Index: icedtea6-1.9.1/openjdk/corba/make/common/Defs-linux.gmk +Index: icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk =================================================================== ---- icedtea6-1.9.1.orig/openjdk/corba/make/common/Defs-linux.gmk -+++ icedtea6-1.9.1/openjdk/corba/make/common/Defs-linux.gmk +--- icedtea6-1.9.7.orig/openjdk/corba/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk @@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed @@ -55,17 +64,21 @@ - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) -+# GCC_WARNINGS += -Werror ++# GCC_WARNINGS += -Wall +#endif # # Misc compiler options -Index: icedtea6-1.9.1/openjdk/hotspot/make/solaris/makefiles/gcc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/solaris/makefiles/gcc.make -@@ -114,7 +114,7 @@ endif - WARNINGS_ARE_ERRORS = -Werror +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make +@@ -111,10 +111,10 @@ endif + + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall # Enable these warnings. See 'info gcc' about details on these options ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) @@ -73,3 +86,68 @@ # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) +Index: icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk +@@ -144,7 +144,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G + # Treat compiler warnings as errors, if warnings not allowed + # + ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror ++ GCC_WARNINGS += -Wall + endif + + # +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +@@ -62,7 +62,7 @@ CPPFLAGS += -DASSERT + + # CFLAGS_WARN holds compiler options to suppress/enable warnings. + # Compiler warnings are treated as errors +-CFLAGS_WARN = -Werror ++CFLAGS_WARN = -Wall + CFLAGS += $(CFLAGS_WARN) + + OBJECTNAMES = \ +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +@@ -118,7 +118,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +@@ -111,7 +111,7 @@ endif + + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + # Enable these warnings. See 'info gcc' about details on these options + ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare + CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) +Index: icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk +@@ -154,7 +154,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G + # Treat compiler warnings as errors, if warnings not allowed + # + ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror ++ GCC_WARNINGS += -Wall + endif + + # ++++++ openjdk-6-src-b20-stringcompare.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c @@ -574,7 +574,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10, nativename, size * 10); - if (nativename != NULL && nativename != "") + if (nativename != NULL && strcmp(nativename, "")) JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); /* ++++++ openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/bin/jexec.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c @@ -221,6 +221,9 @@ int main(int argc, const char * argv[]) * implies an error in the exec. */ free(nargv); errorExit(errno, BAD_EXEC_MSG); + + /* Just supress compiler warning */ + return 0; } Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c @@ -138,10 +138,12 @@ jboolean XShared_initIDs(JNIEnv *env, jb } } - return JNI_TRUE; #endif /* MITSHM */ #endif /* !HEADLESS */ + + /* Supress compiler warning */ + return JNI_TRUE; } @@ -463,8 +465,10 @@ jboolean XShared_initSurface(JNIEnv *env return JNI_FALSE; } - return JNI_TRUE; #endif /* !HEADLESS */ + + /* Suppress compiler warning */ + return JNI_TRUE; } Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -494,6 +494,9 @@ JVM_handle_linux_signal(int sig, err.report_and_die(); ShouldNotReachHere(); + + /*Supress compiler warnings*/ + return -1; } void os::Linux::init_thread_fpu_state(void) { Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad @@ -1133,6 +1133,7 @@ uint MachSpillCopyNode::implementation( Unimplemented(); + return -1; //avoid compiler warning } #ifndef PRODUCT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org