/hg/release/icedtea6-1.7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jan 18 06:26:09 PST 2011
changeset 6f7d633c355a in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6f7d633c355a
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 16 19:51:32 2010 +0000
RH663680, CVE-2010-4351: JNLP SecurityManager bypass
2010-12-16 Omair Majid <omajid at redhat.com>
RH663680, CVE-2010-4351:
* NEWS: List issue.
* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
Make sure SecurityException is thrown if necessary.
changeset 8784e22fa289 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=8784e22fa289
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 16 22:32:32 2010 +0000
Bump to 1.7.7.
2010-12-16 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Fix formatting.
* configure.ac: Bump to 1.7.7.
changeset 0ee477f3daf2 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=0ee477f3daf2
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jan 18 14:15:15 2011 +0000
Added tag icedtea6-1.7.7 for changeset 8784e22fa289
changeset cb6c55ac1cd6 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cb6c55ac1cd6
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jan 18 14:25:25 2011 +0000
Merge
diffstat:
10 files changed, 5086 insertions(+), 182 deletions(-)
.hgtags | 1
ChangeLog | 30
Makefile.am | 5
NEWS | 9
configure.ac | 2
patches/fonts-rhel.patch | 146
patches/openjdk/6541476-png-iTXt-chunk.patch | 549 +
patches/openjdk/6687968-pngimagereader_mem_leak.patch | 126
patches/openjdk/6782079-png_metadata_oom.patch | 4122 ++++++++++++++
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 278
diffs (truncated from 5667 to 500 lines):
diff -r af20d64bc8b9 -r cb6c55ac1cd6 .hgtags
--- a/.hgtags Thu Dec 16 19:41:01 2010 +0000
+++ b/.hgtags Tue Jan 18 14:25:25 2011 +0000
@@ -28,3 +28,4 @@ 0000000000000000000000000000000000000000
0000000000000000000000000000000000000000 icedtea6-1.7.5
6282308dea7401c00bb779bd4ab2ff7f4d269114 icedtea6-1.7.5
f5667b14ce7eb0dc9b121164a28d3b3fcd516c61 icedtea6-1.7.6
+8784e22fa2897df7373ca8869e7dab8d3af8c8c9 icedtea6-1.7.7
diff -r af20d64bc8b9 -r cb6c55ac1cd6 ChangeLog
--- a/ChangeLog Thu Dec 16 19:41:01 2010 +0000
+++ b/ChangeLog Tue Jan 18 14:25:25 2011 +0000
@@ -1,3 +1,33 @@ 2010-12-16 Andrew John Hughes <ahughes
+2010-12-24 Deepak Bhole <dbhole at redhat.com>
+
+ Backport S6687968, S6541476, S6782079
+ * Makefile.am: Add missing "\" to the patch list, update to include
+ new patches.
+ * NEWS: Updated.
+ * patches/openjdk/6687968-pngimagereader_mem_leak.patch: Backport to allow
+ S6541476 fix to apply cleanly.
+ * patches/openjdk/6541476-png-iTXt-chunk.patch: Backport to fix iTXt chunk
+ handling for png images. Also addresses RH665355.
+ * patches/openjdk/6782079-png_metadata_oom.patch: Backport to fix
+ potential OOM error when reading metadata on truncated pngs.
+
+2010-12-23 Jiri Vanek <jvanek at redhat.com>
+
+ * NEWS: Updated with rh.bugzilas.
+ * patches/fonts-rhel.patch:repaired rhel 6 fonts configuration.
+
+2010-12-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Fix formatting.
+ * configure.ac: Bump to 1.7.7.
+
+2010-12-16 Omair Majid <omajid at redhat.com>
+
+ RH663680, CVE-2010-4351:
+ * NEWS: List issue.
+ * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
+ Make sure SecurityException is thrown if necessary.
+
2010-12-16 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Fix issue placement.
diff -r af20d64bc8b9 -r cb6c55ac1cd6 Makefile.am
--- a/Makefile.am Thu Dec 16 19:41:01 2010 +0000
+++ b/Makefile.am Tue Jan 18 14:25:25 2011 +0000
@@ -380,7 +380,10 @@ ICEDTEA_PATCHES = \
patches/openjdk/6438179-systray_check.patch \
patches/openjdk/4356282-opentype.patch \
patches/openjdk/6954424-opentype_javadoc.patch \
- patches/openjdk/6795356-proxylazyvalue-leak.patch
+ patches/openjdk/6795356-proxylazyvalue-leak.patch \
+ patches/openjdk/6687968-pngimagereader_mem_leak.patch \
+ patches/openjdk/6541476-png-iTXt-chunk.patch \
+ patches/openjdk/6782079-png_metadata_oom.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
diff -r af20d64bc8b9 -r cb6c55ac1cd6 NEWS
--- a/NEWS Thu Dec 16 19:41:01 2010 +0000
+++ b/NEWS Tue Jan 18 14:25:25 2011 +0000
@@ -8,7 +8,10 @@ GX - http://bugs.gentoo.org/show_bug.cg
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.7.7 (201X-XX-XX):
+New in release 1.7.7 (2011-01-12):
+
+* Security updates
+ - RH663680, CVE-2010-4351: IcedTea JNLP SecurityManager bypass
* Backports
- S6438179, RH569121: XToolkit.isTraySupported() result has nothing to do with the system tray
- S4356282: RFE: JDK should support OpenType/CFF fonts
@@ -18,8 +21,12 @@ New in release 1.7.7 (201X-XX-XX):
- S6967433: dashed lines broken when using scaling transforms.
- S6976265: No STROKE_CONTROL
- S6967434, PR450, RH530642: Round joins/caps of scaled up lines have poor quality.
+ - S6687968: PNGImageReader leaks native memory through an Inflater
+ - S6541476, RH665355: PNG imageio plugin incorrectly handles iTXt chunk
+ - S6782079: PNG: reading metadata may cause OOM on truncated images
* Fixes:
- S7003777, RH647674: JTextPane produces incorrect content after parsing the html text
+ - RH647157,RH582455: Update fontconfig files for rhel 6
New in release 1.7.6 (2010-11-24):
diff -r af20d64bc8b9 -r cb6c55ac1cd6 configure.ac
--- a/configure.ac Thu Dec 16 19:41:01 2010 +0000
+++ b/configure.ac Tue Jan 18 14:25:25 2011 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.7.7pre], [distro-
-AC_INIT([icedtea6], [1.7.7pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6], [1.7.7], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r af20d64bc8b9 -r cb6c55ac1cd6 patches/fonts-rhel.patch
--- a/patches/fonts-rhel.patch Thu Dec 16 19:41:01 2010 +0000
+++ b/patches/fonts-rhel.patch Tue Jan 18 14:25:25 2011 +0000
@@ -11,10 +11,9 @@ diff -Nru openjdk.orig/jdk/make/sun/awt/
else
FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs
-diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties 2010-08-12 22:52:55.716852554 +0100
-@@ -0,0 +1,376 @@
+--- /dev/null 2010-12-20 09:26:08.850062021 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties 2010-12-22 11:21:32.606781127 +0100
+@@ -0,0 +1,441 @@
+#
+# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,16 +41,19 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+
+# Version
+
-+# Uses Fedora 9 fonts and file paths.
++# Uses Fedora 14 fonts and file paths, added VL-gothic
+version=1
+
+# Component Font Mappings
+
+dialog.plain.latin-1=DejaVu Sans
-+dialog.plain.japanese-x0208=Sazanami Gothic
++#dialog.plain.japanese-x0208=Sazanami Gothic
++dialog.plain.japanese-x0208=VL PGothic
+dialog.plain.korean=Baekmuk Gulim
+dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
++dialog.plain.assamese=Lohit Assamese
++dialog.plain.devanagari=Lohit Devanagari
+dialog.plain.bengali=Lohit Bengali
+dialog.plain.gujarati=Lohit Gujarati
+dialog.plain.hindi=Lohit Hindi
@@ -63,10 +65,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+dialog.plain.sinhala=LKLUG
+
+dialog.bold.latin-1=DejaVu Sans Bold
-+dialog.bold.japanese-x0208=Sazanami Gothic
++#dialog.bold.japanese-x0208=Sazanami Gothic
++dialog.bold.japanese-x0208=VL PGothic
+dialog.bold.korean=Baekmuk Gulim
+dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
++dialog.bold.assamese=Lohit Assamese
++dialog.bold.devanagari=Lohit Devanagari
+dialog.bold.bengali=Lohit Bengali
+dialog.bold.gujarati=Lohit Gujarati
+dialog.bold.hindi=Lohit Hindi
@@ -78,10 +83,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+dialog.bold.sinhala=LKLUG
+
+dialog.italic.latin-1=DejaVu Sans Oblique
-+dialog.italic.japanese-x0208=Sazanami Gothic
++#dialog.italic.japanese-x0208=Sazanami Gothic
++dialog.italic.japanese-x0208=VL PGothic
+dialog.italic.korean=Baekmuk Gulim
+dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
++dialog.italic.assamese=Lohit Assamese
++dialog.italic.devanagari=Lohit Devanagari
+dialog.italic.bengali=Lohit Bengali
+dialog.italic.gujarati=Lohit Gujarati
+dialog.italic.hindi=Lohit Hindi
@@ -93,10 +101,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+dialog.italic.sinhala=LKLUG
+
+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
-+dialog.bolditalic.japanese-x0208=Sazanami Gothic
++#dialog.bolditalic.japanese-x0208=Sazanami Gothic
++dialog.bolditalic.japanese-x0208=VL PGothic
+dialog.bolditalic.korean=Baekmuk Gulim
+dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
++dialog.bolditalic.assamese=Lohit Assamese
++dialog.bolditalic.devanagari=Lohit Devanagari
+dialog.bolditalic.bengali=Lohit Bengali
+dialog.bolditalic.gujarati=Lohit Gujarati
+dialog.bolditalic.hindi=Lohit Hindi
@@ -108,10 +119,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+dialog.bolditalic.sinhala=LKLUG
+
+sansserif.plain.latin-1=DejaVu Sans
-+sansserif.plain.japanese-x0208=Sazanami Gothic
++#sansserif.plain.japanese-x0208=Sazanami Gothic
++sansserif.plain.japanese-x0208=VL PGothic
+sansserif.plain.korean=Baekmuk Gulim
+sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
++sansserif.plain.assamese=Lohit Assamese
++sansserif.plain.devanagari=Lohit Devanagari
+sansserif.plain.bengali=Lohit Bengali
+sansserif.plain.gujarati=Lohit Gujarati
+sansserif.plain.hindi=Lohit Hindi
@@ -123,10 +137,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+sansserif.plain.sinhala=LKLUG
+
+sansserif.bold.latin-1=DejaVu Sans Bold
-+sansserif.bold.japanese-x0208=Sazanami Gothic
++#sansserif.bold.japanese-x0208=Sazanami Gothic
++sansserif.bold.japanese-x0208=VL PGothic
+sansserif.bold.korean=Baekmuk Gulim
+sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
++sansserif.bold.assamese=Lohit Assamese
++sansserif.bold.devanagari=Lohit Devanagari
+sansserif.bold.bengali=Lohit Bengali
+sansserif.bold.gujarati=Lohit Gujarati
+sansserif.bold.hindi=Lohit Hindi
@@ -138,10 +155,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+sansserif.bold.sinhala=LKLUG
+
+sansserif.italic.latin-1=DejaVu Sans Oblique
-+sansserif.italic.japanese-x0208=Sazanami Gothic
++#sansserif.italic.japanese-x0208=Sazanami Gothic
++sansserif.italic.japanese-x0208=VL PGothic
+sansserif.italic.korean=Baekmuk Gulim
+sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
++sansserif.italic.assamese=Lohit Assamese
++sansserif.italic.devanagari=Lohit Devanagari
+sansserif.italic.bengali=Lohit Bengali
+sansserif.italic.gujarati=Lohit Gujarati
+sansserif.italic.hindi=Lohit Hindi
@@ -153,10 +173,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+sansserif.italic.sinhala=LKLUG
+
+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
-+sansserif.bolditalic.japanese-x0208=Sazanami Gothic
++#sansserif.bolditalic.japanese-x0208=Sazanami Gothic
++sansserif.bolditalic.japanese-x0208=VL PGothic
+sansserif.bolditalic.korean=Baekmuk Gulim
+sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
++sansserif.bolditalic.assamese=Lohit Assamese
++sansserif.bolditalic.devanagari=Lohit Devanagari
+sansserif.bolditalic.bengali=Lohit Bengali
+sansserif.bolditalic.gujarati=Lohit Gujarati
+sansserif.bolditalic.hindi=Lohit Hindi
@@ -168,10 +191,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+sansserif.bolditalic.sinhala=LKLUG
+
+serif.plain.latin-1=DejaVu Serif
-+serif.plain.japanese-x0208=Sazanami Mincho
++#serif.plain.japanese-x0208=Sazanami Mincho
++serif.plain.japanese-x0208=VL PGothic
+serif.plain.korean=Baekmuk Batang
+serif.plain.chinese-big5=AR PL ZenKai Uni
+serif.plain.chinese-gb18030=AR PL ZenKai Uni
++serif.plain.assamese=Lohit Assamese
++serif.plain.devanagari=Lohit Devanagari
+serif.plain.bengali=Lohit Bengali
+serif.plain.gujarati=Lohit Gujarati
+serif.plain.hindi=Lohit Hindi
@@ -183,10 +209,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+serif.plain.sinhala=LKLUG
+
+serif.bold.latin-1=DejaVu Serif Bold
-+serif.bold.japanese-x0208=Sazanami Mincho
++#serif.bold.japanese-x0208=Sazanami Mincho
++serif.bold.japanese-x0208=VL PGothic
+serif.bold.korean=Baekmuk Batang
+serif.bold.chinese-big5=AR PL ZenKai Uni
+serif.bold.chinese-gb18030=AR PL ZenKai Uni
++serif.bold.assamese=Lohit Assamese
++serif.bold.devanagari=Lohit Devanagari
+serif.bold.bengali=Lohit Bengali
+serif.bold.gujarati=Lohit Gujarati
+serif.bold.hindi=Lohit Hindi
@@ -198,10 +227,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+serif.bold.sinhala=LKLUG
+
+serif.italic.latin-1=DejaVu Serif Oblique
-+serif.italic.japanese-x0208=Sazanami Mincho
++#serif.italic.japanese-x0208=Sazanami Mincho
++serif.italic.japanese-x0208=VL PGothic
+serif.italic.korean=Baekmuk Batang
+serif.italic.chinese-big5=AR PL ZenKai Uni
+serif.italic.chinese-gb18030=AR PL ZenKai Uni
++serif.italic.assamese=Lohit Assamese
++serif.italic.devanagari=Lohit Devanagari
+serif.italic.bengali=Lohit Bengali
+serif.italic.gujarati=Lohit Gujarati
+serif.italic.hindi=Lohit Hindi
@@ -213,10 +245,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+serif.italic.sinhala=LKLUG
+
+serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
-+serif.bolditalic.japanese-x0208=Sazanami Mincho
++#serif.bolditalic.japanese-x0208=Sazanami Mincho
++serif.bolditalic.japanese-x0208=VL PGothic
+serif.bolditalic.korean=Baekmuk Batang
+serif.bolditalic.chinese-big5=AR PL ZenKai Uni
+serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
++serif.bolditalic.assamese=Lohit Assamese
++serif.bolditalic.devanagari=Lohit Devanagari
+serif.bolditalic.bengali=Lohit Bengali
+serif.bolditalic.gujarati=Lohit Gujarati
+serif.bolditalic.hindi=Lohit Hindi
@@ -228,10 +263,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+serif.bolditalic.sinhala=LKLUG
+
+monospaced.plain.latin-1=DejaVu Sans Mono
-+monospaced.plain.japanese-x0208=Sazanami Gothic
++#monospaced.plain.japanese-x0208=Sazanami Gothic
++monospaced.plain.japanese-x0208=VL Gothic
+monospaced.plain.korean=Baekmuk Gulim
+monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
++monospaced.plain.assamese=Lohit Assamese
++monospaced.plain.devanagari=Lohit Devanagari
+monospaced.plain.bengali=Lohit Bengali
+monospaced.plain.gujarati=Lohit Gujarati
+monospaced.plain.hindi=Lohit Hindi
@@ -243,10 +281,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+monospaced.plain.sinhala=LKLUG
+
+monospaced.bold.latin-1=DejaVu Sans Mono Bold
-+monospaced.bold.japanese-x0208=Sazanami Gothic
++#monospaced.bold.japanese-x0208=Sazanami Gothic
++monospaced.bold.japanese-x0208=VL Gothic
+monospaced.bold.korean=Baekmuk Gulim
+monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
++monospaced.bold.assamese=Lohit Assamese
++monospaced.bold.devanagari=Lohit Devanagari
+monospaced.bold.bengali=Lohit Bengali
+monospaced.bold.gujarati=Lohit Gujarati
+monospaced.bold.hindi=Lohit Hindi
@@ -258,10 +299,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+monospaced.bold.sinhala=LKLUG
+
+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
-+monospaced.italic.japanese-x0208=Sazanami Gothic
++#monospaced.italic.japanese-x0208=Sazanami Gothic
++monospaced.italic.japanese-x0208=VL Gothic
+monospaced.italic.korean=Baekmuk Gulim
+monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
++monospaced.italic.assamese=Lohit Assamese
++monospaced.italic.devanagari=Lohit Devanagari
+monospaced.italic.bengali=Lohit Bengali
+monospaced.italic.gujarati=Lohit Gujarati
+monospaced.italic.hindi=Lohit Hindi
@@ -273,10 +317,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+monospaced.italic.sinhala=LKLUG
+
+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
-+monospaced.bolditalic.japanese-x0208=Sazanami Gothic
++#monospaced.bolditalic.japanese-x0208=Sazanami Gothic
++monospaced.bolditalic.japanese-x0208=VL Gothic
+monospaced.bolditalic.korean=Baekmuk Gulim
+monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
++monospaced.bolditalic.assamese=Lohit Assamese
++monospaced.bolditalic.devanagari=Lohit Devanagari
+monospaced.bolditalic.bengali=Lohit Bengali
+monospaced.bolditalic.gujarati=Lohit Gujarati
+monospaced.bolditalic.hindi=Lohit Hindi
@@ -288,10 +335,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+monospaced.bolditalic.sinhala=LKLUG
+
+dialoginput.plain.latin-1=DejaVu Sans Mono
-+dialoginput.plain.japanese-x0208=Sazanami Gothic
++#dialoginput.plain.japanese-x0208=Sazanami Gothic
++dialoginput.plain.japanese-x0208=VL PGothic
+dialoginput.plain.korean=Baekmuk Gulim
+dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
++dialoginput.plain.assamese=Lohit Assamese
++dialoginput.plain.devanagari=Lohit Devanagari
+dialoginput.plain.bengali=Lohit Bengali
+dialoginput.plain.gujarati=Lohit Gujarati
+dialoginput.plain.hindi=Lohit Hindi
@@ -303,10 +353,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+dialoginput.plain.sinhala=LKLUG
+
+dialoginput.bold.latin-1=DejaVu Sans Mono Bold
-+dialoginput.bold.japanese-x0208=Sazanami Gothic
++#dialoginput.bold.japanese-x0208=Sazanami Gothic
++dialoginput.bold.japanese-x0208=VL PGothic
+dialoginput.bold.korean=Baekmuk Gulim
+dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
++dialoginput.bold.assamese=Lohit Assamese
++dialoginput.bold.devanagari=Lohit Devanagari
+dialoginput.bold.bengali=Lohit Bengali
+dialoginput.bold.gujarati=Lohit Gujarati
+dialoginput.bold.hindi=Lohit Hindi
@@ -318,10 +371,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+dialoginput.bold.sinhala=LKLUG
+
+dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
-+dialoginput.italic.japanese-x0208=Sazanami Gothic
++#dialoginput.italic.japanese-x0208=Sazanami Gothic
++dialoginput.italic.japanese-x0208=VL PGothic
+dialoginput.italic.korean=Baekmuk Gulim
+dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
++dialoginput.italic.assamese=Lohit Assamese
++dialoginput.italic.devanagari=Lohit Devanagari
+dialoginput.italic.bengali=Lohit Bengali
+dialoginput.italic.gujarati=Lohit Gujarati
+dialoginput.italic.hindi=Lohit Hindi
@@ -333,10 +389,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+dialoginput.italic.sinhala=LKLUG
+
+dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
-+dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
++#dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
++dialoginput.bolditalic.japanese-x0208=VL PGothic
+dialoginput.bolditalic.korean=Baekmuk Gulim
+dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
++dialoginput.bolditalic.assamese=Lohit Assamese
++dialoginput.bolditalic.devanagari=Lohit Devanagari
+dialoginput.bolditalic.bengali=Lohit Bengali
+dialoginput.bolditalic.gujarati=Lohit Gujarati
+dialoginput.bolditalic.hindi=Lohit Hindi
@@ -370,24 +429,29 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+
+filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf
+filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
++filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttfok
+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
+
-+filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc
-+filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc
-+filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf
++#filename.Sazanami_Gothic=/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf
++#filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf
++filename.VL_Gothic=/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf
++filename.VL_PGothic=/usr/share/fonts/svlgothic/VL-PGothic-Regular.ttf
++filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkuni-uming/uming.ttc
++filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkuni-ukai/ukai.ttc
++filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf/gulim.ttf
++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf/batang.ttf
+
-+filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf
-+filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf
++filename.Lohit_Assamese=/usr/share/fonts/lohit-assamese/Lohit-Assamese.ttf
++filename.Lohit_Devanagari=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf
++filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/Lohit-Bengali.ttf
++filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf
++filename.Lohit_Hindi=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf
++filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf
++filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/Lohit-Malayalam.ttf
++filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/Lohit-Oriya.ttf
++filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/Lohit-Punjabi.ttf
++filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf
++filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/Lohit-Telugu.ttf
++
+filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
+
diff -r af20d64bc8b9 -r cb6c55ac1cd6 patches/openjdk/6541476-png-iTXt-chunk.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6541476-png-iTXt-chunk.patch Tue Jan 18 14:25:25 2011 +0000
@@ -0,0 +1,549 @@
+diff -urN openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java openjdk/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java 2010-12-23 17:11:16.193446425 -0500
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java 2010-12-23 17:11:29.399447037 -0500
+@@ -44,7 +44,6 @@
+ import java.util.Arrays;
+ import java.util.Enumeration;
+ import java.util.Iterator;
+-import java.util.List;
+ import java.util.zip.Inflater;
+ import java.util.zip.InflaterInputStream;
+ import javax.imageio.IIOException;
+@@ -57,6 +56,7 @@
+ import com.sun.imageio.plugins.common.InputStreamAdapter;
+ import com.sun.imageio.plugins.common.ReaderUtil;
+ import com.sun.imageio.plugins.common.SubImageInputStream;
++import java.io.ByteArrayOutputStream;
+ import sun.awt.image.ByteInterleavedRaster;
+
+ class PNGImageDataEnumeration implements Enumeration {
+@@ -209,6 +209,15 @@
+ resetStreamSettings();
+ }
+
++ private String readNullTerminatedString(String charset) throws IOException {
++ ByteArrayOutputStream baos = new ByteArrayOutputStream();
++ int b;
++ while ((b = stream.read()) != 0) {
++ baos.write(b);
++ }
More information about the distro-pkg-dev
mailing list