Hello community,
here is the log from the commit of package java-1_6_0-openjdk.1035 for openSUSE:11.4:Update checked in at 2012-10-31 16:15:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:11.4:Update/java-1_6_0-openjdk.1035 (Old)
and /work/SRC/openSUSE:11.4:Update/.java-1_6_0-openjdk.1035.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_6_0-openjdk.1035", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2012-10-22 00:44:18.403455820 +0200
+++ /work/SRC/openSUSE:11.4:Update/.java-1_6_0-openjdk.1035.new/java-1_6_0-openjdk.changes 2012-10-31 16:15:35.000000000 +0100
@@ -0,0 +1,899 @@
+-------------------------------------------------------------------
+Fri Oct 19 09:40:07 UTC 2012 - mvyskocil@suse.com
+
+- update to 1.11.5 (bnc#785433)
+* Security fixes
+ - S6631398, CVE-2012-3216: FilePermission improved path checking
+ - S7093490: adjust package access in rmiregistry
+ - S7143535, CVE-2012-5068: ScriptEngine corrected permissions
+ - S7167656, CVE-2012-5077: Multiple Seeders are being created
+ - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
+ - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
+ - S7172522, CVE-2012-5072: Improve DomainCombiner checking
+ - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
+ - S7189103, CVE-2012-5069: Executors needs to maintain state
+ - S7189490: More improvements to DomainCombiner checking
+ - S7189567, CVE-2012-5085: java net obselete protocol
+ - S7192975, CVE-2012-5071: Conditional usage check is wrong
+ - S7195194, CVE-2012-5084: Better data validation for Swing
+ - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
+ - S7195919, CVE-2012-5079: (sl) ServiceLoader can throw CCE without needing to create instance
+ - S7198296, CVE-2012-5089: Refactor classloader usage
+ - S7158800: Improve storage of symbol tables
+ - S7158801: Improve VM CompileOnly option
+ - S7158804: Improve config file parsing
+ - S7176337: Additional changes needed for 7158801 fix
+ - S7198606, CVE-2012-4416: Improve VM optimization
+* Backports
+ - S7175845: "jar uf" changes file permissions unexpectedly
+ - S7177216: native2ascii changes file permissions of input file
+ - S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo
+* Bug fixes
+ - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
+
+-------------------------------------------------------------------
+Mon Sep 3 11:59:29 UTC 2012 - mvyskocil@suse.cz
+
+- update to 1.11.4 (bnc#777499)
+* Security fixes
+ - S7162476, CVE-2012-1682: XMLDecoder security issue via ClassFinder
+ - S7163201, CVE-2012-0547: Simplify toolkit internals references
+* OpenJDK
+ - S7182135: Impossible to use some editors directly
+ - S7185678: java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java failed with NPE
+
+-------------------------------------------------------------------
+Mon Aug 20 08:56:23 UTC 2012 - meissner@suse.com
+
+- fixed gnome-java-bridge.jar file permissions. bnc#770040
+
+-------------------------------------------------------------------
+Thu Jun 14 11:04:42 UTC 2012 - mvyskocil@suse.cz
+
+- update to 1.11.3 (bnc#766802)
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
+* Bug fixes
+ - PR1018: JVM fails due to SEGV during rendering some Unicode characters (part of 6886358)
+ - RH789154: javac error messages no longer contain the full path to the offending file:
+ - PR797: Compiler error message does not display entire file name and path
+ - PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
+ - PR886: 6-1.11.1 fails to build CACAO on ppc
+ - Specify both source and target in IT_GET_DTDTYPE_CHECK.
+ - Install nss.cfg into j2re-image too.
+ - PR584: Don't use shared Eden in incremental mode.
+* Backports
+ - S6792400: Avoid loading of Normalizer resources for simple uses
+- use versioned desktop files to avoid fileconflict with openjdk7
+- add openjdk-6-src-b24-zero-increase-stack-size.patch by Dinar Valeev
+- add xorg-x11 BuildRequires to have xprop (by reddwarf an opensuse)
+- license update: GPL-2.0-with-classpath-exception (by cfarrell)
+
+-------------------------------------------------------------------
+Thu Feb 16 13:42:09 UTC 2012 - mvyskocil@suse.cz
+
+- update to 1.11.1 (bnc#747208)
+* Security fixes
+ - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+ - S7126960, CVE-2011-5035: (httpserver) Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+ - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
+* openSUSE fixes
+- apply ppc patch also on s390/s390x (thanks rudi)
+- add a 3 more void-return fixes to ppc patch (thanks rudi)
+- adjusted patch110 to fix ppc build. (thanks marcus)
+- there is no architecture called arm, so use macro instead
+- fix a stuff needed for gjc-based build
+ * change compiler flags in configure to gjc compatible
+ * added no-werror patch for openjdk-ecj
+ * avoid all aditional checking packages in this mode
+ * temporary remove memory size increase
+ * exclude patch110 in this case - TBD later
+- definitelly drop noarch feature as it never worked well
+- add arm to 32bit architectures
+- remove rhino as a runtime dependency, as it's repackaged and
+ installed in the jvm's tree
+- enable build --with-parallel-jobs
+- add automake as buildrequire to avoid implicit dependency (thanks coolo)
+
+-------------------------------------------------------------------
+Mon Oct 24 07:45:45 UTC 2011 - mvyskocil@suse.cz
+
+- update to 1.10.4 (bnc#725167)
+- Security fixes
+ * S7000600, CVE-2011-3547: InputStream skip() information leak
+ * S7019773, CVE-2011-3548: mutable static AWTKeyStroke.ctor
+ * S7023640, CVE-2011-3551: Java2D TransformHelper integer overflow
+ * S7032417, CVE-2011-3552: excessive default UDP socket limit under SecurityManager
+ * S7046794, CVE-2011-3553: JAX-WS stack-traces information leak
+ * S7046823, CVE-2011-3544: missing SecurityManager checks in scripting engine
+ * S7055902, CVE-2011-3521: IIOP deserialization code execution
+ * S7057857, CVE-2011-3554: insufficient pack200 JAR files uncompress error checks
+ * S7064341, CVE-2011-3389: HTTPS: block-wise chosen-plaintext attack against SSL/TLS (BEAST)
+ * S7070134, CVE-2011-3558: HotSpot crashes with sigsegv from PorterStemmer
+ * S7077466, CVE-2011-3556: RMI DGC server remote code execution
+ * S7083012, CVE-2011-3557: RMI registry privileged code execution
+ * S7096936, CVE-2011-3560: missing checkSetFactory calls in HttpsURLConnection
+- Bug fixes
+ - RH727195: Japanese font mappings are broken
+- Backports
+ - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog
+
+-------------------------------------------------------------------
+Thu Aug 4 08:46:55 UTC 2011 - mvyskocil@suse.cz
+
+- update to 1.10.3
+- Bug fixes
+ * PR748: Icedtea6 fails to build with Linux 3.0.
+ * PR744: icedtea6-1.10.2 : patching error
+- Backports:
+ * S7037283, RH712211: Null Pointer Exception in SwingUtilities2.
+ * S6769607, PR677: Modal frame hangs for a while.
+ * S6578583: Modality is broken in windows vista home premium from jdk1.7 b02 onwards.
+ * S6610244: modal dialog closes with fatal error if -Xcheck:jni is set
+- don't touch java and javac alternatives anymore
+
+-------------------------------------------------------------------
+Tue Jun 14 09:23:00 UTC 2011 - mvyskocil@suse.cz
+
+- fix build on 11.1/i586 distros
+ * add icedtea6-replace-gcc-stack-marking.patch
+
+-------------------------------------------------------------------
+Thu Jun 9 11:24:10 UTC 2011 - mvyskocil@suse.cz
+
+- fix bnc#698739: icedtea6-1.10.2 released
+- update to openjdk b22, hotspot 20b11
+ see following links for more details
+ http://blog.fuseyism.com/index.php/2011/04/04/icedtea6-1101-released/
+ http://blog.fuseyism.com/index.php/2011/03/02/icedtea6-110-released/
+- Security fixes
+ * S6213702, CVE-2011-0872: (so) non-blocking sockets with TCP urgent disabled get still selected for read ops (win)
+ * S6618658, CVE-2011-0865: Vulnerability in deserialization
+ * S7012520, CVE-2011-0815: Heap overflow vulnerability in FileDialog.show()
+ * S7013519, CVE-2011-0822, CVE-2011-0862: Integer overflows in 2D code
+ * S7013969, CVE-2011-0867: NetworkInterface.toString can reveal bindings
+ * S7013971, CVE-2011-0869: Vulnerability in SAAJ
+ * S7016340, CVE-2011-0870: Vulnerability in SAAJ
+ * S7016495, CVE-2011-0868: Crash in Java 2D transforming an image with scale close to zero
+ * S7020198, CVE-2011-0871: ImageIcon creates Component with null acc
+ * S7020373, CVE-2011-0864: JSR rewriting can overflow memory address size variables
+- Backports
+ * S7023591, S7027667: Clipped antialiased rectangles are filled, not drawn.
+ Add missing privileged block around access to the sun.awt.nativedebug
+ property.
+ * S7032388, PR682: Make HotSpot work on machines without cmov instruction again
+ * S7031385, PR680: Incorrect register allocation in orderAccess_linux_x86.inline.hpp
+ * S7043054: REGRESSION - wrong userBounds in Paint.createContext()
+ * S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is.
+Bug fixes:
+ * G356743: Support libpng 1.5.
+ * RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
+ * PR600: HS19 upgrade broke CACAO build on ARM
+ * PR616, PR99: Don’t statically link libstdc++ or libgcc
+ * PR632: patches/security/20110215/6878713.patch breaks shark zero build
+ * PR103: Usage of native2ascii during bootstrap
+ * PR633: IcedTea installs javaws manpages on x86 even with –disable-webstart
+ * PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
+ * PR586: Sources missing from src.zip
+ * PR639: Add missing include line, paths and LLVM flags for Shark.
++++ 702 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:11.4:Update/.java-1_6_0-openjdk.1035.new/java-1_6_0-openjdk.changes
New:
----
check-build.sh
fontconfig.SuSE.properties
generate-fedora-zip.sh
icedtea6-1.10.2-bouncycastle-provider-support.patch
icedtea6-1.11.5.tar.gz
icedtea6-1.11.5.tar.gz.sig
java-1.6.0-openjdk-accessible-toolkit.patch
java-1.6.0-openjdk-java-access-bridge-idlj.patch
java-1.6.0-openjdk-java-access-bridge-security.patch
java-1.6.0-openjdk-java-access-bridge-tck.patch
java-1.6.0-openjdk-optflags.patch
java-1_6_0-openjdk-rpmlintrc
java-1_6_0-openjdk-suse-desktop-files.patch
java-1_6_0-openjdk.changes
java-1_6_0-openjdk.spec
java-access-bridge-1.23.0.tar.bz2
jaxp144_03.zip
jdk6-jaf-b20.zip
jdk6-jaxws2_1_6-2011_06_13.zip
mauve-2008-10-22.tar.bz2
mauve_tests
openjdk-6-src-b09-gcc4-warningfixes.patch
openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch
openjdk-6-src-b14-no-return-in-nonvoid-function.patch
openjdk-6-src-b14-undefined-operation.patch
openjdk-6-src-b17-no-efect.patch
openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch
openjdk-6-src-b20-array-subscript-has-type-char.patch
openjdk-6-src-b20-defined-but-not-used.patch
openjdk-6-src-b20-gcj-workaround.patch
openjdk-6-src-b20-initialized-after.patch
openjdk-6-src-b20-may-be-used-uninitialized.patch
openjdk-6-src-b20-no-multiline-comments.patch
openjdk-6-src-b20-no-werror.patch
openjdk-6-src-b20-stringcompare.patch
openjdk-6-src-b20-suggest-parentheses.patch
openjdk-6-src-b20-unused-variable.patch
openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
openjdk-6-src-b24-zero-increase-stack-size.patch
openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch
openjdk-ecj-6-src-b22-no-werror.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_6_0-openjdk.spec ++++++
++++ 1125 lines (skipped)
++++++ check-build.sh ++++++
#!/bin/bash
# The JVM needs LOTS of virtual memory when compiling the big stuff:
if [ `ulimit -v` -le 2048000 ] ; then
echo "build does not work on `hostname`: not enough memory"
exit 1
fi
exit 0
++++++ fontconfig.SuSE.properties ++++++
#
# Copyright 2007 Sun Microsystems, Inc. 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. Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
#
# Uses SUSE 10.2 fonts and file paths.
version=1
# Component Font Mappings
dialog.plain.latin-1=DejaVu Sans
dialog.plain.japanese-x0208=Sazanami Gothic
dialog.plain.korean=UnDotum
dialog.bold.latin-1=DejaVu Sans Bold
dialog.bold.japanese-x0208=Sazanami Gothic
dialog.bold.korean=UnDotum Bold
dialog.italic.latin-1=DejaVu Sans Oblique
dialog.italic.japanese-x0208=Sazanami Gothic
dialog.italic.korean=UnDotum
dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
dialog.bolditalic.japanese-x0208=Sazanami Gothic
dialog.bolditalic.korean=UnDotum Bold
sansserif.plain.latin-1=DejaVu Sans
sansserif.plain.japanese-x0208=Sazanami Gothic
sansserif.plain.korean=UnDotum
sansserif.bold.latin-1=DejaVu Sans Bold
sansserif.bold.japanese-x0208=Sazanami Gothic
sansserif.bold.korean=UnDotum Bold
sansserif.italic.latin-1=DejaVu Sans Oblique
sansserif.italic.japanese-x0208=Sazanami Gothic
sansserif.italic.korean=UnDotum
sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
sansserif.bolditalic.japanese-x0208=Sazanami Gothic
sansserif.bolditalic.korean=UnDotum Bold
serif.plain.latin-1=DejaVu Serif
serif.plain.japanese-x0208=Sazanami Mincho
serif.plain.korean=UnBatang
serif.bold.latin-1=DejaVu Serif Bold
serif.bold.japanese-x0208=Sazanami Mincho
serif.bold.korean=UnBatang Bold
serif.italic.latin-1=DejaVu Serif Oblique
serif.italic.japanese-x0208=Sazanami Mincho
serif.italic.korean=UnBatang
serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
serif.bolditalic.japanese-x0208=Sazanami Mincho
serif.bolditalic.korean=UnBatang Bold
monospaced.plain.latin-1=DejaVu Sans Mono
monospaced.plain.japanese-x0208=Sazanami Mincho
monospaced.plain.korean=UnDotum
monospaced.bold.latin-1=DejaVu Sans Mono Bold
monospaced.bold.japanese-x0208=Sazanami Mincho
monospaced.bold.korean=UnDotum Bold
monospaced.italic.latin-1=DejaVu Sans Mono Oblique
monospaced.italic.japanese-x0208=Sazanami Mincho
monospaced.italic.korean=UnDotum
monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
monospaced.bolditalic.japanese-x0208=Sazanami Mincho
monospaced.bolditalic.korean=UnDotum Bold
dialoginput.plain.latin-1=DejaVu Sans Mono
dialoginput.plain.japanese-x0208=Sazanami Gothic
dialoginput.plain.korean=UnDotum
dialoginput.bold.latin-1=DejaVu Sans Mono Bold
dialoginput.bold.japanese-x0208=Sazanami Gothic
dialoginput.bold.korean=UnDotum Bold
dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
dialoginput.italic.japanese-x0208=Sazanami Gothic
dialoginput.italic.korean=UnDotum
dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
dialoginput.bolditalic.korean=UnDotum Bold
allfonts.chinese-big5=AR PL Mingti2L Big5
allfonts.chinese-gb18030=AR PL SungtiL GB
# Search Sequences
sequence.allfonts=latin-1
sequence.allfonts.Big5=chinese-big5,latin-1
sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1
sequence.allfonts.EUC-KR=korean,latin-1
sequence.allfonts.GB18030=chinese-gb18030,latin-1
sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
# Font File Names
filename.DejaVu_Sans=/usr/share/fonts/truetype/DejaVuSans.ttf
filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/DejaVuSans-Bold.ttf
filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/DejaVuSans-Oblique.ttf
filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/DejaVuSansMono.ttf
filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/DejaVuSansMono-Bold.ttf
filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Serif=/usr/share/fonts/truetype/DejaVuSerif.ttf
filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/DejaVuSerif-Bold.ttf
filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/DejaVuSerif-Italic.ttf
filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSerif-BoldItalic.ttf
filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami-gothic.ttf
filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami-mincho.ttf
filename.AR_PL_SungtiL_GB=/usr/share/fonts/truetype/gbsn00lp.ttf
filename.AR_PL_Mingti2L_Big5=/usr/share/fonts/truetype/bsmi00lp.ttf
filename.UnDotum=/usr/share/fonts/truetype/UnDotum.ttf
filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf
filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf
filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf
# AWT X11 font paths
awtfontpath.japanese-x0201=/usr/share/fonts/truetype
awtfontpath.japanese-x0208=/usr/share/fonts/truetype
awtfontpath.japanese-iso10646-1=/usr/share/fonts/truetype
awtfontpath.korean=/usr/share/fonts/truetype
awtfontpath.latin-1=/usr/share/fonts/truetype
++++++ generate-fedora-zip.sh ++++++
#!/bin/sh
# Untar openjdk source tarball.
mkdir openjdk
tar xzf $1 -C openjdk
# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
# PR146/S6713083
# Remove binaries
rm -f \
openjdk/jdk/test/sun/management/windows/revokeall.exe \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
rm -f \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
rm -f \
openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
# Remove test sources with questionable license headers.
rm -f \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
openjdk/jdk/test/java/util/Locale/LocaleTest.java \
openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
# Remove J2DBench sources, some of which have questionable license
# headers.
rm -rf \
openjdk/jdk/src/share/demo/java2d/J2DBench
# Create new tarball with new name.
pushd openjdk > /dev/null
tar czf ../$(basename $1 .tar.gz)-fedora.tar.gz *
popd > /dev/null
# Remove old unzipped openjdk dir.
rm -rf openjdk
++++++ icedtea6-1.10.2-bouncycastle-provider-support.patch ++++++
Index: icedtea6-1.10.2/openjdk/jdk/src/share/lib/security/java.security
===================================================================
--- icedtea6-1.10.2.orig/openjdk/jdk/src/share/lib/security/java.security
+++ icedtea6-1.10.2/openjdk/jdk/src/share/lib/security/java.security
@@ -52,6 +52,9 @@ security.provider.6=com.sun.security.sas
security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
security.provider.8=sun.security.smartcardio.SunPCSC
security.provider.9=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+# bouncycastle.org API support
+# will be enabled after installation of bouncycastle.rpm
+#security.provider.10=org.bouncycastle.jce.provider.BouncyCastleProvider
#
# Select the source of seed data for SecureRandom. By default an
++++++ java-1.6.0-openjdk-accessible-toolkit.patch ++++++
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
+++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
@@ -871,7 +871,11 @@
return null;
}
});
- loadAssistiveTechnologies();
+ try {
+ loadAssistiveTechnologies();
+ } catch ( AWTError error) {
+ // ignore silently
+ }
} finally {
// Make sure to always re-enable the JIT.
java.lang.Compiler.enable();
++++++ java-1.6.0-openjdk-java-access-bridge-idlj.patch ++++++
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.am 2008-06-03 02:47:29.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.am 2008-07-31 15:13:26.000000000 -0400
@@ -3,7 +3,7 @@
JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
JAR=jar
-IDLJ_FLAGS=-emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS=-J-client -emitAll $(IDLJ_IDLDIRS)
BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl)
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.in 2008-06-23 23:34:59.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.in 2008-07-31 15:13:45.000000000 -0400
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -140,7 +140,7 @@
SUBDIRS = org
JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
CLASSES = $(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
-IDLJ_FLAGS = -emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS = -J-client -emitAll $(IDLJ_IDLDIRS)
BONOBO_ACT_IDLFILES = $(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
BONOBO_IDLFILES = $(wildcard $(BONOBO_IDLDIR)/*.idl)
AT_SPI_IDLFILES = $(wildcard $(AT_SPI_IDLDIR)/*.idl)
@@ -253,8 +253,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -279,8 +279,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -290,13 +290,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
++++++ java-1.6.0-openjdk-java-access-bridge-security.patch ++++++
--- openjdk/jdk/src/share/lib/security/java.security-src
+++ openjdk/jdk/src/share/lib/security/java.security
@@ -131,7 +131,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
@@ -143,7 +143,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
#
# Determines whether this properties file can be appended to
++++++ java-1.6.0-openjdk-java-access-bridge-tck.patch ++++++
--- java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-05-22 11:27:00.000000000 -0400
+++ java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2008-05-22 11:28:02.000000000 -0400
@@ -34,6 +34,9 @@
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleText;
import javax.accessibility.AccessibleEditableText;
+import java.security.PrivilegedAction;
+import java.security.AccessController;
+
public class JavaBridge {
@@ -332,7 +335,11 @@
System.err.println ("Java Accessibility Bridge for GNOME loaded.\n");
// Not sure what kind of arguments should be sent to ORB
- String vm_rev = System.getProperty("java.version");
+ String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() {
+ public java.lang.Object run() {
+ return System.getProperty("java.version");
+ }
+ });
if (vm_rev.compareTo("1.4.0") < 0) {
System.err.println("WARNING: Java Accessibility Bridge " +
++++++ java-1.6.0-openjdk-optflags.patch ++++++
--- configure.ac 2011-03-02 19:34:58.692136324 +0100
+++ configure.ac 2011-03-25 14:56:40.798290097 +0100
@@ -18,6 +18,9 @@
AC_PROG_CC
AC_PROG_CXX
+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+AC_SUBST(ALT_OPT_CFLAGS)
+
IT_FIND_TOOL([MAKE], [make])
IT_FIND_TOOL([GZIP], [gzip])
IT_FIND_TOOL([ANT], [ant])
++++++ java-1_6_0-openjdk-rpmlintrc ++++++
# This is correct, the devel means a Java compiler
addFilter("devel-dependency java-1_6_0-openjdk-devel")
# those patches are applied in %build phase after unpacking of openjdk
# this is a false positive
addFilter("patch-not-applied Patch1")
addFilter("patch-not-applied Patch2")
addFilter("patch-not-applied Patch3")
addFilter("patch-not-applied Patch4")
addFilter("patch-not-applied Patch104")
addFilter("patch-not-applied Patch105")
addFilter("patch-not-applied Patch106")
addFilter("patch-not-applied Patch107")
addFilter("patch-not-applied Patch108")
addFilter("patch-not-applied Patch109")
# no need to fix this warning in demo package
addFilter("shared-lib-calls-exit .*demo")
# those files are intended to be modified
addFilter("non-etc-or-var-file-marked-as-conffile .*/security.*")
# in most of the cases it does not make any sense
# and openjdk spec is big, ugly and full of comments help me
# with merging with fc specs ;-)
addFilter("macro-in-comment")
# This is indented - bnc#530046
addFilter("unstripped-binary-or-object .*libjvm.so")
++++++ java-1_6_0-openjdk-suse-desktop-files.patch ++++++
Index: icedtea6-1.11.1/jconsole.desktop.in
===================================================================
--- icedtea6-1.11.1.orig/jconsole.desktop.in
+++ icedtea6-1.11.1/jconsole.desktop.in
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Monitoring & Management Console
+GenericName=OpenJDK Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications
Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
Version=1.0
Index: icedtea6-1.11.1/policytool.desktop.in
===================================================================
--- icedtea6-1.11.1.orig/policytool.desktop.in
+++ icedtea6-1.11.1/policytool.desktop.in
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Policy Tool
+GenericName=OpenJDK Policy Tool
Comment=Manage OpenJDK policy files
Exec=@ABS_JAVA_HOME_DIR@/bin/policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
+Categories=Utility;Security;
Version=1.0
++++++ mauve_tests ++++++
++++ 2571 lines (skipped)
++++++ openjdk-6-src-b09-gcc4-warningfixes.patch ++++++
--- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05
+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05
@@ -566,23 +566,23 @@
if (!JNU_IsNull(env, fontDescriptorName)) {
nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL);
} else {
nativename = "";
}
fdata->flist[i].xlfd = malloc(strlen(nativename)
+ strlen(defaultXLFD));
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
- if (nativename != NULL && nativename != "")
+ if (*nativename)
JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
/*
* set charset_name
*/
charsetName =
(*env)->GetObjectField(env, fontDescriptor,
fontDescriptorIDs.charsetName);
fdata->flist[i].charset_name = (char *)
--- openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:38:55 1.1
+++ openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:40:14
@@ -221,6 +221,7 @@
* implies an error in the exec. */
free(nargv);
errorExit(errno, BAD_EXEC_MSG);
+ return 0; // make gcc happy
}
++++++ openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch ++++++
--- ./openjdk/hotspot/src/cpu/x86/vm/x86_32.ad 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/cpu/x86/vm/x86_32.ad.new 2009-01-19 10:06:47.376623479 +0000
@@ -1061,6 +1061,7 @@
Unimplemented();
+ return NULL;
}
#ifndef PRODUCT
++++++ openjdk-6-src-b14-no-return-in-nonvoid-function.patch ++++++
--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-01-14 09:26:13.088856122 +0000
+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-01-14 09:46:41.132855902 +0000
@@ -142,6 +142,7 @@
#endif /* MITSHM */
#endif /* !HEADLESS */
+ return JNI_TRUE;
}
@@ -464,6 +465,7 @@
return JNI_TRUE;
#endif /* !HEADLESS */
+ return JNI_TRUE;
}
--- ./openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.new 2009-01-14 10:59:57.400855524 +0000
@@ -493,6 +493,7 @@
err.report_and_die();
ShouldNotReachHere();
+ return 0;
}
void os::Linux::init_thread_fpu_state(void) {
--- ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp.new 2009-01-14 11:00:56.052855681 +0000
@@ -594,6 +594,7 @@
err.report_and_die();
ShouldNotReachHere();
+ return 0;
}
void os::Linux::init_thread_fpu_state(void) {
--- ./openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2009-01-13 08:46:35.000000000 +0000
+++ ./openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.new 2009-01-14 11:02:21.805690939 +0000
@@ -221,6 +221,7 @@
sprintf(buf, fmt, sig);
fatal(buf);
+ return 0;
}
void os::Linux::init_thread_fpu_state(void)
--- ./contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp 2009-01-13 08:46:27.000000000 +0000
+++ ./contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp.new 2009-01-14 11:02:40.288925505 +0000
@@ -154,6 +154,7 @@
sprintf(buf, fmt, sig);
fatal(buf);
+ return 0;
}
void os::Linux::init_thread_fpu_state(void)
++++++ openjdk-6-src-b14-undefined-operation.patch ++++++
--- ./openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp.new 2009-01-19 07:38:31.832949048 +0000
@@ -1937,7 +1937,7 @@
off.load_item();
src.load_item();
- LIR_Opr reg = reg = rlock_result(x, x->basic_type());
+ LIR_Opr reg = rlock_result(x, x->basic_type());
if (x->is_volatile() && os::is_MP()) __ membar_acquire();
get_Object_unsafe(reg, src.result(), off.result(), type, x->is_volatile());
++++++ openjdk-6-src-b17-no-efect.patch ++++++
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
@@ -344,8 +344,9 @@ inline bool is_object_aligned(intptr_t o
//----------------------------------------------------------------------------------------------------
// Utility macros for compilers
// used to silence compiler warnings
+// suppress also statement has no effect
-#define Unused_Variable(var) var
+#define Unused_Variable(var) (var) = (var)
//----------------------------------------------------------------------------------------------------
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp
@@ -42,7 +42,7 @@ class typeArrayKlass : public arrayKlass
static klassOop create_klass(BasicType type, int scale, const char* name_str,
TRAPS);
static inline klassOop create_klass(BasicType type, int scale, TRAPS) {
- return create_klass(type, scale, external_name(type), CHECK_NULL);
+ return create_klass(type, scale, external_name(type), THREAD); CHECK2_(NULL);
}
int oop_size(oop obj) const;
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp
@@ -178,6 +178,8 @@ class Exceptions {
#define CHECK THREAD); if (HAS_PENDING_EXCEPTION) return ; (0
#define CHECK_(result) THREAD); if (HAS_PENDING_EXCEPTION) return result; (0
+//MV: same as a CHECK_(result), but for usage outside of func call, so it not have no effect statement (0)
+#define CHECK2_(result) if (HAS_PENDING_EXCEPTION) return result
#define CHECK_0 CHECK_(0)
#define CHECK_NH CHECK_(Handle())
#define CHECK_NULL CHECK_(NULL)
++++++ openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++
unchanged:
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
@@ -935,6 +935,7 @@ void BytecodeInterpreter::layout_interpr
address CppInterpreter::return_entry(TosState state, int length) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address CppInterpreter::deopt_entry(TosState state, int length) {
@@ -955,6 +956,7 @@ bool CppInterpreter::contains(address pc
#else
return false; // make frame::print_value_on work
#endif // !PRODUCT
+ return false; //make gcc happy
}
// Result handlers and convertors
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp
@@ -88,6 +88,7 @@ void frame::patch_pc(Thread* thread, add
bool frame::safe_for_sender(JavaThread *thread) {
ShouldNotCallThis();
+ return false; // make gcc happy
}
void frame::pd_gc_epilog() {
@@ -95,6 +96,7 @@ void frame::pd_gc_epilog() {
bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
ShouldNotCallThis();
+ return false; // make gcc happy
}
BasicType frame::interpreter_frame_result(oop* oop_result,
@@ -159,6 +161,7 @@ int frame::frame_size() const {
#else
return 0; // make javaVFrame::print_value work
#endif // PRODUCT
+ return 0; // make gcc happy
}
intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
@@ -71,6 +71,7 @@ inline intptr_t* frame::sender_sp() cons
inline intptr_t* frame::link() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
#ifdef CC_INTERP
@@ -133,14 +134,17 @@ inline void frame::set_saved_oop_result(
inline oop frame::saved_oop_result(RegisterMap* map) const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline bool frame::is_older(intptr_t* id) const {
ShouldNotCallThis();
+ return false; // make gcc happy
}
inline intptr_t* frame::entry_frame_argument_at(int offset) const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline intptr_t* frame::unextended_sp() const {
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
@@ -41,9 +41,11 @@ void InlineCacheBuffer::assemble_ic_buff
address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
@@ -37,10 +37,12 @@ address InterpreterGenerator::generate_m
return NULL;
Unimplemented();
+ return NULL;
}
address InterpreterGenerator::generate_abstract_entry() {
return ShouldNotCallThisEntry();
+ return NULL;
}
int AbstractInterpreter::size_activation(methodOop method,
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
@@ -42,15 +42,18 @@ class NativeInstruction VALUE_OBJ_CLASS_
public:
bool is_jump() {
ShouldNotCallThis();
+ return false; // make gcc happy
}
bool is_safepoint_poll() {
ShouldNotCallThis();
+ return false; // make gcc happy
}
};
inline NativeInstruction* nativeInstruction_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeCall : public NativeInstruction {
@@ -61,18 +64,22 @@ class NativeCall : public NativeInstruct
address instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address return_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_destination_mt_safe(address dest) {
@@ -89,25 +96,30 @@ class NativeCall : public NativeInstruct
static bool is_call_before(address return_address) {
ShouldNotCallThis();
+ return false; // make gcc happy
}
};
inline NativeCall* nativeCall_before(address return_address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline NativeCall* nativeCall_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeMovConstReg : public NativeInstruction {
public:
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
intptr_t data() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_data(intptr_t x) {
@@ -117,12 +129,14 @@ class NativeMovConstReg : public NativeI
inline NativeMovConstReg* nativeMovConstReg_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeMovRegMem : public NativeInstruction {
public:
int offset() const {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void set_offset(intptr_t x) {
@@ -136,6 +150,7 @@ class NativeMovRegMem : public NativeIns
inline NativeMovRegMem* nativeMovRegMem_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeJump : public NativeInstruction {
@@ -146,6 +161,7 @@ class NativeJump : public NativeInstruct
address jump_destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_jump_destination(address dest) {
@@ -163,12 +179,14 @@ class NativeJump : public NativeInstruct
inline NativeJump* nativeJump_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeGeneralJump : public NativeInstruction {
public:
address jump_destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
static void insert_unconditional(address code_pos, address entry) {
@@ -182,4 +200,5 @@ class NativeGeneralJump : public NativeI
inline NativeGeneralJump* nativeGeneralJump_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp
@@ -32,8 +32,10 @@ const int ConcreteRegisterImpl::max_fpr
const char* RegisterImpl::name() const {
ShouldNotCallThis();
+ return ""; // make gcc happy
}
const char* FloatRegisterImpl::name() const {
ShouldNotCallThis();
+ return ""; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
@@ -32,6 +32,7 @@ void Relocation::pd_set_data_value(addre
address Relocation::pd_call_destination(address orig_addr) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void Relocation::pd_set_call_destination(address x) {
@@ -40,6 +41,7 @@ void Relocation::pd_set_call_destination
address Relocation::pd_get_address_from_code() {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address* Relocation::pd_address_in_code() {
@@ -49,6 +51,7 @@ address* Relocation::pd_address_in_code(
int Relocation::pd_breakpoint_size() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void Relocation::pd_swap_in_breakpoint(address x,
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
@@ -69,6 +69,7 @@ nmethod *SharedRuntime::generate_native_
#else
ShouldNotCallThis();
#endif // SHARK
+ return NULL; // make gcc happy
}
int Deoptimization::last_frame_adjust(int callee_parameters,
@@ -78,6 +79,7 @@ int Deoptimization::last_frame_adjust(in
uint SharedRuntime::out_preserve_stack_slots() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
static RuntimeStub* generate_empty_runtime_stub(const char* name) {
@@ -112,4 +114,5 @@ int SharedRuntime::c_calling_convention(
VMRegPair *regs,
int total_args_passed) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp
@@ -28,16 +28,20 @@
VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
int VtableStub::pd_code_alignment() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -33,6 +33,7 @@ address os::current_stack_pointer() {
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return *fr; // make gcc happy
}
frame os::current_frame() {
@@ -62,6 +63,7 @@ char* os::non_memory_address_word() {
// This is the value for x86; works pretty well for PPC too.
return (char *) -1;
#endif // SPARC
+ return (char *) -1; // make gcc happy
}
void os::initialize_thread() {
@@ -70,16 +72,19 @@ void os::initialize_thread() {
address os::Linux::ucontext_get_pc(ucontext_t* uc) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
ExtendedPC os::fetch_frame_from_context(void* ucVoid,
intptr_t** ret_sp,
intptr_t** ret_fp) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
frame os::fetch_frame_from_context(void* ucVoid) {
ShouldNotCallThis();
+ return *(frame*)ucVoid; // make gcc happy
}
#ifdef HOTSPOT_ASM
@@ -242,6 +248,7 @@ void os::Linux::init_thread_fpu_state(vo
int os::Linux::get_fpu_control_word() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void os::Linux::set_fpu_control_word(int fpu) {
@@ -264,6 +271,7 @@ bool os::is_allocatable(size_t bytes) {
return addr != NULL;
#endif // _LP64
+ return false; // make gcc happy
}
///////////////////////////////////////////////////////////////////////////////
@@ -386,6 +394,7 @@ void os::print_context(outputStream* st,
extern "C" {
int SpinPause() {
+ return 0; // make gcc happy
}
int SafeFetch32(int *adr, int errValue) {
@@ -475,6 +484,7 @@ extern "C" {
long long unsigned int oldval,
long long unsigned int newval) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
};
#endif // !_LP64
Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
@@ -95,6 +95,7 @@
void* ucontext,
bool isInJava) {
ShouldNotCallThis();
+ return false;
}
// These routines are only used on cpu architectures that
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:21:54 1.1
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:22:02
@@ -28,6 +28,7 @@
int MethodHandles::adapter_conversion_ops_supported_mask() {
ShouldNotCallThis();
+ return 0;
}
void MethodHandles::generate_method_handle_stub(MacroAssembler* masm,
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:57:44 1.1
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:58:51
@@ -57,6 +57,7 @@
RegisterOrConstant MacroAssembler::delayed_value_impl(
intptr_t* delayed_value_addr, Register tmpl, int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant(tmpl);
}
void MacroAssembler::store_oop(jobject obj) {
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:21 1.1
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:38
@@ -34,5 +34,6 @@
Register tmp,
int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant(tmp);
}
};
++++++ openjdk-6-src-b20-array-subscript-has-type-char.patch ++++++
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
@@ -287,12 +287,12 @@ int hashstr(const void *t) {
register int sum = 0;
register const char *s = (const char *)t;
- while( ((c = s[k]) != '\0') && (k < MAXID-1) ) { // Get characters till nul
+ while( ((c = s[(int)k]) != '\0') && (k < MAXID-1) ) { // Get characters till nul
c = (c<<1)+1; // Characters are always odd!
- sum += c + (c<