Hello community,
here is the log from the commit of package java-1_7_0-openjdk.2260 for
openSUSE:12.2:Update checked in at 2013-12-04 12:48:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/java-1_7_0-openjdk.2260 (Old)
and /work/SRC/openSUSE:12.2:Update/.java-1_7_0-openjdk.2260.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk.2260"
Changes:
--------
New Changes file:
--- /dev/null 2013-11-25 01:44:08.036031256 +0100
+++
/work/SRC/openSUSE:12.2:Update/.java-1_7_0-openjdk.2260.new/java-1_7_0-openjdk.changes
2013-12-04 12:48:44.000000000 +0100
@@ -0,0 +1,930 @@
+-------------------------------------------------------------------
+Mon Nov 18 14:50:03 UTC 2013 - [email protected]
+
+- disable bootstrap build, among others fixes bnc#850880
+- disable download of tarballs
+- remove cacerts file if it has wrong mime-type (bnc#847952)
+
+-------------------------------------------------------------------
+Tue Oct 29 09:53:04 UTC 2013 - [email protected]
+
+- refresh zero-powerpc patches
+ * java-1.7.0-openjdk-ppc-zero-hotspot.patch
+ * java-1.7.0-openjdk-ppc-zero-jdk.patch
+- re-add _constraints
+
+-------------------------------------------------------------------
+Tue Oct 22 13:29:45 UTC 2013 - [email protected]
+
+- Update to icedtea 2.4.3 (bnc#846999)
+ synchronized OpenJDK 7 support with the upstream u45 b31 tag
+* Security fixes
+ - S8006900, CVE-2013-3829: Add new date/time capability
+ - S8008589: Better MBean permission validation
+ - S8011071, CVE-2013-5780: Better crypto provider handling
+ - S8011081, CVE-2013-5772: Improve jhat
+ - S8011157, CVE-2013-5814: Improve CORBA portablility
+ - S8012071, CVE-2013-5790: Better Building of Beans
+ - S8012147: Improve tool support
+ - S8012277: CVE-2013-5849: Improve AWT DataFlavor
+ - S8012425, CVE-2013-5802: Transform TransformerFactory
+ - S8013503, CVE-2013-5851: Improve stream factories
+ - S8013506: Better Pack200 data handling
+ - S8013510, CVE-2013-5809: Augment image writing code
+ - S8013514: Improve stability of cmap class
+ - S8013739, CVE-2013-5817: Better LDAP resource management
+ - S8013744, CVE-2013-5783: Better tabling for AWT
+ - S8014085: Better serialization support in JMX classes
+ - S8014093, CVE-2013-5782: Improve parsing of images
+ - S8014098: Better profile validation
+ - S8014102, CVE-2013-5778: Improve image conversion
+ - S8014341, CVE-2013-5803: Better service from Kerberos servers
+ - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some
class loader configurations
+ - S8014530, CVE-2013-5825: Better digital signature processing
+ - S8014534: Better profiling support
+ - S8014987, CVE-2013-5842: Augment serialization handling
+ - S8015614: Update build settings
+ - S8015731: Subject java.security.auth.subject to improvements
+ - S8015743, CVE-2013-5774: Address internet addresses
+ - S8016256: Make finalization final
+ - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in
names
+ - S8016675, CVE-2013-5797: Make Javadoc pages more robust
+ - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately
+ - S8017287, CVE-2013-5829: Better resource disposal
+ - S8017291, CVE-2013-5830: Cast Proxies Aside
+ - S8017298, CVE-2013-4002: Better XML support
+ - S8017300, CVE-2013-5784: Improve Interface Implementation
+ - S8017505, CVE-2013-5820: Better Client Service
+ - S8019292: Better Attribute Value Exceptions
+ - S8019617: Better view of objects
+ - S8020293: JVM crash
+ - S8021275, CVE-2013-5805: Better screening for ScreenMenu
+ - S8021282, CVE-2013-5806: Better recycling of object instances
+ - S8021286: Improve MacOS resourcing
+ - S8021290, CVE-2013-5823: Better signature validation
+ - S8022931, CVE-2013-5800: Enhance Kerberos exceptions
+ - S8022940: Enhance CORBA translations
+ - S8023683: Enhance class file parsing
+* Backports
+ - S6614237: missing codepage Cp290 at java runtime
+ - S8005932: Java 7 on mac os x only provides text clipboard formats
+ - S8014046: (process) Runtime.exec(String) fails if command contains spaces
[win]
+ - S8015144: Performance regression in ICU OpenType Layout library
+ - S8015965: (process) Typo in name of property to allow ambiguous commands
+ - S8015978: Incorrect transformation of XPath expression "string(-0)"
+ - S8016357: Update hotspot diagnostic class
+ - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java
failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid
notification: null
+ - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case
crashes
+ - S8020032: 7u fastdebug doesn't generate fastdebuginfo file
+ - S8020085: Linux ARM build failure for 7u45
+ - S8020088: Increment minor version of HSx for 7u45 and initialize the build
number
+ - S8020551: increment hsx build to b03 for 7u45-b03
+ - S8020943: Memory leak when GCNotifier uses
create_from_platform_dependent_str()
+ - S8021287: Improve MacOS resourcing
+ - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since
7u45 b01 on Linux, Solaris
+ - S8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP
protocol with security manager
+ - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during
7u45 nightly testing
+ - S8021577: JCK test
api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input
has failed since jdk 7u45 b01
+ - S8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40
+ - S8021901: Increment hsx build to b05 for 7u45-b05
+ - S8021933: Add extra check for fix # JDK-8014530
+ - S8021969: The index_AccessAllowed jnlp can not load successfully with
exception thrown in the log.
+ - S8022066: Evaluation of method reference to signature polymorphic method
crashes VM
+ - S8022086: Fixing licence of newly added files
+ - S8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
+ - S8022661: InetAddress.writeObject() performs flush() on object output
stream
+ - S8022682: Supporting XOM
+ - S8022808: Kitchensink hangs on macos
+ - S8022856: 7u45 l10n resource file translation update
+ - S8023323: Increment hsx build to b06 for 7u45-b08
+ - S8023457: Event based tracing framework needs a mutex for thread groups
+ - S8023478: Test fails with HS crash in GCNotifier.
+ - S8023741: Increment hsx 24.45 build to b07 for 7u45-b09
+ - S8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java
-version, build number in the bundles names should not be changed to b00
+ - S8023888: Increment hsx 24.45 build to b08 for 7u45-b10
+ - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d
+ - S8024369: Increment build # of hs24.0 to b57 for 7u40-b61 psu
+ - S8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test
fails with 7u45 b11
+ - S8024697: Fix for 8020983 causes Xcheck:jni warnings
+ - S8024863: X11: Support GNOME Shell as mutter
+ - S8024883: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx)
+ - S8025128: File.createTempFile fails if prefix is absolute path
+ - S8025170: jdk7u51 7u-1-prebuild is failing since 9/19
+* Bug fixes
+ - PR1400: Menu of maximized AWT window not working in Mate
+
+-------------------------------------------------------------------
+Wed Sep 25 07:44:27 UTC 2013 - [email protected]
+
+- Update to icedtea 2.4.2
+* System LCMS 2 support again enabled by default, requiring 2.5 or above.
+* OpenJDK
+ - S7122222: GC log is limited to 2G for 32-bit
+ - S7162400: Intermittent java.io.IOException: Bad file number during
HotSpotVirtualMachine.executeCommand
+ - S7165807: Non optimized initialization of NSS crypto library leads to
scalability issues
+ - S7199324: IPv6: JMXConnectorServer.getConnectionIDs() return IDs
contradicting to address grammar
+ - S8001345: VM crashes with assert(n->outcnt() != 0 || C->top() == n ||
n->is_Proj()) failed: No dead instructions after post-alloc
+ - S8001424: G1: Rename certain G1-specific flags
+ - S8001425: G1: Change the default values for certain G1 specific flags
+ - S8004859: Graphics.getClipBounds/getClip return difference nonequivalent
bounds, depending from transform
+ - S8005019: JTable passes row index instead of length when inserts selection
interval
+ - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of
pointer 'scale' allocated with calloc()
+ - S8006941: [macosx] Deadlock in drag and drop
+ - S8007898: Incorrect optimization of Memory Barriers in
Matcher::post_store_load_barrier()
+ - S8009168: accessibility.properties syntax issue
+ - S8009985: [parfait] Uninitialised variable at
jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c
+ - S8011064: Some tests have failed with SIGSEGV on arm-hflt on build b82
+ - S8011569: ARM -- avoid native stack walking
+ - S8011760: assert(delta != 0) failed: dup pointer in
MemBaseline::malloc_sort_by_addr
+ - S8012144: multiple SIGSEGVs fails on staxf
+ - S8012156: tools/javac/file/zip/T6865530.java fails for win32/64
+ - S8012241: NMT huge memory footprint, it usually leads to OOME
+ - S8012366: Fix for 8007815 breaks down when only building OpenJDK (without
deploy and install forests)
+ - S8013546: compiler/8011901/Test8011901.java fails with CompilationError:
Compilation failed
+ - S8013719: Increment build # of hs23.21 to b02
+ - S8013791: G1: G1CollectorPolicy::initialize_flags() may set min_alignment
> max_alignment
+ - S8014264: The applet pathguy_TimeDead throws
java.lang.NullPointerException in java console once click drop-down check box.
+ - S8014312: Fork hs23.25 hsx from hs23.21 for jdk7u25 and reinitialize build
number
+ - S8014805: NPE is thrown during certpath validation if certificate does not
have AuthorityKeyIdentifier extension
+ - S8014850: Third Party License Readme updates for 7u40
+ - S8014925: Disable sun.reflect.Reflection.getCallerClass(int) with a
temporary switch to re-enable it
+ - S8015237: Parallelize string table scanning during strong root processing
+ - S8015411: Bump the hsx build number for 7u21-b50 for customer
+ - S8015441: runThese crashed with assert(opcode == Op_ConP || opcode ==
Op_ThreadLocal || opcode == Op_CastX2P ..) failed: sanity
+ - S8015576: CMS: svc agent throws java.lang.RuntimeException: No type named
"FreeList" in database
+ - S8015668: overload resolution: performance regression in JDK 7
+ - S8015884: runThese crashed with SIGSEGV, hs_err has an error instead of
stacktrace
+ - S8016074: NMT: assertion failed: assert(thread->thread_state() == from)
failed: coming from wrong thread state
+ - S8016102: Increment build # of hs23.25 to b02 for 7u25-b31 psu
+ - S8016131: nsk/sysdict/vm/stress/chain tests crash the VM in
'entry_frame_is_first()'
+ - S8016133: Regression: diff. behavior with user-defined SAXParser
+ - S8016157: During CTW: C2: assert(!def_outside->member(r)) failed: Use of
external LRG overlaps the same LRG defined in this block
+ - S8016331: Minor issues in event tracing metadata
+ - S8016648: FEATURE_SECURE_PROCESSING set to true or false causes
SAXParseException to be thrown
+ - S8016734: Remove extra code due to duplicated push
+ - S8016737: After clicking on "Print UNCOLLATED" button, the print out come
in order 'Page 1', 'Page 2', 'Page 1'
+ - S8016740: assert in GC_locker from PSOldGen::expand with
-XX:+PrintGCDetails and Verbose
+ - S8016767: Provide man pages generated from DARB for OpenJDK
+ - S8017070: G1: assert(_card_counts[card_num] <= G1ConcRSHotCardLimit) failed
+ - S8017159: Unexclude sun/tools/JMAP/Basic.sh test
+ - S8017173: XMLCipher with RSA_OAEP Key Transport algorithm can't be
instantiated
+ - S8017174: NPE when using Logger.getAnonymousLogger or
LogManager.getLogManager().getLogger
+ - S8017189: [macosx] AWT program menu disabled on Mac
+ - S8017252: new hotspot build - hs24-b51
+ - S8017478: Kitchensink crashed with SIGSEGV in
BaselineReporter::diff_callsites
+ - S8017483: G1 tests fail with native OOME on Solaris x86 after
HeapBaseMinAddress has been increased
+ - S8017510: Add a regression test for 8005956
+ - S8017566: Backout 8000450 - Cannot access to
com.sun.corba.se.impl.orb.ORBImpl
+ - S8017588: SA: jstack -l throws UnalignedAddressException while attaching
to core file for java that was started with CMS GC
+ - S8019155: Update makefiles with correct jfr packages
+ - S8019201: Regression: java.awt.image.ConvolveOp throws
java.awt.image.ImagingOpException
+ - S8019236: [macosx] Add javadoc to the handleWindowFocusEvent in
CEmbeddedFrame
+ - S8019265: [macosx] apple.laf.useScreenMenuBar regression comparing with
jdk6
+ - S8019298: new hotspot build - hs24-b52
+ - S8019381: HashMap.isEmpty is non-final, potential issues for get/remove
+ - S8019541: 7u40 l10n resource file translation update
+ - S8019587: [macosx] Possibility to set the same frame for the different
screens
+ - S8019625: Test compiler/8005956/PolynomialRoot.java timeouts on Solaris
SPARCs
+ - S8019628: [macosx]
closed/java/awt/Modal/BlockedMouseInputTest/BlockedMouseInputTest.html failed
since 7u40b30 on MacOS
+ - S8019826: Test com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java
fails with NPE
+ - S8019933: new hotspot build - hs24-b53
+ - S8019979: Replace CheckPackageAccess test with better one from closed repo
+ - S8020038: [macosx] Incorrect usage of invokeLater() and likes in callbacks
called via JNI from AppKit thread
+ - S8020054: (tz) Support tzdata2013d
+ - S8020155: PSR:PERF G1 not collecting old regions when humongous
allocations interfer
+ - S8020215: Different execution plan when using JIT vs interpreter
+ - S8020228: Restore the translated version of logging_xx.properties
+ - S8020298: [macosx] Incorrect merge in the lwawt code
++++ 733 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:12.2:Update/.java-1_7_0-openjdk.2260.new/java-1_7_0-openjdk.changes
New:
----
2c4981784101.tar.gz
3c8eb52a32ea.tar.gz
652eb396f959.tar.gz
7958751eb9ef.tar.gz
8ed5df839fbc.tar.gz
8f220f7b51c7.tar.gz
PStack-808293.patch
RH661505-toBeReverted.patch
_constraints
abrt_friendly_hs_log_jdk7.patch
b59e02d9e72b.tar.gz
e2f5917da3c1.tar.gz
fontconfig.SuSE.properties
gstackbounds.patch
icedtea-2.4.3.tar.xz
icedtea-2.4.3.tar.xz.sig
jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz
java-1.7.0-openjdk-accessible-toolkit.patch
java-1.7.0-openjdk-debugdocs.patch
java-1.7.0-openjdk-debuginfo.patch
java-1.7.0-openjdk-freetype-check-fix.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-makefiles-zero.patch
java-1.7.0-openjdk-ppc-zero-hotspot.patch
java-1.7.0-openjdk-ppc-zero-jdk.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-no-return-in-nonvoid.patch
openjdk-7-src-b147-stringcompare.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
++++ 1156 lines (skipped)
++++++ PStack-808293.patch ++++++
--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java
2012-04-06 02:26:33.322164601 +0200
+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java
2012-04-06 02:26:57.958514071 +0200
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Red Hat Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -84,7 +85,8 @@
out.print("----------------- ");
out.print(th);
out.println(" -----------------");
- while (f != null) {
+ int maxStack = 256;
+ while (f != null && maxStack-- > 0) {
ClosestSymbol sym = f.closestSymbolToPC();
Address pc = f.pc();
out.print(pc + "\t");
@@ -158,10 +160,19 @@
printUnknown(out);
}
}
+ Address oldPC = f.pc();
+ Address oldFP = f.localVariableBase();
f = f.sender(th);
+ if (f != null
+ && oldPC.equals(f.pc())
+ && oldFP.equals(f.localVariableBase())) {
+ // We didn't make any progress
+ f = null;
+ }
}
} catch (Exception exp) {
- exp.printStackTrace();
+ // exp.printStackTrace();
+ out.println("bad stack: " + exp);
// continue, may be we can do a better job for other threads
}
if (isJava && concurrentLocks) {
++++++ RH661505-toBeReverted.patch ++++++
# HG changeset patch
# User andrew
# Date 1378467880 -3600
# Node ID 3372405e49a9e5cd27af64e16eb7e44539ea3339
# Parent b2611b1a750cf38b795d1df24c5bea9b9c246e0f
RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
diff -r b2611b1a750c -r 3372405e49a9
src/share/native/sun/awt/image/jpeg/imageioJPEG.c
--- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Wed Sep
04 18:20:38 2013 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Fri Sep
06 12:44:40 2013 +0100
@@ -1454,6 +1454,8 @@
"[S");
}
+#define JPEG_APP1 (JPEG_APP0 + 1) /* EXIF APP1 marker code */
+
JNIEXPORT jlong JNICALL
Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader
(JNIEnv *env,
@@ -1507,6 +1509,7 @@
// Set up to keep any APP2 markers, as these might contain ICC profile
// data
+ jpeg_save_markers(cinfo, JPEG_APP1, 0xFFFF);
jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
/*
@@ -1569,8 +1572,6 @@
imageio_init_source((j_decompress_ptr) cinfo);
}
-#define JPEG_APP1 (JPEG_APP0 + 1) /* EXIF APP1 marker code */
-
/*
* For EXIF images, the APP1 will appear immediately after the SOI,
* so it's safe to only look at the first marker in the list.
++++++ _constraints ++++++
<constraints>
<hardware>
<physicalmemory>
<size unit="M">2048</size>
</physicalmemory>
</hardware>
</constraints>
++++++ abrt_friendly_hs_log_jdk7.patch ++++++
--- openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2012-02-02
16:17:24.476664897 +0100
+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2012-02-02
16:17:24.476664897 +0100
@@ -929,6 +929,7 @@
}
}
+ /*
if (fd == -1) {
const char *cwd = os::get_current_directory(buffer, sizeof(buffer));
size_t len = strlen(cwd);
@@ -938,6 +939,24 @@
os::file_separator(), os::current_process_id());
fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666);
}
+ */
+
+ if (fd == -1) {
+ const char * tmpdir = os::get_temp_directory();
+ // try temp directory if it exists.
+ if (tmpdir != NULL && tmpdir[0] != '\0') {
+ jio_snprintf(buffer, sizeof(buffer), "%s%sjvm-%u",
+ tmpdir, os::file_separator(), os::current_process_id());
+ // if mkdir() failed, hs_err will be created in temporary directory
+ if (!mkdir(buffer, 0700)) { // only read+execute flags are needed
+ // but we need to write into the
directory too
+ jio_snprintf(buffer, sizeof(buffer), "%s%sjvm-%u%shs_error.log",
+ tmpdir, os::file_separator(),
os::current_process_id(),
+ os::file_separator());
+ fd = open(buffer, O_WRONLY | O_CREAT | O_TRUNC, 0444); //
read-only file
+ }
+ }
+ }
if (fd == -1) {
const char * tmpdir = os::get_temp_directory();
++++++ 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
++++++ gstackbounds.patch ++++++
diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
@@ -2763,39 +2763,47 @@
// writing thread stacks don't use growable mappings (i.e. those
// creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this
// only applies to the main thread.
-
-static
-bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) {
-
- char buf[128];
- int fd, sz;
-
- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) {
+static bool
+get_stack_bounds(uintptr_t *bottom, uintptr_t *top)
+{
+ FILE *f = fopen("/proc/self/maps", "r");
+ if (f == NULL)
return false;
- }
-
- const char kw[] = "[stack]";
- const int kwlen = sizeof(kw)-1;
-
- // Address part of /proc/self/maps couldn't be more than 128 bytes
- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) {
- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) {
- // Extract addresses
- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
- uintptr_t sp = (uintptr_t) __builtin_frame_address(0);
- if (sp >= *bottom && sp <= *top) {
- ::close(fd);
- return true;
- }
+
+ while (!feof(f)) {
+ size_t dummy;
+ char *str = NULL;
+ ssize_t len = getline(&str, &dummy, f);
+ if (len == -1) {
+ fclose(f);
+ if (str != NULL)
+ free(str);
+ return false;
+ }
+
+ if (len > 0 && str[len-1] == '\n') {
+ str[len-1] = 0;
+ len--;
+ }
+
+ static const char *stack_str = "[stack]";
+ if (len > (ssize_t)strlen(stack_str)
+ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) {
+ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
+ uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
+ if (sp >= *bottom && sp <= *top) {
+ free(str);
+ fclose(f);
+ return true;
}
- }
- }
-
- ::close(fd);
+ }
+ }
+ free(str);
+ }
+ fclose(f);
return false;
}
-
// If the (growable) stack mapping already extends beyond the point
// where we're going to put our guard pages, truncate the mapping at
// that point by munmap()ping it. This ensures that when we later
diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
--- openjdk/hotspot/src/share/vm/runtime/os.cpp
+++ openjdk/hotspot/src/share/vm/runtime/os.cpp
@@ -1353,43 +1353,6 @@
return result;
}
-// Read file line by line, if line is longer than bsize,
-// skip rest of line.
-int os::get_line_chars(int fd, char* buf, const size_t bsize){
- size_t sz, i = 0;
-
- // read until EOF, EOL or buf is full
- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] !=
'\n') {
- ++i;
- }
-
- if (buf[i] == '\n') {
- // EOL reached so ignore EOL character and return
-
- buf[i] = 0;
- return (int) i;
- }
-
- buf[i+1] = 0;
-
- if (sz != 1) {
- // EOF reached. if we read chars before EOF return them and
- // return EOF on next call otherwise return EOF
-
- return (i == 0) ? -1 : (int) i;
- }
-
- // line is longer than size of buf, skip to EOL
- char ch;
- while (read(fd, &ch, 1) == 1 && ch != '\n') {
- // Do nothing
- }
-
- // return initial part of line that fits in buf.
- // If we reached EOF, it will be returned on next call.
-
- return (int) i;
-}
void os::SuspendedThreadTask::run() {
assert(Threads_lock->owned_by_self() || (_thread == VMThread::vm_thread()),
"must have threads lock to call this");
diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp
--- openjdk/hotspot/src/share/vm/runtime/os.hpp
+++ openjdk/hotspot/src/share/vm/runtime/os.hpp
@@ -672,10 +672,6 @@
// Hook for os specific jvm options that we don't want to abort on seeing
static bool obsolete_option(const JavaVMOption *option);
- // Read file line by line. If line is longer than bsize,
- // rest of line is skipped. Returns number of bytes read or -1 on EOF
- static int get_line_chars(int fd, char *buf, const size_t bsize);
-
// Extensions
#include "runtime/os_ext.hpp"
++++++ 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-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-freetype-check-fix.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:
++++++ 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-makefiles-zero.patch ++++++
--- openjdk/hotspot/make/linux/makefiles/zero.make
+++ openjdk/hotspot/make/linux/makefiles/zero.make
@@ -34,3 +34,13 @@ VM_SUBDIR = server
# Make sure libffi is included
CFLAGS += $(LIBFFI_CFLAGS)
LIBS_VM += $(LIBFFI_LIBS)
+
+# Specify that the CPU is little endian, if necessary
+ifeq ($(ZERO_ENDIANNESS), little)
+ CFLAGS += -DVM_LITTLE_ENDIAN
+endif
+
+# Specify that the CPU is 64 bit, if necessary
+ifeq ($(ARCH_DATA_MODEL), 64)
+ CFLAGS += -D_LP64=1
+endif
++++++ java-1.7.0-openjdk-ppc-zero-hotspot.patch ++++++
Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
===================================================================
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.orig
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
@@ -34,9 +34,9 @@
define_pd_global(bool, DontYieldALot, false);
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, CompilerThreadStackSize, 0);
define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
++++++ java-1.7.0-openjdk-ppc-zero-jdk.patch ++++++
Index: openjdk/jdk/make/common/shared/Defs-java.gmk
===================================================================
--- openjdk/jdk/make/common/shared/Defs-java.gmk.orig
+++ openjdk/jdk/make/common/shared/Defs-java.gmk
@@ -88,7 +88,7 @@ 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=1664
endif
Index: openjdk/corba/make/common/shared/Defs-java.gmk
===================================================================
--- openjdk/corba/make/common/shared/Defs-java.gmk.orig
+++ openjdk/corba/make/common/shared/Defs-java.gmk
@@ -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=1664
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
++++++ 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 <[email protected]>
uid Dr Andrew John Hughes <[email protected]>
uid Dr Andrew John Hughes <[email protected]>
sub 4096R/954E386D 2011-09-28 [expires: 2013-10-12]
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (GNU/Linux)
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
JLGXasD0ex7Eg+JtenBjCyxa9A==
=GBrO
-----END PGP PUBLIC KEY BLOCK-----
++++++ mauve_tests ++++++
++++ 2571 lines (skipped)
++++++ 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: [email protected]
For additional commands, e-mail: [email protected]
