Hello community,
here is the log from the commit of package java-1_7_0-openjdk.1855 for openSUSE:12.2:Update checked in at 2013-08-01 14:24:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/java-1_7_0-openjdk.1855 (Old)
and /work/SRC/openSUSE:12.2:Update/.java-1_7_0-openjdk.1855.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk.1855"
Changes:
--------
New Changes file:
--- /dev/null 2013-07-23 23:44:04.804033756 +0200
+++ /work/SRC/openSUSE:12.2:Update/.java-1_7_0-openjdk.1855.new/java-1_7_0-openjdk.changes 2013-08-01 14:24:39.000000000 +0200
@@ -0,0 +1,626 @@
+-------------------------------------------------------------------
+Tue Jul 9 12:51:56 UTC 2013 - mvyskocil@suse.com
+
+- update to icedtea-2.4.1 (bnc#828665)
+* Security fixes
+ - S6741606, CVE-2013-2407: Integrate Apache Santuario
+ - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
+ - S7170730, CVE-2013-2451: Improve Windows network stack support.
+ - S8000638, CVE-2013-2450: Improve deserialization
+ - S8000642, CVE-2013-2446: Better handling of objects for transportation
+ - S8001032: Restrict object access
+ - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
+ - S8001034, CVE-2013-1500: Memory management improvements
+ - S8001038, CVE-2013-2444: Resourcefully handle resources
+ - S8001043: Clarify definition restrictions
+ - S8001308: Update display of applet windows
+ - S8001309: Better handling of annotation interfaces
+ - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
+ - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only)
+ - S8003703, CVE-2013-2412: Update RMI connection dialog box
+ - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
+ - S8004584: Augment applet contextualization
+ - S8005007: Better glyph processing
+ - S8006328, CVE-2013-2448: Improve robustness of sound classes
+ - S8006611: Improve scripting
+ - S8007467: Improve robustness of JMX internal APIs
+ - S8007471: Improve MBean notifications
+ - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
+ - S8007925: Improve cmsStageAllocLabV2ToV4curves
+ - S8007926: Improve cmsPipelineDup
+ - S8007927: Improve cmsAllocProfileSequenceDescription
+ - S8007929: Improve CurvesAlloc
+ - S8008120, CVE-2013-2457: Improve JMX class checking
+ - S8008124, CVE-2013-2453: Better compliance testing
+ - S8008128: Better API coherence for JMX
+ - S8008132, CVE-2013-2456: Better serialization support
+ - S8008585: Better JMX data handling
+ - S8008593: Better URLClassLoader resource management
+ - S8008603: Improve provision of JMX providers
+ - S8008607: Better input checking in JMX
+ - S8008611: Better handling of annotations in JMX
+ - S8008615: Improve robustness of JMX internal APIs
+ - S8008623: Better handling of MBeanServers
+ - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
+ - S8008982: Adjust JMX for underlying interface changes
+ - S8009004: Better implementation of RMI connections
+ - S8009008: Better manage management-api
+ - S8009013: Better handling of T2K glyphs
+ - S8009034: Improve resulting notifications in JMX
+ - S8009038: Improve JMX notification support
+ - S8009057, CVE-2013-2448: Improve MIDI event handling
+ - S8009067: Improve storing keys in KeyStore
+ - S8009071, CVE-2013-2459: Improve shape handling
+ - S8009235: Improve handling of TSA data
+ - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
+ - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
+ - S8009654: Improve stability of cmsnamed
+ - S8010209, CVE-2013-2460: Better provision of factories
+ - S8011243, CVE-2013-2470: Improve ImagingLib
+ - S8011248, CVE-2013-2471: Better Component Rasters
+ - S8011253, CVE-2013-2472: Better Short Component Rasters
+ - S8011257, CVE-2013-2473: Better Byte Component Rasters
+ - S8012375, CVE-2013-1571: Improve Javadoc framing
+ - S8012421: Better positioning of PairPositioning
+ - S8012438, CVE-2013-2463: Better image validation
+ - S8012597, CVE-2013-2465: Better image channel verification
+ - S8012601, CVE-2013-2469: Better validation of image layouts
+ - S8014281, CVE-2013-2461: Better checking of XML signature
+ - S8015997: Additional improvement in Javadoc framing
+* OpenJDK
+ - list to long, please consult NEWS file
+
+-------------------------------------------------------------------
+Mon Jul 8 12:39:05 UTC 2013 - schwab@suse.de
+
+- java-1.7.0-openjdk-zero-arch.patch: fix detection of zero arch
+
+-------------------------------------------------------------------
+Mon Jul 8 10:53:25 UTC 2013 - mvyskocil@suse.com
+
+- ignore rhino dependencies during a build to prevent a build cycle
+
+-------------------------------------------------------------------
+Tue Jun 18 07:20:59 UTC 2013 - mvyskocil@suse.com
+
+- update to icedtea-2.4.0 (based on oracle jdk7u40)
+* OpenJDK (see NEWS for full listing)
+ - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field.
+ - PR1206, S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK
+* Backports
+ - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams
+ - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
+* Bug fixes
+ - PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use
+ - Add NSS (commented out) to other platforms.
+ - Allow multiple PKCS11 library initialisation to be a non-critical error.
+ - Complete switch from local zlib patch to upstream version.
+ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set.
+ - Provide support for using PKCS11 provider with NSS
+ - Remove file apparently removed as part of upstreaming of Zero.
+ - Revert 7060849
+ - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy.
+ - PR473: Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg
+ - PR716: IcedTea7 should bootstrap with IcedTea6
+ - Expand java.security.cert.* imports to avoid conflict when building with OpenJDK 6.
+ - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set
+ - Fix invalid XSL stylesheets and DTD introduced as part of JEP 167.
+ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set.
+ - Make sure libffi cflags and libs are used.
+ - PR1378: Add AArch64 support to Zero
+ - PR1170: Ensure unlimited crypto policy is in place.
+ - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive
+ - PR1358: Make XRender mandatory
+ - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative
+ - PR1435, D657854: OpenJDK 7 returns incorrect TrueType font metrics
+ - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order
+* JamVM
+ - JSR 335: (lambda expressions) initial hack
+ - JEP 171: Implement fence methods in sun.misc.Unsafe
+ - Fix invokesuper check in invokespecial opcode
+ - Fix non-direct interpreter invokespecial super-class check
+ - When GC'ing a native method don't try to free code
+ - Do not free unprepared Miranda method code data
+ - Set anonymous class protection domain
+ - JVM_IsVMGeneratedMethodIx stub
+ - Dummy implementation of sun.misc.Perf natives
+- separate vm for zero is no longer needed
+- drop java-1.7.0-openjdk-aarch64.patch (upstream: PR1378)
+
+-------------------------------------------------------------------
+Wed Jun 5 08:16:12 UTC 2013 - mvyskocil@suse.com
+
+- fix bnc#781690c#11 - setup JAVA_HOME in posttrans, so certificates
+ will be created by this JVM
+- fix the postrans conditions (add missing prefiX)
+- relax build requires, so every java-devel >= 1.7.0 can match
+
+-------------------------------------------------------------------
+Thu Apr 25 08:14:54 UTC 2013 - mvyskocil@suse.com
+
+- drop icedtea-2.3.8-zero-patches.patch, it does not apply and is
+ not needed because of PR1401 already fixed
+
+-------------------------------------------------------------------
+Wed Apr 24 13:22:31 UTC 2013 - mvyskocil@suse.com
+
+- apply aarch64 patches on openSUSE 12.3+, EM_AARCH64 is not defined
+ in earlier releases
+
+-------------------------------------------------------------------
+Tue Apr 23 13:33:45 UTC 2013 - mvyskocil@suse.com
+
+- update to icedtea-2.3.9 (bnc#816720)
+* Security fixes
+ - S6657673, CVE-2013-1518: Issues with JAXP
+ - S7200507: Refactor Introspector internals
+ - S8000724, CVE-2013-2417: Improve networking serialization
+ - S8001031, CVE-2013-2419: Better font processing
+ - S8001040, CVE-2013-1537: Rework RMI model
+ - S8001322: Refactor deserialization
+ - S8001329, CVE-2013-1557: Augment RMI logging
+ - S8003335: Better handling of Finalizer thread
+ - S8003445: Adjust JAX-WS to focus on API
+ - S8003543, CVE-2013-2415: Improve processing of MTOM attachments
+ - S8004261: Improve input validation
+ - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames
+ - S8004986, CVE-2013-2383: Better handling of glyph table
+ - S8004987, CVE-2013-2384: Improve font layout
+ - S8004994, CVE-2013-1569: Improve checking of glyph table
+ - S8005432: Update access to JAX-WS
+ - S8005943: (process) Improved Runtime.exec
+ - S8006309: More reliable control panel operation
+ - S8006435, CVE-2013-2424: Improvements in JMX
+ - S8006790: Improve checking for windows
+ - S8006795: Improve font warning messages
+ - S8007406: Improve accessibility of AccessBridge
+ - S8007617, CVE-2013-2420: Better validation of images
+ - S8007667, CVE-2013-2430: Better image reading
+ - S8007918, CVE-2013-2429: Better image writing
+ - S8008140: Better method handle resolution
+ - S8009049, CVE-2013-2436: Better method handle binding
+ - S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap
+ - S8009305, CVE-2013-0401: Improve AWT data transfer
+ - S8009677, CVE-2013-2423: Better setting of setters
+ - S8009699, CVE-2013-2421: Methodhandle lookup
+ - S8009814, CVE-2013-1488: Better driver management
+ - S8009857, CVE-2013-2422: Problem with plugin
+* Backports
+ - S7130662, RH928500: GTK file dialog crashes with a NPE
+* Bug fixes
+ - PR1363: Fedora 19 / rawhide FTBFS SIGILL
+ - PR1401: Fix Zero build on 2.3.8
+ - Fix offset problem in ICU LETableReference.
+ - Change -Werror fix to preserve OpenJDK default.
+ - PR1303: Correct #ifdef to #if
+ - PR1404: Failure to bootstrap with ecj 4.2
+
++++ 429 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.2:Update/.java-1_7_0-openjdk.1855.new/java-1_7_0-openjdk.changes
New:
----
23ae4e0e0cce.tar.gz
2c4981784101.tar.gz
5be6b670d08b.tar.gz
5f53e7717116.tar.gz
65d95818d79e.tar.gz
91c95fd8eea8.tar.gz
ae86c6974e8e.tar.gz
c0e48fdfb695.tar.gz
fontconfig.SuSE.properties
icedtea-2.4.1.tar.gz
icedtea-2.4.1.tar.gz.sig
jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz
java-1.7.0-openjdk-accessible-toolkit.patch
java-1.7.0-openjdk-arm-fixes.patch
java-1.7.0-openjdk-bitmap.patch
java-1.7.0-openjdk-debugdocs.patch
java-1.7.0-openjdk-debuginfo.patch
java-1.7.0-openjdk-fork.patch
java-1.7.0-openjdk-java-access-bridge-idlj.patch
java-1.7.0-openjdk-java-access-bridge-security.patch
java-1.7.0-openjdk-java-access-bridge-tck.patch
java-1.7.0-openjdk-ppc-zero-hotspot.patch
java-1.7.0-openjdk-ppc-zero-jdk.patch
java-1.7.0-openjdk-size_t.patch
java-1.7.0-openjdk-zero-arch.patch
java-1_7_0-openjdk-add-memory-limit.patch
java-1_7_0-openjdk-suse-desktop-files.patch
java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch
java-1_7_0-openjdk.changes
java-1_7_0-openjdk.keyring
java-1_7_0-openjdk.spec
java-access-bridge-1.26.2.tar.bz2
mauve-2008-10-22.tar.gz
mauve_tests
openjdk-7-src-b147-awt-crasher.patch
openjdk-7-src-b147-no-return-in-nonvoid.patch
openjdk-7-src-b147-stringcompare.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
++++ 1152 lines (skipped)
++++++ 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
++++++ java-1.7.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.7.0-openjdk-arm-fixes.patch ++++++
diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
--- openjdk/jdk/make/common/shared/Sanity.gmk.sav 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/common/shared/Sanity.gmk 2012-03-07 17:31:26.153840755 -0500
@@ -814,12 +814,12 @@ ifdef OPENJDK
@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
$(ECHO) "Failed to build freetypecheck." ) > $@
- sane-freetype: $(TEMPDIR)/freetypeinfo
- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
- " or higher is required. \n" \
- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
- fi
+# sane-freetype: $(TEMPDIR)/freetypeinfo
+# @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+# $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+# " or higher is required. \n" \
+# "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
+# fi
else
#do nothing (cross-compiling)
sane-freetype:
diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
--- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-07 17:31:26.154840740 -0500
@@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
# ZERO_ENDIANNESS is the endianness of the processor
case "${ZERO_LIBARCH}" in
- i386|amd64|ia64)
+ i386|amd64|ia64|arm)
ZERO_ENDIANNESS=little
;;
ppc*|s390*|sparc*|alpha)
@@ -307,6 +307,9 @@ if [ "${ZERO_BUILD}" = true ] ; then
s390)
ZERO_ARCHFLAG="-m31"
;;
+ arm)
+ ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
+ ;;
*)
ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
esac
++++++ java-1.7.0-openjdk-bitmap.patch ++++++
diff -up openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390 openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp
--- openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390 2012-02-10 08:30:46.378435291 -0500
+++ openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp 2012-02-10 08:47:27.478427892 -0500
@@ -52,16 +52,16 @@ inline void BitMap::clear_bit(idx_t bit)
inline bool BitMap::par_set_bit(idx_t bit) {
verify_index(bit);
- volatile idx_t* const addr = word_addr(bit);
- const idx_t mask = bit_mask(bit);
- idx_t old_val = *addr;
+ volatile bm_word_t* const addr = word_addr(bit);
+ const bm_word_t mask = bit_mask(bit);
+ bm_word_t old_val = *addr;
do {
- const idx_t new_val = old_val | mask;
+ const bm_word_t new_val = old_val | mask;
if (new_val == old_val) {
return false; // Someone else beat us to it.
}
- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
(volatile void*) addr,
(void*) old_val);
if (cur_val == old_val) {
@@ -73,16 +73,16 @@ inline bool BitMap::par_set_bit(idx_t bi
inline bool BitMap::par_clear_bit(idx_t bit) {
verify_index(bit);
- volatile idx_t* const addr = word_addr(bit);
- const idx_t mask = ~bit_mask(bit);
- idx_t old_val = *addr;
+ volatile bm_word_t* const addr = word_addr(bit);
+ const bm_word_t mask = ~bit_mask(bit);
+ bm_word_t old_val = *addr;
do {
- const idx_t new_val = old_val & mask;
+ const bm_word_t new_val = old_val & mask;
if (new_val == old_val) {
return false; // Someone else beat us to it.
}
- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
(volatile void*) addr,
(void*) old_val);
if (cur_val == old_val) {
++++++ java-1.7.0-openjdk-debugdocs.patch ++++++
--- oldMakefile 2008-07-02 17:48:01.000000000 -0400
+++ openjdk/Makefile 2008-07-02 17:48:09.000000000 -0400
@@ -176,8 +176,7 @@
COMMON_DEBUG_FLAGS= \
DEBUG_NAME=$(DEBUG_NAME) \
- ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) \
- NO_DOCS=true
+ ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME)
product_build: setup
@$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'`
++++++ java-1.7.0-openjdk-debuginfo.patch ++++++
--- openjdk/hotspot/build/linux/makefiles/saproc.make_back 2009-12-14 13:35:46.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/saproc.make 2009-12-14 13:36:47.000000000 +0100
@@ -67,6 +67,7 @@
-I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
$(SASRCFILES) \
$(SA_LFLAGS) \
+ -g \
-o $@ \
-lthread_db
--- openjdk/hotspot/build/linux/makefiles/jsig.make_back 2009-12-14 13:34:56.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/jsig.make 2009-12-14 13:35:31.000000000 +0100
@@ -44,6 +44,7 @@
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
@echo Making signal interposition lib...
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+ -g \
$(LFLAGS_JSIG) -o $@ $< -ldl
install_jsig: $(LIBJSIG)
++++++ java-1.7.0-openjdk-fork.patch ++++++
--- icedtea-2.3.7/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+++ icedtea-2.3.7/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
@@ -5374,14 +5374,6 @@ void Parker::unpark() {
extern char** environ;
-#ifndef __NR_fork
-#define __NR_fork IA32_ONLY(2) IA64_ONLY(not defined) AMD64_ONLY(57)
-#endif
-
-#ifndef __NR_execve
-#define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59)
-#endif
-
// Run the specified command in a separate process. Return its exit value,
// or -1 on failure (e.g. can't fork a new process).
// Unlike system(), this function can be called from signal handler. It
@@ -5392,10 +5384,11 @@ int os::fork_and_exec(char* cmd) {
// fork() in LinuxThreads/NPTL is not async-safe. It needs to run
// pthread_atfork handlers and reset pthread library. All we need is a
// separate process to execve. Make a direct syscall to fork process.
- // On IA64 there's no fork syscall, we have to use fork() and hope for
- // the best...
- pid_t pid = NOT_IA64(syscall(__NR_fork);)
- IA64_ONLY(fork();)
+#ifdef SYS_fork
+ pid_t pid = syscall(SYS_fork);
+#else
+ pid_t pid = syscall(SYS_clone, SIGCHLD, 0, 0, 0, 0);
+#endif
if (pid < 0) {
// fork failed
@@ -5409,10 +5402,7 @@ int os::fork_and_exec(char* cmd) {
// not reset by fork() (see notes above), execve() will instead kill
// every thread in the parent process. We know this is the only thread
// in the new process, so make a system call directly.
- // IA64 should use normal execve() from glibc to match the glibc fork()
- // above.
- NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);)
- IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);)
+ syscall(SYS_execve, "/bin/sh", argv, environ);
// execve failed
_exit(-1);
++++++ java-1.7.0-openjdk-java-access-bridge-idlj.patch ++++++
Index: java-access-bridge-1.26.2/idlgen/Makefile.am
===================================================================
--- java-access-bridge-1.26.2/idlgen/Makefile.am.orig 2008-06-03 08:47:29.000000000 +0200
+++ java-access-bridge-1.26.2/idlgen/Makefile.am 2012-08-30 14:53:46.368752461 +0200
@@ -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)
Index: java-access-bridge-1.26.2/idlgen/Makefile.in
===================================================================
--- java-access-bridge-1.26.2/idlgen/Makefile.in.orig 2008-06-24 05:34:59.000000000 +0200
+++ java-access-bridge-1.26.2/idlgen/Makefile.in 2012-08-30 14:56:21.318370220 +0200
@@ -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; noempty = 1;} \
+ END { if (noempty) { 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; noempty = 1;} \
+ END { if (noempty) { 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) \
@@ -295,8 +295,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; noempty = 1;} \
+ END { if (noempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++
Index: openjdk/jdk/src/share/lib/security/java.security-linux
===================================================================
--- openjdk/jdk/src/share/lib/security/java.security-linux.orig
+++ openjdk/jdk/src/share/lib/security/java.security-linux
@@ -154,7 +154,9 @@ package.access=sun.,\
com.sun.org.apache.xml.internal.security.,\
com.sun.org.glassfish.,\
org.jcp.xml.dsig.internal.,\
- oracle.jrockit.jfr.
+ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
# will cause a security exception to be thrown when
@@ -192,7 +194,9 @@ package.definition=sun.,\
com.sun.org.apache.xml.internal.security.,\
com.sun.org.glassfish.,\
org.jcp.xml.dsig.internal.,\
- oracle.jrockit.jfr.
+ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
#
# Determines whether this properties file can be appended to
# or overridden on the command line via -Djava.security.properties
++++++ java-1.7.0-openjdk-java-access-bridge-tck.patch ++++++
Index: icedtea-2.3.1/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java
===================================================================
--- icedtea-2.3.1/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-06-24 05:24:50.000000000 +0200
+++ icedtea-2.3.1/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java 2012-08-30 14:52:17.068514546 +0200
@@ -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 {
@@ -347,8 +350,12 @@
if (debugFlag)
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");
+ // Not sure what kind of arguments should be sent to ORB
+ 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.7.0-openjdk-ppc-zero-hotspot.patch ++++++
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400
@@ -32,11 +32,11 @@
//
define_pd_global(bool, DontYieldALot, false);
-define_pd_global(intx, ThreadStackSize, 1536);
+define_pd_global(intx, ThreadStackSize, 1664);
#ifdef _LP64
-define_pd_global(intx, VMThreadStackSize, 1024);
+define_pd_global(intx, VMThreadStackSize, 1664);
#else
-define_pd_global(intx, VMThreadStackSize, 512);
+define_pd_global(intx, VMThreadStackSize, 1152);
#endif // _LP64
define_pd_global(intx, SurvivorRatio, 8);
define_pd_global(intx, CompilerThreadStackSize, 0);
++++++ java-1.7.0-openjdk-ppc-zero-jdk.patch ++++++
--- openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
@@ -83,9 +83,9 @@
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
diff -up openjdk/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk
--- openjdk/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100
+++ openjdk/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100
@@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS =
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
++++++ java-1.7.0-openjdk-size_t.patch ++++++
Index: openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.orig
+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
@@ -572,15 +572,15 @@ void MethodLiveness::print_times() {
MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
- _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _gen((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _kill((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _kill((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _entry((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _entry((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _normal_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _normal_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _exception_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _exception_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
_last_bci(-1) {
_analyzer = analyzer;
@@ -998,7 +998,7 @@ bool MethodLiveness::BasicBlock::merge_e
}
MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) {
- MethodLivenessResult answer(NEW_RESOURCE_ARRAY(size_t, _analyzer->bit_map_size_words()),
+ MethodLivenessResult answer(NEW_RESOURCE_ARRAY(BitMap::bm_word_t, _analyzer->bit_map_size_words()),
_analyzer->bit_map_size_bits());
answer.set_is_valid();
Index: openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.orig
+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
@@ -2677,7 +2677,7 @@ void CFLS_LAB::get_from_global_pool(size
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
- n_blks = MIN2(n_blks, CMSOldPLABMax);
+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
}
assert(n_blks > 0, "Error");
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
Index: openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -3586,7 +3586,7 @@ void CMTask::drain_local_queue(bool part
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
+ target_size = MIN2((size_t)(_task_queue->max_elems()/3), (size_t) GCDrainStackTargetSize);
} else {
target_size = 0;
}
@@ -4366,7 +4366,7 @@ size_t G1PrintRegionLivenessInfoClosure:
// The > 0 check is to deal with the prev and next live bytes which
// could be 0.
if (*hum_bytes > 0) {
- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
+ bytes = MIN2((size_t)HeapRegion::GrainBytes, (size_t)*hum_bytes);
*hum_bytes -= bytes;
}
return bytes;
Index: openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -1729,7 +1729,7 @@ HeapWord* G1CollectedHeap::expand_and_al
verify_region_sets_optional();
- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
+ size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes);
ergo_verbose1(ErgoHeapSizing,
"attempt heap expansion",
ergo_format_reason("allocation request failed")
Index: openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
@@ -840,7 +840,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
// This can be done by either mutator threads together with the
// concurrent refinement threads or GC threads.
int HeapRegionRemSet::num_par_rem_sets() {
- return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
+ return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
}
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
Index: openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.orig
+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
@@ -69,7 +69,7 @@ ParMarkBitMap::initialize(MemRegion cove
if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
_region_start = covered_region.start();
_region_size = covered_region.word_size();
- idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
+ BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
_beg_bits.set_map(map);
_beg_bits.set_size(bits / 2);
_end_bits.set_map(map + words / 2);
Index: openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.orig
+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
@@ -198,7 +198,7 @@ bool ParScanThreadState::take_from_overf
const size_t num_overflow_elems = of_stack->size();
const size_t space_available = queue->max_elems() - queue->size();
const size_t num_take_elems = MIN3(space_available / 4,
- ParGCDesiredObjsFromOverflowList,
+ (size_t)ParGCDesiredObjsFromOverflowList,
num_overflow_elems);
// Transfer the most recent num_take_elems from the overflow
// stack to our work queue.
Index: openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.orig
+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
@@ -357,7 +357,7 @@ void GenCollectorPolicy::initialize_size
// generally small compared to the NewRatio calculation.
_min_gen0_size = NewSize;
desired_new_size = NewSize;
- max_new_size = MAX2(max_new_size, NewSize);
+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
} else {
// For the case where NewSize is the default, use NewRatio
// to size the minimum and initial generation sizes.
@@ -365,10 +365,10 @@ void GenCollectorPolicy::initialize_size
// NewRatio is overly large, the resulting sizes can be too
// small.
_min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
- NewSize);
+ (size_t)NewSize);
desired_new_size =
MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),
- NewSize);
+ (size_t)NewSize);
}
assert(_min_gen0_size > 0, "Sanity check");
@@ -423,14 +423,14 @@ bool TwoGenerationCollectorPolicy::adjus
// Adjust gen0 down to accomodate OldSize
*gen0_size_ptr = heap_size - min_gen0_size;
*gen0_size_ptr =
- MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
+ MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),
min_alignment());
assert(*gen0_size_ptr > 0, "Min gen0 is too large");
result = true;
} else {
*gen1_size_ptr = heap_size - *gen0_size_ptr;
*gen1_size_ptr =
- MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),
+ MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),
min_alignment());
}
}
@@ -454,7 +454,7 @@ void TwoGenerationCollectorPolicy::initi
// for setting the gen1 maximum.
_max_gen1_size = max_heap_byte_size() - _max_gen0_size;
_max_gen1_size =
- MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),
+ MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),
min_alignment());
// If no explicit command line flag has been set for the
// gen1 size, use what is left for gen1.
@@ -468,11 +468,11 @@ void TwoGenerationCollectorPolicy::initi
"gen0 has an unexpected minimum size");
set_min_gen1_size(min_heap_byte_size() - min_gen0_size());
set_min_gen1_size(
- MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()),
+ MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()),
min_alignment()));
set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size());
set_initial_gen1_size(
- MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()),
+ MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()),
min_alignment()));
} else {
Index: openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
===================================================================
--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.orig
+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
@@ -46,7 +46,7 @@ void objArrayKlass::objarray_follow_cont
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
const size_t end_index = beg_index + stride;
T* const base = (T*)a->base();
T* const beg = base + beg_index;
@@ -80,7 +80,7 @@ void objArrayKlass::objarray_follow_cont
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
const size_t end_index = beg_index + stride;
T* const base = (T*)a->base();
T* const beg = base + beg_index;
Index: openjdk/hotspot/src/share/vm/runtime/arguments.cpp
===================================================================
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp.orig
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
@@ -1224,7 +1224,7 @@ void Arguments::set_cms_and_parnew_gc_fl
// so it's NewRatio x of NewSize.
if (FLAG_IS_DEFAULT(OldSize)) {
if (max_heap > NewSize) {
- FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize));
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
++++++ java-1.7.0-openjdk-zero-arch.patch ++++++
--- openjdk/hotspot/make/linux/makefiles/defs.make
+++ openjdk/hotspot/make/linux/makefiles/defs.make
@@ -38,7 +38,7 @@ else
endif
# zero
-ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
+ifeq ($(findstring zero, $(JVM_VARIANTS)), zero)
ifeq ($(ARCH_DATA_MODEL), 64)
MAKE_ARGS += LP64=1
endif
++++++ java-1_7_0-openjdk-add-memory-limit.patch ++++++
Index: icedtea-2.3.2/Makefile.am
===================================================================
--- icedtea-2.3.2.orig/Makefile.am 2012-08-31 16:12:45.117462371 +0200
+++ icedtea-2.3.2/Makefile.am 2012-09-04 10:43:29.052561796 +0200
@@ -1980,7 +1980,7 @@
if WITH_RHINO
mkdir -p rhino/rhino.{old,new} && \
(cd rhino/rhino.old && $(BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
- $(BOOT_DIR)/bin/java -cp $(REWRITER_BUILD_DIR) \
+ $(BOOT_DIR)/bin/java -Xmx256m -Xms128m -cp $(REWRITER_BUILD_DIR) \
com.redhat.rewriter.ClassRewriter \
$(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
org.mozilla sun.org.mozilla && \
Index: icedtea-2.3.2/Makefile.in
===================================================================
--- icedtea-2.3.2.orig/Makefile.in 2012-08-31 21:37:17.545573948 +0200
+++ icedtea-2.3.2/Makefile.in 2012-09-04 10:44:04.127811173 +0200
@@ -2388,7 +2388,7 @@
stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
@WITH_RHINO_TRUE@ mkdir -p rhino/rhino.{old,new} && \
@WITH_RHINO_TRUE@ (cd rhino/rhino.old && $(BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
-@WITH_RHINO_TRUE@ $(BOOT_DIR)/bin/java -cp $(REWRITER_BUILD_DIR) \
+@WITH_RHINO_TRUE@ $(BOOT_DIR)/bin/java -Xmx256m -Xms128m -cp $(REWRITER_BUILD_DIR) \
@WITH_RHINO_TRUE@ com.redhat.rewriter.ClassRewriter \
@WITH_RHINO_TRUE@ $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
@WITH_RHINO_TRUE@ org.mozilla sun.org.mozilla && \
++++++ java-1_7_0-openjdk-suse-desktop-files.patch ++++++
Index: icedtea-2.3.1/jconsole.desktop
===================================================================
--- icedtea-2.3.1.orig/jconsole.desktop
+++ icedtea-2.3.1/jconsole.desktop
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Monitoring & Management Console
+GenericName=OpenJDK Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications
Exec=/usr/bin/jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
Version=1.0
Index: icedtea-2.3.1/policytool.desktop
===================================================================
--- icedtea-2.3.1.orig/policytool.desktop
+++ icedtea-2.3.1/policytool.desktop
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Policy Tool
+GenericName=OpenJDK Policy Tool
Comment=Manage OpenJDK policy files
Exec=/usr/bin/policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
+Categories=Settings;DesktopSettings;Security;
Version=1.0
++++++ java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch ++++++
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -67,6 +67,7 @@
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return frame();
}
frame os::current_frame() {
@@ -439,6 +440,7 @@
extern "C" {
int SpinPause() {
+ return 0;
}
int SafeFetch32(int *adr, int errValue) {
--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -142,6 +142,7 @@ jboolean XShared_initIDs(JNIEnv *env, jb
#endif /* MITSHM */
#endif /* !HEADLESS */
+return JNI_FALSE;
}
@@ -491,6 +492,7 @@ jboolean XShared_initSurface(JNIEnv *env
return JNI_TRUE;
#endif /* !HEADLESS */
+return JNI_FALSE;
}
--- openjdk/hotspot/src/share/vm/utilities/debug.hpp
+++ openjdk/hotspot/src/share/vm/utilities/debug.hpp
@@ -166,14 +166,14 @@
// error reporting helper functions
void report_vm_error(const char* file, int line, const char* error_msg,
- const char* detail_msg = NULL);
-void report_fatal(const char* file, int line, const char* message);
+ const char* detail_msg = NULL) __attribute__((noreturn));
+void report_fatal(const char* file, int line, const char* message) __attribute__((noreturn));
void report_vm_out_of_memory(const char* file, int line, size_t size,
- const char* message);
-void report_should_not_call(const char* file, int line);
-void report_should_not_reach_here(const char* file, int line);
-void report_unimplemented(const char* file, int line);
-void report_untested(const char* file, int line, const char* message);
+ const char* message) __attribute__((noreturn));
+void report_should_not_call(const char* file, int line) __attribute__((noreturn));
+void report_should_not_reach_here(const char* file, int line) __attribute__((noreturn));
+void report_unimplemented(const char* file, int line) __attribute__((noreturn));
+void report_untested(const char* file, int line, const char* message) __attribute__((noreturn));
void warning(const char* format, ...);
++++++ java-1_7_0-openjdk.keyring ++++++
pub 4096R/248BDC07 2011-09-28 [expires: 2013-10-12]
uid Andrew John Hughes
From http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-December/021050.h... # HG changeset patch # User aph # Date 1354629728 0 # Node ID ea20c9388d90fd9fda085c59ceae25ea9d686ec6 # Parent 4aad3e6f68d2463f4fee63c93153394be6489c00 8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c Summary: Code does not check for JNU_GetEnv returning NULL. Reviewed-by: anthony
diff -r 4aad3e6f68d2 -r ea20c9388d90 openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c --- a/openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Tue Dec 04 17:17:45 2012 +0400 +++ b/openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Tue Dec 04 14:02:08 2012 +0000 @@ -1260,13 +1260,15 @@ JavaVM* jvm = NULL; static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) { + JNIEnv * env; if (jvm != NULL) { - JNIEnv * env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); - return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", - ptr_to_jlong(dpy), ptr_to_jlong(event)).i; - } else { - return 0; + env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); + if (env) { + return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", + ptr_to_jlong(dpy), ptr_to_jlong(event)).i; + } } + return 0; } /* ++++++ openjdk-7-src-b147-no-return-in-nonvoid.patch ++++++ --- java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c +++ java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c @@ -142,6 +142,7 @@ jboolean XShared_initIDs(JNIEnv *env, jb #endif /* MITSHM */ #endif /* !HEADLESS */ +return JNI_FALSE; } @@ -491,6 +492,7 @@ jboolean XShared_initSurface(JNIEnv *env return JNI_TRUE; #endif /* !HEADLESS */ +return JNI_FALSE; } --- icedtea-2.3.2/openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.old +++ icedtea-2.3.2/openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -528,6 +528,7 @@ err.report_and_die(); ShouldNotReachHere(); + return 0; // to make gcc happy } void os::Linux::init_thread_fpu_state(void) { --- icedtea-2.3.2/openjdk/hotspot/src/share/vm/utilities/debug.hpp 2012-08-30 21:29:26.000000000 +0200 +++ icedtea-2.3.2/openjdk/hotspot/src/share/vm/utilities/debug.hpp 2012-09-06 00:27:08.074437225 +0200 @@ -191,14 +191,14 @@ // error reporting helper functions void report_vm_error(const char* file, int line, const char* error_msg, - const char* detail_msg = NULL); -void report_fatal(const char* file, int line, const char* message); + const char* detail_msg = NULL) __attribute__((noreturn)); +void report_fatal(const char* file, int line, const char* message) __attribute__((noreturn)); void report_vm_out_of_memory(const char* file, int line, size_t size, - const char* message); -void report_should_not_call(const char* file, int line); -void report_should_not_reach_here(const char* file, int line); -void report_unimplemented(const char* file, int line); -void report_untested(const char* file, int line, const char* message); + const char* message) __attribute__((noreturn)); +void report_should_not_call(const char* file, int line) __attribute__((noreturn)); +void report_should_not_reach_here(const char* file, int line) __attribute__((noreturn)); +void report_unimplemented(const char* file, int line) __attribute__((noreturn)); +void report_untested(const char* file, int line, const char* message) __attribute__((noreturn)); void warning(const char* format, ...); ++++++ openjdk-7-src-b147-stringcompare.patch ++++++ Index: java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c =================================================================== --- java-1_7_0-openjdk.orig/openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c +++ java-1_7_0-openjdk/openjdk/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, "") != 0) JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); /* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org