Hello community,
here is the log from the commit of package java-1_7_0-openjdk.3707 for
openSUSE:13.2:Update checked in at 2015-04-27 12:44:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/java-1_7_0-openjdk.3707 (Old)
and /work/SRC/openSUSE:13.2:Update/.java-1_7_0-openjdk.3707.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk.3707"
Changes:
--------
New Changes file:
--- /dev/null 2015-03-12 01:14:30.992027505 +0100
+++
/work/SRC/openSUSE:13.2:Update/.java-1_7_0-openjdk.3707.new/java-1_7_0-openjdk-bootstrap.changes
2015-04-27 12:44:26.000000000 +0200
@@ -0,0 +1,2811 @@
+-------------------------------------------------------------------
+Wed Apr 15 07:31:03 UTC 2015 - [email protected]
+
+- Update to 2.5.5 - OpenJdk 7u79
+ * Security fixes
+ - S8059064: Better G1 log caching
+ - S8060461: Fix for JDK-8042609 uncovers additional issue
+ - S8064601, CVE-2015-0480: Improve jar file handling
+ - S8065286: Fewer subtable substitutions
+ - S8065291: Improved font lookups
+ - S8066479: Better certificate chain validation
+ - S8067050: Better font consistency checking
+ - S8067684: Better font substitutions
+ - S8067699, CVE-2015-0469: Better glyph storage
+ - S8068320, CVE-2015-0477: Limit applet requests
+ - S8068720, CVE-2015-0488: Better certificate options checking
+ - S8069198: Upgrade image library
+ - S8071726, CVE-2015-0478: Better RSA optimizations
+ - S8071818: Better vectorization on SPARC
+ - S8071931, CVE-2015-0460: Return of the phantom menace
+ * Backports
+ - S6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback
+ should not be invoked when string value is null
+ - S6956398, PR2250: make ephemeral DH key match the length of
+ the certificate key
+ - S7090424: TestGlyphVectorLayout failed automately with
+ java.lang.StackOverflowError
+ - S7142035: assert in j.l.instrument agents during shutdown
+ when daemon thread is running
+ - S7160837: DigestOutputStream does not turn off digest
+ calculation when "close()" is called
+ - S7195480: javax.smartcardio does not detect cards on Mac OS X
+ - S8001472: api/java_awt/Window/indexTGF_* tests fail because
+ expected colors aren't equal
+ - S8011646: SEGV in compiled code with loop predication
+ - S8012637: Adjust CipherInputStream class to work in AEAD/GCM
+ mode
+ - S8016545: java.beans.XMLEncoder.writeObject output is wrong
+ - S8019324: assert(_f2 == 0 || _f2 == f2) failed: illegal field
+ change
+ - S8019623: Lack of synchronization in AppContext.getAppContext()
+ - S8021804: Certpath validation fails if validity period of root
+ cert does not include validity period of intermediate cert
+ - S8022070: Compilation error in stubGenerator_sparc.cpp with
+ some compilers
+ - S8024061: Exception thrown when drag and drop between two
+ components is executed quickly
+ - S8028616: Htmleditorkit parser doesn't handle leading slash (/)
+ - S8028617: Dvorak keyboard mapping not honored when ctrl key
+ pressed
+ - S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty
+ since 7u40b33
+ - S8031290: Adjust call to getisax() for additional words
+ returned
+ - S8032872: [macosx] Cannot select from JComboBox in a JWindow
+ - S8032874: ArrayIndexOutOfBoundsException in JTable while
+ clearing data in JTable
+ - S8032878: Editable combos in table do not behave as expected
+ - S8033113: wsimport fails on WSDL:header parameter name
+ customization
+ - S8033696: "assert(thread != NULL) failed: just checking" due
+ to Thread::current() and JNI pthread interaction
+ - S8036022: D3D: rendering with XOR composite causes
+ InternalError.
+ - S8036709: Java 7 jarsigner displays warning about cert policy
+ tree
+ - S8036819: JAB: mneumonics not read for textboxes
+ - S8036983: JAB:Multiselection Ctrl+CursorUp/Down and
+ ActivateDescenderPropertyChanged event
+ - S8037477: Reproducible hang of JAWS and webstart application
+ with JAB 2.0.4
+ - S8038925: Java with G1 crashes in dump_instance_fields using
+ jmap or jcmd without fullgc
+ - S8039050: Crash in C2 compiler at Node::rematerialize
+ - S8039298: assert(base == NULL || t_adr->isa_rawptr() || !
phase->type(base)->higher_equal(TypePtr::NULL_PTR))
+ - S8039319: (smartcardio) Card.transmitControlCommand() does
+ not work on Mac OS X
+ - S8040228: TransformerConfigurationException occurs with
+ security manager, FSP and XSLT Ext
+ - S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh
+ fails to cleanup files after it
+ - S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should
+ abandon ldap request
+ - S8041740: Test sun/security/tools/keytool/ListKeychainStore.sh
+ fails on Mac
+ - S8041979: sun/jvmstat/monitor/MonitoredVm/CR6672135.java
+ failing on all platforms
+ - S8042059: Various fixes to linux/sparc
+ - S8042857: 14 stuck threads waiting for notification on
+ LDAPRequest
+ - S8043123: Hard crash with access violation exception when
+ blitting to very large image
+ - S8043200: Decrease the preference mode of RC4 in the enabled
+ cipher suite list
+ - S8043205: Incorrect system traps.h include path
+ - S8043206: Fix signed vs. unsigned comparison warning in
+ copy_sparc.hpp
+ - S8043207: Add const to Address argument for Assembler::swap
+ - S8043210: Add _BIG_ENDIAN define on linux/sparc
+ - S8043507: javax.smartcardio.CardTerminals.list() fails on
+ MacOSX
+ - S8044602: Increment minor version of HSx for 7u72 and
+ initialize the build number
+ - S8044659: Java SecureRandom on SPARC T4 much slower than on
+ x86/Linux
+ - S8046769: Set T family feature bit on Niagara systems
+ - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel()
+ dosn't work on MacOSX
+ - S8049081: Increment hsx 24.72 build to b02 for 7u72-b03
+ - S8049542: C2: assert(size_in_words <= (julong)max_jint)
+ failed: no overflow
+ - S8049787: Increment hsx 24.72 build to b03 for 7u72-b04
+ - S8050158: Introduce system property to maintain RC4
+ preference order
+ - S8050165: linux-sparcv9: NMT detail causes
+ assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] ==
(intptr_t*)((intptr_t)sp - STACK_BIAS))
+ failed: younger_sp must be valid
+ - S8050167: linux-sparcv9: hs_err file does not show any stack
+ information
+ - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11
+ - S8056211:
api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002]
+ failure
+ - S8060072: Increment minor version of HSx for 7u79 and
+ initialize the build number
+ - S8064454: [TEST_BUG] Test tools/javac/innerClassFile/Driver.sh
+ fails for Mac and Linux
+ - S8064532: 7u76 build failed with # 8041979
+ - S8065072: sun/net/www/http/HttpClient/StreamingRetry.java
+ failed intermittently
+ - S8065373: [macosx] jdk8, jdk7u60 Regression in Graphics2D
+ drawing of derived Fonts
+ - S8065709: Deadlock in awt/logging apparently introduced by
+ 8019623
+ - S8065991: LogManager unecessarily calls JavaAWTAccess from
+ within a critical section
+ - S8068405: GenerateCurrencyData throws RuntimeException for
+ old data
+ - S8071591: java/util/logging/LogManagerAppContextDeadlock.java
+ test started to fail due to JDK-8065991
+ - S8072039: jdk7u79 l10n resource file translation update
+ - S8072042: (tz) Support tzdata2015a
+ - S8073226: Increment hsx 24.79 build to b02 for 7u79-b10
+ - S8074312, PR2254: Enable hotspot builds on 4.x Linux kernels
+ - S8074662: Update 3rd party readme and license for LibPNG
+ v 1.6.16
+ - S8075211: [TEST_BUG] Test
+ sun/net/www/http/HttpClient/StreamingRetry.java fails with
+ compilation error
+ * Bug fixes
+ - PR2196, RH1164762: jhat man page has broken URL
+ - PR2200: Support giflib 5.1.0
+ - PR2210: DGifCloseFile call should check the return value, not
+ the error code, for failure
+ - PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc.
+ - PR2250: JSSE server is still limited to 768-bit DHE
+ * ARM32 port
+ - PR2228: Add ARM32 JIT
+ - PR2297: Use the IcedTea 2.6.0 HotSpot for ARM32 by default
+ - Several bug fixes to get Eclipse working
+ * AArch64 port
+ - Add java.lang.ref.Reference.get intrinsic to template
+ interpreter
+ - Fix implementation of InterpreterMacroAssembler::increment_mdp_data_at().
+ - Remove insanely large stack allocation in entry frame.
+ - S6976528: PS: assert(!limit_exceeded || softrefs_clear)
+ failed: Should have been cleared
+ - S8020675: invalid jar file in the bootclasspath could lead to
+ jvm fatal error
+ - S8020829: NMT tests fail on platforms if NMT detail is not
+ supported
+ - S8026303: CMS: JVM intermittently crashes with "FreeList of
+ size 258 violates Conservation Principle" assert
+ - S8029775: Solaris code cleanup
+ - S8041980: (hotspot) sun/jvmstat/monitor/MonitoredVm/CR6672135.java
+ failing on all platforms
+ - S8042235: redefining method used by multiple MethodHandles
+ crashes VM
+ - S8044406: JVM crash with JDK8 (build 1.8.0-b132) with G1 GC
+ - S8046233: VerifyError on backward branch
+ - S8046289: compiler/6340864/TestLongVect.java timeout with
+ - S8048170: Test closed/java/text/Normalizer/ConformanceTest.java
+ failed
+ - S8050022: linux-sparcv9: assert(SharedSkipVerify || obj->is_oop())
+ failed: sanity check
+ - S8054478: C2: Incorrectly compiled char[] array access crashes
+ JVM
+ - S8054530: C2: assert(res == old_res) failed: Inconsistency
+ between old and new
+ - S8054883: Segmentation error while running program
+ - S8056309: Set minor version for hotspot in 7u76 to 76 and
+ build number to b01
+ - S8058583: Remove CompilationRepeat
+ - S8058935: CPU detection gives 0 cores per cpu, 2 threads per
+ core in Amazon EC2 environment
+ - S8059216: Make PrintGCApplicationStoppedTime print
+ information about stopping threads
+ - S8060169: Update the Crash Reporting URL in the Java crash log
++++ 2614 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:13.2:Update/.java-1_7_0-openjdk.3707.new/java-1_7_0-openjdk-bootstrap.changes
New Changes file:
java-1_7_0-openjdk.changes: same change
New:
----
PStack-808293.patch
RH661505-toBeReverted.patch
_constraints
aarch64.tar.bz2
abrt_friendly_hs_log_jdk7.patch
corba.tar.bz2
file-contains-date-and-time.patch
fontconfig.SUSE.properties
hotspot.tar.bz2
icedtea-2.5.5.tar.xz
icedtea-2.5.5.tar.xz.sig
icedtea-sound-1.0.1.tar.xz
icedtea-sound-1.0.1.tar.xz.sig
java-1.7.0-openjdk-accessible-toolkit.patch
java-1.7.0-openjdk-adlc-parser.patch
java-1.7.0-openjdk-freetype-check-fix.patch
java-1.7.0-openjdk-java-access-bridge-security.patch
java-1.7.0-openjdk-thread-stack-size.patch
java-1_7_0-openjdk-add-memory-limit.patch
java-1_7_0-openjdk-bootstrap.changes
java-1_7_0-openjdk-bootstrap.spec
java-1_7_0-openjdk-javadoc-verbose.patch
java-1_7_0-openjdk-override.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
jaxp.tar.bz2
jaxws.tar.bz2
jdk.tar.bz2
langtools.tar.bz2
mauve-2008-10-22.tar.gz
mauve_tests
openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
openjdk-7-src-b147-no-return-in-nonvoid.patch
openjdk-7-src-b147-stringcompare.patch
openjdk.tar.bz2
pre_checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
++++ 1262 lines (skipped)
java-1_7_0-openjdk.spec: same change
++++++ 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>
<disk>
<size unit="G">6</size>
</disk>
</hardware>
<overwrite>
<conditions>
<arch>armv7l</arch>
<arch>armv6l</arch>
</conditions>
<hardware>
<physicalmemory>
<size unit="M">512</size>
</physicalmemory>
</hardware>
</overwrite>
</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();
++++++ file-contains-date-and-time.patch ++++++
--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2014-07-15
23:55:15.000000000 +0200
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2014-07-23
18:35:54.422893604 +0200
@@ -257,7 +257,7 @@
#endif
return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR
- " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
+ " JRE (" JRE_RELEASE_VERSION "), built"
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
}
++++++ 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-adlc-parser.patch ++++++
--- openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
@@ -347,6 +347,7 @@ FrameForm::FrameForm() {
_return_value = NULL;
_c_return_value = NULL;
_interpreter_frame_pointer_reg = NULL;
+ _cisc_spilling_operand_name = NULL;
}
FrameForm::~FrameForm() {
++++++ 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-security.patch ++++++
--- openjdk/jdk/src/share/lib/security/java.security-linux.orig
+++ openjdk/jdk/src/share/lib/security/java.security-linux
@@ -154,7 +154,9 @@
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 @@
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-thread-stack-size.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
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
@@ -34,7 +34,7 @@
//
define_pd_global(bool, DontYieldALot, false);
-define_pd_global(intx, ThreadStackSize, 1664);
+define_pd_global(intx, ThreadStackSize, PPC_ONLY(2048) NOT_PPC(1664));
#ifdef _LP64
define_pd_global(intx, VMThreadStackSize, PPC_ONLY(1664) NOT_PPC(1024));
#else
++++++ 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-javadoc-verbose.patch ++++++
--- icedtea-2.4.5/openjdk/jdk/make/docs/Makefile
+++ icedtea-2.4.5/openjdk/jdk/make/docs/Makefile
@@ -204,7 +204,6 @@ $(call CopyrightLine,$(COPYRIGHT_URL),$(
# Common javadoc options used by all
COMMON_JAVADOCFLAGS = \
$(NO_PROPRIETARY_API_WARNINGS) \
- -quiet \
-use \
-keywords \
$(ADDITIONAL_JAVADOCFLAGS)
++++++ java-1_7_0-openjdk-override.patch ++++++
---
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
2014-10-16 11:21:12.169855907 +0200
+++
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
2014-10-16 11:13:35.377248000 +0200
@@ -44,9 +44,7 @@
boolean matches(ReferenceType refType);
ClassPrepareRequest createPrepareRequest();
- @Override
int hashCode();
- @Override
boolean equals(Object obj);
}
---
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java
2014-10-16 11:21:12.169855907 +0200
+++
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java
2014-10-16 11:13:35.377248000 +0200
@@ -42,9 +42,7 @@
*/
boolean matches(ReferenceType refType);
- @Override
int hashCode();
- @Override
boolean equals(Object obj);
}
++++++ 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=System;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) {
++++++ java-1_7_0-openjdk.keyring ++++++
pub 4096R/66484681 2012-01-18 [expires: 2017-01-16]
uid Omair Majid <[email protected]>
sub 4096R/7CC8AAC6 2012-01-18 [expires: 2017-01-16]
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.22 (GNU/Linux)
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
LxzgYxkAEQEAAbQqQW5kcmV3IEpvaG4gSHVnaGVzIDxnbnUuYW5kcmV3QHJlZGhh
dC5jb20+iQI9BBMBCgAnBQJQeGaVAhsDBQkD1ebJBQsJCAcDBRUKCQgLBRYCAwEA
Ah4BAheAAAoJEDuWpXgki9wHAFAP/3w7qyVuQiAbwLVWVykC0OvtORQnxD2yHZ6S
PZEaWofiXQSbjlAuwdnpG8Nvf0olX4Gt+Pg5a/n1wCuDH3YY5iDZeMSnRhtR6lVp
uw9y/BLtZ+Y1IEhbywdZ836z2lEtdZ2IT76Rdvwh38B3PBbv+RFVpmI4bMdC9QS9
qDe9rzhEDcaCGkG//yp9dahUBLfB2MqmTkaUByT9+2VX1Mewl851/nHtGBp8359o
/IvSJlapjBv7XgFojwwgc+mYzs5D0yd+eHwD3TY/6Q5hy9PM0pcGgJZRDlpVguhn
4lsP+Goy4R7gUb82gCZix1t5kLzzz9q2mOZig2sH5Vjc3JMDCxDOAyek3cJo2r5P
Bmj8wJ0pqW6Bo7FPX4y9Zkg1ZEEZA55htj5uIhAamAC2oe6ub2k5yxikqwkF4w1p
sz2jWGp2WBuJEtcXrEPBTy40Gwp3GUg3fPg+a8F3E+Xh5Kcohzm4AgrQDXS7HCYN
7PWp89UII8lmNVvhCQXhYh7EN85RajIbFmpix4epP8NNsEURL6r9Pal9TGjKvtY9
7WmttLdOl61aIreuVPV9l7NLsDz96tvdk3mrv9D/J7vIP238mYiss9tuyCeExAiL
R3TnpeSyZuICuuWQHBNmj3C56XXjqG75DDMsaBVcYn6Wlb3u9RFIyGB1b//6vJMe
eMvb5eiItCpEciBBbmRyZXcgSm9obiBIdWdoZXMgPGFodWdoZXNAcmVkaGF0LmNv
bT6JAj0EEwEKACcCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlB4Zl8FCQPV
5skACgkQO5aleCSL3AfL0A/+Kariol13RB5h3msxr+7SRptYWlml8II+4rRMjWF0
IQi6bVpDI1dGlYmDpqqFvySU+vjSQxLU3v8eXoTbuT3MV0xVy3AdXjMx+egFM1TN
S77JtLyyT/IQsre/MhmpxG71AS1AVRvdueMSLeoyoDZcdEsqILA18PrUv9ETgT0X
83O2Q5eNJ8XgExzUmaj63N8ogM0HyUC8tDwfCyr9CHeF1i4fEFxqWt3sQb8auQwR
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
HNdJILOHohJNsSSxl2rA9HsexIPibXpwYwssWvQ=
=dCsm
-----END PGP PUBLIC KEY BLOCK-----
++++++ mauve_tests ++++++
++++ 2571 lines (skipped)
++++++ openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch ++++++
--- 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
@@ -206,14 +206,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-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;
}
++++++ 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);
/*
++++++ pre_checkin.sh ++++++
#! /bin/sh
sed -e 's,^Name:.*,Name: java-1_7_0-openjdk-bootstrap,; s,bcond_with
bootstrap,bcond_without bootstrap,' java-1_7_0-openjdk.spec >
java-1_7_0-openjdk-bootstrap.spec
cp java-1_7_0-openjdk.changes java-1_7_0-openjdk-bootstrap.changes
osc service localrun clean_spec_file