/hg/release/icedtea6-1.11: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sat Feb 2 11:13:12 PST 2013
changeset 4baa7108d50f in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=4baa7108d50f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Feb 01 23:20:10 2013 +0000
Security patches for 2013/02/01 errata.
2013-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(SECURITY_PATCHES): Add latest batch.
* patches/openjdk/6633275-shaped_translucent_windows.patch:
Regenerated against security patches.
* patches/security/20120612/7145239.patch,
* patches/security/20130201/6563318.patch,
* patches/security/20130201/6664509.patch,
* patches/security/20130201/6776941.patch,
* patches/security/20130201/7141694.patch,
* patches/security/20130201/7173145.patch,
* patches/security/20130201/7186945.patch,
* patches/security/20130201/7186948.patch,
* patches/security/20130201/7186952.patch,
* patches/security/20130201/7186954.patch,
* patches/security/20130201/7192392.patch,
* patches/security/20130201/7192393.patch,
* patches/security/20130201/7192977.patch,
* patches/security/20130201/7197546.patch,
* patches/security/20130201/7200491.patch,
* patches/security/20130201/7200500.patch,
* patches/security/20130201/7201064.patch,
* patches/security/20130201/7201066.patch,
* patches/security/20130201/7201068.patch,
* patches/security/20130201/7201070.patch,
* patches/security/20130201/7201071.patch,
* patches/security/20130201/8000210.patch,
* patches/security/20130201/8000537.patch,
* patches/security/20130201/8000540.patch,
* patches/security/20130201/8000631.patch,
* patches/security/20130201/8001235.patch,
* patches/security/20130201/8001242.patch,
* patches/security/20130201/8001307.patch,
* patches/security/20130201/8001972.patch,
* patches/security/20130201/8002325.patch:
New security patches for 2013/02/01 errata.
changeset 7bf56f604b21 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=7bf56f604b21
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Feb 02 01:43:07 2013 +0000
S7010849: 5/5 Extraneous javac source/target options when building sa-jdi
2013-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/ecj/hotspot.patch:
Dropped unnecessary patch. javac script
already sets bootclasspath to rt.jar.
* Makefile.am:
(ICEDTEA_PATCHES): Add 7010849 backport.
(ICEDTEA_ECJ_PATCHES): Remove HotSpot patch.
* patches/openjdk/7010849-modernise_sa.patch:
Backport from 7 to avoid duplicate source/target
options when building the serviceability agent,
which lead to build issues on current Fedora.
* NEWS: Updated.
changeset 448eb298bffc in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=448eb298bffc
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Feb 02 07:50:53 2013 +0000
Add security fixes to NEWS.
2013-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add security fixes.
diffstat:
ChangeLog | 56 +
Makefile.am | 35 +-
NEWS | 37 +
patches/ecj/hotspot.patch | 14 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 212 +-
patches/openjdk/7010849-modernise_sa.patch | 394 +
patches/security/20120612/7145239.patch | 25 +-
patches/security/20130201/6563318.patch | 36 +
patches/security/20130201/6664509.patch | 1322 +
patches/security/20130201/6776941.patch | 272 +
patches/security/20130201/7141694.patch | 87 +
patches/security/20130201/7173145.patch | 22 +
patches/security/20130201/7186945.patch | 10819 +++++++++++++
patches/security/20130201/7186948.patch | 20 +
patches/security/20130201/7186952.patch | 127 +
patches/security/20130201/7186954.patch | 81 +
patches/security/20130201/7192392.patch | 695 +
patches/security/20130201/7192393.patch | 60 +
patches/security/20130201/7192977.patch | 439 +
patches/security/20130201/7197546.patch | 479 +
patches/security/20130201/7200491.patch | 49 +
patches/security/20130201/7200500.patch | 60 +
patches/security/20130201/7201064.patch | 117 +
patches/security/20130201/7201066.patch | 66 +
patches/security/20130201/7201068.patch | 83 +
patches/security/20130201/7201070.patch | 31 +
patches/security/20130201/7201071.patch | 553 +
patches/security/20130201/8000210.patch | 104 +
patches/security/20130201/8000537.patch | 334 +
patches/security/20130201/8000540.patch | 187 +
patches/security/20130201/8000631.patch | 3964 ++++
patches/security/20130201/8001235.patch | 35 +
patches/security/20130201/8001242.patch | 61 +
patches/security/20130201/8001307.patch | 27 +
patches/security/20130201/8001972.patch | 438 +
patches/security/20130201/8002325.patch | 59 +
36 files changed, 21256 insertions(+), 144 deletions(-)
diffs (truncated from 22032 to 500 lines):
diff -r 17e15b89db78 -r 448eb298bffc ChangeLog
--- a/ChangeLog Wed Oct 31 11:33:18 2012 +0000
+++ b/ChangeLog Sat Feb 02 07:50:53 2013 +0000
@@ -1,3 +1,59 @@
+2013-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add security fixes.
+
+2013-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/ecj/hotspot.patch:
+ Dropped unnecessary patch. javac script
+ already sets bootclasspath to rt.jar.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add 7010849 backport.
+ (ICEDTEA_ECJ_PATCHES): Remove HotSpot patch.
+ * patches/openjdk/7010849-modernise_sa.patch:
+ Backport from 7 to avoid duplicate source/target
+ options when building the serviceability agent,
+ which lead to build issues on current Fedora.
+ * NEWS: Updated.
+
+2013-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (SECURITY_PATCHES): Add latest batch.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch:
+ Regenerated against security patches.
+ * patches/security/20120612/7145239.patch,
+ * patches/security/20130201/6563318.patch,
+ * patches/security/20130201/6664509.patch,
+ * patches/security/20130201/6776941.patch,
+ * patches/security/20130201/7141694.patch,
+ * patches/security/20130201/7173145.patch,
+ * patches/security/20130201/7186945.patch,
+ * patches/security/20130201/7186948.patch,
+ * patches/security/20130201/7186952.patch,
+ * patches/security/20130201/7186954.patch,
+ * patches/security/20130201/7192392.patch,
+ * patches/security/20130201/7192393.patch,
+ * patches/security/20130201/7192977.patch,
+ * patches/security/20130201/7197546.patch,
+ * patches/security/20130201/7200491.patch,
+ * patches/security/20130201/7200500.patch,
+ * patches/security/20130201/7201064.patch,
+ * patches/security/20130201/7201066.patch,
+ * patches/security/20130201/7201068.patch,
+ * patches/security/20130201/7201070.patch,
+ * patches/security/20130201/7201071.patch,
+ * patches/security/20130201/8000210.patch,
+ * patches/security/20130201/8000537.patch,
+ * patches/security/20130201/8000540.patch,
+ * patches/security/20130201/8000631.patch,
+ * patches/security/20130201/8001235.patch,
+ * patches/security/20130201/8001242.patch,
+ * patches/security/20130201/8001307.patch,
+ * patches/security/20130201/8001972.patch,
+ * patches/security/20130201/8002325.patch:
+ New security patches for 2013/02/01 errata.
+
2011-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
* AUTHORS: Update my e-mail address.
diff -r 17e15b89db78 -r 448eb298bffc Makefile.am
--- a/Makefile.am Wed Oct 31 11:33:18 2012 +0000
+++ b/Makefile.am Sat Feb 02 07:50:53 2013 +0000
@@ -245,7 +245,36 @@
patches/security/20121016/7195917.patch \
patches/security/20121016/7195919.patch \
patches/security/20121016/7198296.patch \
- patches/security/20121016/7198606.patch
+ patches/security/20121016/7198606.patch \
+ patches/security/20130201/7201068.patch \
+ patches/security/20130201/6563318.patch \
+ patches/security/20130201/6664509.patch \
+ patches/security/20130201/6776941.patch \
+ patches/security/20130201/7141694.patch \
+ patches/security/20130201/7173145.patch \
+ patches/security/20130201/7186945.patch \
+ patches/security/20130201/7186948.patch \
+ patches/security/20130201/7186952.patch \
+ patches/security/20130201/7186954.patch \
+ patches/security/20130201/7192392.patch \
+ patches/security/20130201/7192393.patch \
+ patches/security/20130201/7192977.patch \
+ patches/security/20130201/7197546.patch \
+ patches/security/20130201/7200491.patch \
+ patches/security/20130201/7200500.patch \
+ patches/security/20130201/7201064.patch \
+ patches/security/20130201/7201066.patch \
+ patches/security/20130201/7201070.patch \
+ patches/security/20130201/7201071.patch \
+ patches/security/20130201/8000210.patch \
+ patches/security/20130201/8000537.patch \
+ patches/security/20130201/8000540.patch \
+ patches/security/20130201/8000631.patch \
+ patches/security/20130201/8001242.patch \
+ patches/security/20130201/8001307.patch \
+ patches/security/20130201/8001972.patch \
+ patches/security/20130201/8002325.patch \
+ patches/security/20130201/8001235.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -459,7 +488,8 @@
patches/merge_fix.patch \
patches/openjdk/7175845-jar_uf_changes_file_permissions.patch \
patches/openjdk/7177216-native2ascii_changes_file_permissions.patch \
- patches/openjdk/7199153-try_with_resources_pushed_to_6.patch
+ patches/openjdk/7199153-try_with_resources_pushed_to_6.patch \
+ patches/openjdk/7010849-modernise_sa.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -511,7 +541,6 @@
# Bootstrapping patches
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
- patches/ecj/hotspot.patch \
patches/ecj/javafiles.patch \
patches/ecj/spp.patch \
patches/ecj/jopt.patch \
diff -r 17e15b89db78 -r 448eb298bffc NEWS
--- a/NEWS Wed Oct 31 11:33:18 2012 +0000
+++ b/NEWS Sat Feb 02 07:50:53 2013 +0000
@@ -12,6 +12,43 @@
New in release 1.11.6 (20XX-XX-XX):
+* Security fixes
+ - S6563318, CVE-2013-0424: RMI data sanitization
+ - S6664509, CVE-2013-0425: Add logging context
+ - S6664528, CVE-2013-0426: Find log level matching its name or value given at construction time
+ - S6776941: CVE-2013-0427: Improve thread pool shutdown
+ - S7141694, CVE-2013-0429: Improving CORBA internals
+ - S7173145: Improve in-memory representation of splashscreens
+ - S7186945: Unpack200 improvement
+ - S7186946: Refine unpacker resource usage
+ - S7186948: Improve Swing data validation
+ - S7186952, CVE-2013-0432: Improve clipboard access
+ - S7186954: Improve connection performance
+ - S7186957: Improve Pack200 data validation
+ - S7192392, CVE-2013-0443: Better validation of client keys
+ - S7192393, CVE-2013-0440: Better Checking of order of TLS Messages
+ - S7192977, CVE-2013-0442: Issue in toolkit thread
+ - S7197546, CVE-2013-0428: (proxy) Reflect about creating reflective proxies
+ - S7200491: Tighten up JTable layout code
+ - S7200500: Launcher better input validation
+ - S7201064: Better dialogue checking
+ - S7201066, CVE-2013-0441: Change modifiers on unused fields
+ - S7201068, CVE-2013-0435: Better handling of UI elements
+ - S7201070: Serialization to conform to protocol
+ - S7201071, CVE-2013-0433: InetSocketAddress serialization issue
+ - S8000210: Improve JarFile code quality
+ - S8000537, CVE-2013-0450: Contextualize RequiredModelMBean class
+ - S8000540, CVE-2013-1475: Improve IIOP type reuse management
+ - S8000631, CVE-2013-1476: Restrict access to class constructor
+ - S8001235, CVE-2013-0434: Improve JAXP HTTP handling
+ - S8001242: Improve RMI HTTP conformance
+ - S8001307: Modify ACC_SUPER behavior
+ - S8001972, CVE-2013-1478: Improve image processing
+ - S8002325, CVE-2013-1480: Improve management of images
+
+* Backports
+ - S7010849: 5/5 Extraneous javac source/target options when building sa-jdi
+
New in release 1.11.5 (2012-10-16):
* Security fixes
diff -r 17e15b89db78 -r 448eb298bffc patches/ecj/hotspot.patch
--- a/patches/ecj/hotspot.patch Wed Oct 31 11:33:18 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:34:15.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:41:28.000000000 +0100
-@@ -80,8 +80,8 @@
- $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
- $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
-
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
diff -r 17e15b89db78 -r 448eb298bffc patches/openjdk/6633275-shaped_translucent_windows.patch
--- a/patches/openjdk/6633275-shaped_translucent_windows.patch Wed Oct 31 11:33:18 2012 +0000
+++ b/patches/openjdk/6633275-shaped_translucent_windows.patch Sat Feb 02 07:50:53 2013 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk openjdk/jdk/make/sun/awt/FILES_c_windows.gmk
---- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk 2012-08-31 11:35:28.843940899 +0100
-+++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk 2012-08-31 11:40:40.950186466 +0100
+--- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk 2013-02-01 22:07:30.320067472 +0000
++++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk 2013-02-01 22:08:19.836834676 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -19,8 +19,8 @@
FILES_cpp = \
CmdIDList.cpp \
diff -Nru openjdk.orig/jdk/make/sun/awt/make.depend openjdk/jdk/make/sun/awt/make.depend
---- openjdk.orig/jdk/make/sun/awt/make.depend 2012-08-31 11:35:28.855941139 +0100
-+++ openjdk/jdk/make/sun/awt/make.depend 2012-08-31 11:40:40.958186626 +0100
+--- openjdk.orig/jdk/make/sun/awt/make.depend 2013-02-01 22:07:30.328067597 +0000
++++ openjdk/jdk/make/sun/awt/make.depend 2013-02-01 22:08:19.848834862 +0000
@@ -16,7 +16,7 @@
$(OBJDIR)/awt_AWTEvent.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
@@ -107,8 +107,8 @@
$(OBJDIR)/UnicowsLoader.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
---- openjdk.orig/jdk/make/sun/awt/Makefile 2012-08-31 11:35:28.847940980 +0100
-+++ openjdk/jdk/make/sun/awt/Makefile 2012-08-31 11:40:40.958186626 +0100
+--- openjdk.orig/jdk/make/sun/awt/Makefile 2013-02-01 22:07:30.320067472 +0000
++++ openjdk/jdk/make/sun/awt/Makefile 2013-02-01 22:08:19.848834862 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -125,8 +125,8 @@
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers
---- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2012-08-31 11:35:28.855941139 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2012-08-31 11:40:40.958186626 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2013-02-01 22:07:30.328067597 +0000
++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2013-02-01 22:08:19.848834862 +0000
@@ -291,6 +291,7 @@
Java_sun_awt_X11GraphicsConfig_createBackBuffer;
Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
@@ -136,8 +136,8 @@
Java_sun_awt_X11GraphicsDevice_getDisplay;
Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux
---- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2012-08-31 11:35:28.855941139 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2012-08-31 11:40:40.958186626 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2013-02-01 22:07:30.328067597 +0000
++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2013-02-01 22:08:19.848834862 +0000
@@ -406,6 +406,7 @@
Java_sun_awt_X11GraphicsConfig_getNumColors;
Java_sun_awt_X11GraphicsConfig_getXResolution;
@@ -147,8 +147,8 @@
Java_sun_awt_X11GraphicsDevice_getDisplay;
Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers
---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2012-08-31 11:35:28.859941219 +0100
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2012-08-31 11:40:40.958186626 +0100
+--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2013-02-01 22:07:30.328067597 +0000
++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2013-02-01 22:08:19.848834862 +0000
@@ -216,6 +216,7 @@
Java_sun_awt_X11GraphicsConfig_createBackBuffer;
Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
@@ -158,8 +158,8 @@
Java_java_awt_KeyboardFocusManager_initIDs;
Java_java_awt_Font_initIDs;
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java
---- openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2012-08-31 11:35:28.543934864 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2012-08-31 11:40:40.958186626 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2013-02-01 22:07:30.232066109 +0000
++++ openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2013-02-01 22:08:19.848834862 +0000
@@ -26,17 +26,37 @@
package com.sun.awt;
@@ -545,8 +545,8 @@
* Sets a 'mixing-cutout' shape for the given component.
*
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Component.java openjdk/jdk/src/share/classes/java/awt/Component.java
---- openjdk.orig/jdk/src/share/classes/java/awt/Component.java 2012-08-31 11:35:28.863941300 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/Component.java 2012-08-31 11:50:56.060499253 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/Component.java 2013-02-01 22:07:30.332067659 +0000
++++ openjdk/jdk/src/share/classes/java/awt/Component.java 2013-02-01 22:08:19.852834924 +0000
@@ -806,137 +806,148 @@
}
}
@@ -794,7 +794,7 @@
public void setMixingCutoutShape(Component comp, Shape shape) {
Region region = shape == null ? null :
Region.getInstance(shape, null);
-@@ -7573,7 +7587,7 @@
+@@ -7573,7 +7584,7 @@
// sometimes most recent focus owner may be null, but focus owner is not
// e.g. we reset most recent focus owner if user removes focus owner
focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
@@ -803,7 +803,7 @@
focusOwner = null;
}
}
-@@ -8808,31 +8822,9 @@
+@@ -8808,31 +8819,9 @@
* null, if component is not a part of window hierarchy
*/
Window getContainingWindow() {
@@ -836,7 +836,7 @@
/**
* Initialize JNI field and method IDs
*/
-@@ -9946,4 +9938,29 @@
+@@ -9946,4 +9935,29 @@
}
// ****************** END OF MIXING CODE ********************************
@@ -867,8 +867,8 @@
+ }
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Container.java openjdk/jdk/src/share/classes/java/awt/Container.java
---- openjdk.orig/jdk/src/share/classes/java/awt/Container.java 2012-08-31 11:35:28.563935265 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/Container.java 2012-08-31 11:40:40.962186705 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/Container.java 2013-02-01 22:07:30.236066171 +0000
++++ openjdk/jdk/src/share/classes/java/awt/Container.java 2013-02-01 22:08:19.860835048 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -887,8 +887,8 @@
* JDK 1.1 serialVersionUID
*/
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java
---- openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2012-08-31 11:35:28.411932207 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2012-08-31 11:40:40.962186705 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2013-02-01 22:07:30.184065365 +0000
++++ openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2013-02-01 22:08:19.860835048 +0000
@@ -490,7 +490,7 @@
// that a Component outside of the focused Window receives a
// FOCUS_GAINED event. We synthesize a WINDOW_GAINED_FOCUS
@@ -900,7 +900,7 @@
newFocusedWindow != currentFocusedWindow)
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/GraphicsConfiguration.java openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java
--- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsConfiguration.java 2011-11-14 22:11:48.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java 2012-08-31 11:40:40.962186705 +0100
++++ openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java 2013-02-01 22:08:19.860835048 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -930,8 +930,8 @@
}
+}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java
---- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java 2012-08-31 11:35:28.863941300 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java 2012-08-31 11:40:40.962186705 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java 2013-02-01 22:07:30.332067659 +0000
++++ openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java 2013-02-01 22:08:19.860835048 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -1100,8 +1100,8 @@
+ }
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java
---- openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2012-08-31 11:35:28.379931565 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2012-08-31 11:40:40.966186785 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2013-02-01 22:07:30.172065180 +0000
++++ openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2013-02-01 22:08:19.860835048 +0000
@@ -2224,7 +2224,7 @@
boolean temporary, boolean focusedWindowChangeAllowed,
long time)
@@ -1144,7 +1144,7 @@
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/peer/WindowPeer.java openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java
--- openjdk.orig/jdk/src/share/classes/java/awt/peer/WindowPeer.java 2011-11-14 22:11:49.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java 2012-08-31 11:40:40.966186785 +0100
++++ openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java 2013-02-01 22:08:19.860835048 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -1189,8 +1189,8 @@
+ void updateWindow(BufferedImage backBuffer);
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Window.java openjdk/jdk/src/share/classes/java/awt/Window.java
---- openjdk.orig/jdk/src/share/classes/java/awt/Window.java 2012-08-31 11:35:28.415932289 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/Window.java 2012-08-31 11:40:40.966186785 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/Window.java 2013-02-01 22:07:30.188065428 +0000
++++ openjdk/jdk/src/share/classes/java/awt/Window.java 2013-02-01 22:08:19.860835048 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -1532,8 +1532,8 @@
diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/RepaintManager.java openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java
---- openjdk.orig/jdk/src/share/classes/javax/swing/RepaintManager.java 2011-11-14 22:11:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java 2012-08-31 11:40:40.966186785 +0100
+--- openjdk.orig/jdk/src/share/classes/javax/swing/RepaintManager.java 2013-02-01 22:07:29.980062206 +0000
++++ openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java 2013-02-01 22:20:00.543789010 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -1541,15 +1541,7 @@
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -34,6 +34,7 @@
- import java.util.*;
- import java.applet.*;
-
-+import sun.awt.AWTAccessor;
- import sun.awt.AppContext;
- import sun.awt.DisplayChangedListener;
- import sun.awt.SunToolkit;
-@@ -681,6 +682,44 @@
+@@ -711,6 +711,44 @@
}
}
@@ -1594,21 +1586,21 @@
/**
* Paint all of the components that have been marked dirty.
*
-@@ -714,6 +753,10 @@
- int localBoundsW = 0;
- Enumeration keys;
+@@ -733,6 +771,10 @@
+ return;
+ }
+ // the components belonging to perpixel-translucent windows will be
+ // removed from the list
-+ tmpDirtyComponents = updateWindows(tmpDirtyComponents);
-+
- roots = new ArrayList<Component>(count);
-
- for (Component dirty : tmpDirtyComponents.keySet()) {
++ updateWindows(tmpDirtyComponents);
++
+ final java.util.List<Component> roots =
+ new ArrayList<Component>(tmpDirtyComponents.size());
+
diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java
---- openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-08-31 11:35:28.579935587 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-08-31 11:43:53.386005753 +0100
-@@ -202,10 +202,29 @@
+--- openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java 2013-02-01 22:07:30.236066171 +0000
++++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java 2013-02-01 22:08:19.864835110 +0000
+@@ -203,10 +203,29 @@
*/
Point getLocation(Component comp);
@@ -1641,7 +1633,7 @@
*/
void setMixingCutoutShape(Component comp, Shape shape);
-@@ -234,6 +253,36 @@
+@@ -235,6 +254,36 @@
* components in the specified window to the specified value.
*/
void setLWRequestStatus(Window changed, boolean status);
@@ -1678,7 +1670,7 @@
}
/**
-@@ -534,8 +583,14 @@
+@@ -540,8 +589,14 @@
*/
private static KeyboardFocusManagerAccessor kfmAccessor;
@@ -1694,8 +1686,8 @@
private static MenuComponentAccessor menuComponentAccessor;
diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/EmbeddedFrame.java openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java
---- openjdk.orig/jdk/src/share/classes/sun/awt/EmbeddedFrame.java 2012-08-31 11:35:28.231928586 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java 2012-08-31 11:40:40.966186785 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/awt/EmbeddedFrame.java 2013-02-01 22:07:29.704057928 +0000
++++ openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java 2013-02-01 22:08:19.864835110 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -1718,8 +1710,8 @@
+ }
} // class EmbeddedFrame
diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java
---- openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java 2012-08-31 11:35:28.579935587 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2012-08-31 11:41:50.915577773 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java 2013-02-01 22:07:30.236066171 +0000
++++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2013-02-01 22:08:19.864835110 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -1886,7 +1878,7 @@
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/utility/rect.c openjdk/jdk/src/share/native/sun/awt/utility/rect.c
--- openjdk.orig/jdk/src/share/native/sun/awt/utility/rect.c 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/utility/rect.c 2012-08-31 11:40:40.966186785 +0100
++++ openjdk/jdk/src/share/native/sun/awt/utility/rect.c 2013-02-01 22:08:19.864835110 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -1992,7 +1984,7 @@
+#endif
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java
--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2011-11-14 22:12:14.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2012-08-31 11:40:40.966186785 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2013-02-01 22:08:19.864835110 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -2019,7 +2011,7 @@
}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt
--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt 2011-11-14 22:12:14.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt 2012-08-31 11:40:40.970186865 +0100
More information about the distro-pkg-dev
mailing list