/hg/release/icedtea6-1.10: 2 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Aug 31 09:07:35 PDT 2012


changeset e067051f7a6e in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=e067051f7a6e
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 31 16:59:45 2012 +0100

	Add security fixes from 2012/08/30.

	2012-08-31  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		(SECURITY_PATCHES): Add 7162476, 7163201 & 7182135.
		(ICEDTEA_PATCHES): Add 7185678.
		* patches/nomotif-6706121.patch,
		* patches/openjdk/6633275-shaped_translucent_windows.patch,
		* patches/openjdk/6693253-security_warning.patch,
		* patches/openjdk/6797195-hw_lw_mixing.patch:
		Regenerated post-security patches.
		* patches/openjdk/7185678-xmenuitem_peer_npe.patch,
		* patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
		* patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
		New patches from 6u35/7u7 security release.
		* patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch:
		Regression fix for 7162476.


changeset fa657fd33ff2 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=fa657fd33ff2
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 31 17:07:24 2012 +0100

	Update NEWS with security fixes and add release date.

	2012-08-31  Andrew John Hughes  <ahughes at redhat.com>

		* NEWS: Updated with latest fixes.
		Set 1.10.9 release date.


diffstat:

 ChangeLog                                                                       |    22 +
 Makefile.am                                                                     |     8 +-
 NEWS                                                                            |     9 +-
 patches/nomotif-6706121.patch                                                   |   659 +-
 patches/openjdk/6633275-shaped_translucent_windows.patch                        |   411 +-
 patches/openjdk/6693253-security_warning.patch                                  |   215 +-
 patches/openjdk/6797195-hw_lw_mixing.patch                                      |   128 +-
 patches/openjdk/7185678-xmenuitem_peer_npe.patch                                |    21 +
 patches/security/20120830/7162476-xmldecoder_via_classfinder.patch              |  2522 ++++++
 patches/security/20120830/7163201-simplify_toolkit_internal_references.patch    |  3714 ++++++++++
 patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch |   519 +
 11 files changed, 7287 insertions(+), 941 deletions(-)

diffs (truncated from 10372 to 500 lines):

diff -r f5a3984175d3 -r fa657fd33ff2 ChangeLog
--- a/ChangeLog	Wed Jun 13 02:38:51 2012 +0100
+++ b/ChangeLog	Fri Aug 31 17:07:24 2012 +0100
@@ -1,3 +1,25 @@
+2012-08-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Updated with latest fixes.
+	Set 1.10.9 release date.
+
+2012-08-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(SECURITY_PATCHES): Add 7162476, 7163201 & 7182135.
+	(ICEDTEA_PATCHES): Add 7185678.
+	* patches/nomotif-6706121.patch,
+	* patches/openjdk/6633275-shaped_translucent_windows.patch,
+	* patches/openjdk/6693253-security_warning.patch,
+	* patches/openjdk/6797195-hw_lw_mixing.patch:
+	Regenerated post-security patches.
+	* patches/openjdk/7185678-xmenuitem_peer_npe.patch,
+	* patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
+	* patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
+	New patches from 6u35/7u7 security release.
+	* patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch:
+	Regression fix for 7162476.
+
 2012-06-12  Andrew John Hughes  <ahughes at redhat.com>
 
 	* configure.ac: Bump to 1.10.9pre.
diff -r f5a3984175d3 -r fa657fd33ff2 Makefile.am
--- a/Makefile.am	Wed Jun 13 02:38:51 2012 +0100
+++ b/Makefile.am	Fri Aug 31 17:07:24 2012 +0100
@@ -226,7 +226,10 @@
 	patches/security/20120612/${HSBUILD}/7152811.patch \
 	patches/security/20120612/7157609.patch \
 	patches/security/20120612/7160677.patch \
-	patches/security/20120612/7160757.patch
+	patches/security/20120612/7160757.patch \
+	patches/security/20120830/7162476-xmldecoder_via_classfinder.patch \
+	patches/security/20120830/7163201-simplify_toolkit_internal_references.patch \
+	patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
 
 SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
 
@@ -396,7 +399,8 @@
 	patches/openjdk/$(HSBUILD)/7103224-glibc_name_collision.patch \
 	patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
 	patches/openjdk/remove-mimpure-option-to-gcc.patch \
-	patches/coverage-table.patch
+	patches/coverage-table.patch \
+	patches/openjdk/7185678-xmenuitem_peer_npe.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r f5a3984175d3 -r fa657fd33ff2 NEWS
--- a/NEWS	Wed Jun 13 02:38:51 2012 +0100
+++ b/NEWS	Fri Aug 31 17:07:24 2012 +0100
@@ -9,7 +9,14 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 1.10.9 (2012-XX-XX):
+New in release 1.10.9 (2012-08-31):
+
+* Security fixes
+  - S7162476, CVE-2012-1682: XMLDecoder security issue via ClassFinder
+  - S7163201, CVE-2012-0547: Simplify toolkit internals references
+* OpenJDK
+  - S7182135: Impossible to use some editors directly
+  - S7185678: java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java failed with NPE
 
 New in release 1.10.8 (2012-06-12):
 
diff -r f5a3984175d3 -r fa657fd33ff2 patches/nomotif-6706121.patch
--- a/patches/nomotif-6706121.patch	Wed Jun 13 02:38:51 2012 +0100
+++ b/patches/nomotif-6706121.patch	Fri Aug 31 17:07:24 2012 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk openjdk/jdk/make/sun/awt/FILES_c_unix.gmk
---- openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk	2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk	2010-05-26 13:11:21.000000000 +0100
+--- openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk	2011-11-14 22:11:40.000000000 +0000
++++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk	2012-08-31 12:03:21.902641410 +0100
 @@ -142,59 +142,59 @@
  # These files rely on motif to be built, and should not be included
  # in a headless build.
@@ -115,9 +115,9 @@
  
  # These files are required to be built, with or without motif.  Some of
 diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk	2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/FILES_export_unix.gmk	2010-05-26 13:11:21.000000000 +0100
-@@ -57,48 +57,15 @@
+--- openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk	2012-08-31 12:00:37.508379799 +0100
++++ openjdk/jdk/make/sun/awt/FILES_export_unix.gmk	2012-08-31 12:03:21.918641631 +0100
+@@ -60,48 +60,15 @@
  	sun/awt/image/DataBufferNative.java \
  	\
  	sun/awt/motif/X11FontMetrics.java \
@@ -166,7 +166,7 @@
  	sun/awt/X11GraphicsEnvironment.java \
  	sun/awt/X11GraphicsDevice.java \
  	sun/awt/X11GraphicsConfig.java \
-@@ -120,7 +87,6 @@
+@@ -124,7 +91,6 @@
          sun/java2d/cmm/ColorTransform.java \
          sun/awt/datatransfer/DataTransferer.java \
  	sun/awt/dnd/SunDragSourceContextPeer.java \
@@ -174,7 +174,7 @@
  	sun/awt/motif/MToolkitThreadBlockedHandler.java \
  	sun/java2d/opengl/OGLBlitLoops.java \
  	sun/java2d/opengl/OGLContext.java \
-@@ -216,6 +182,5 @@
+@@ -220,6 +186,5 @@
  	java/awt/event/NativeLibLoader.java \
  	java/awt/peer/ComponentPeer.java \
  	java/awt/dnd/DnDConstants.java \
@@ -183,8 +183,8 @@
 +	sun/awt/CausedFocusEvent.java
  
 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	2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers	2010-05-26 13:11:21.000000000 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers	2012-08-31 12:00:37.800383804 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers	2012-08-31 12:03:21.918641631 +0100
 @@ -31,7 +31,7 @@
  	global:
  		JNI_OnLoad;
@@ -601,7 +601,7 @@
  		Java_sun_awt_SunToolkit_closeSplashScreen;
  		Java_sun_awt_PlatformFont_initIDs;
  		Java_sun_awt_X11GraphicsConfig_init;
-@@ -311,25 +311,25 @@
+@@ -312,25 +312,25 @@
                  Java_sun_awt_X11GraphicsEnvironment_initGLX;
  		Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
  		Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
@@ -646,7 +646,7 @@
  		Java_java_awt_AWTEvent_initIDs;
  		Java_java_awt_Button_initIDs;
  		Java_java_awt_Container_initIDs;
-@@ -343,39 +343,39 @@
+@@ -344,39 +344,39 @@
  		Java_java_awt_Insets_initIDs;
  		Java_java_awt_TextField_initIDs;
  		Java_java_awt_Window_initIDs;
@@ -717,8 +717,8 @@
  		Java_sun_awt_motif_MToolkitThreadBlockedHandler_exit;
  		Java_sun_awt_X11GraphicsConfig_init;
 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	2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux	2010-05-26 13:11:21.000000000 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux	2012-08-31 12:00:37.800383804 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux	2012-08-31 12:03:21.918641631 +0100
 @@ -169,7 +169,7 @@
  		GrPrim_Sg2dGetPixel;
  		GrPrim_Sg2dGetLCDTextContrast;
@@ -1121,7 +1121,7 @@
  		Java_sun_awt_SunToolkit_closeSplashScreen;
  		Java_sun_awt_PlatformFont_initIDs;
  		Java_sun_awt_X11GraphicsConfig_init;
-@@ -441,40 +441,40 @@
+@@ -442,40 +442,40 @@
  		Java_java_awt_Insets_initIDs;
  		Java_java_awt_TextField_initIDs;
  		Java_java_awt_Window_initIDs;
@@ -1192,7 +1192,7 @@
  		Java_sun_awt_motif_MToolkitThreadBlockedHandler_enter;
  		Java_sun_awt_motif_MToolkitThreadBlockedHandler_exit;
  		Java_sun_awt_X11GraphicsConfig_init;
-@@ -502,26 +502,26 @@
+@@ -503,26 +503,26 @@
  		Java_sun_awt_X11SurfaceData_isDgaAvailable;
  		Java_sun_awt_X11SurfaceData_setInvalid;
  		Java_sun_awt_X11SurfaceData_flushNativeSurface;
@@ -1240,8 +1240,8 @@
  		awt_lock;
  		awt_Lock;
 diff -Nru openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
---- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mawt.gmk	2010-05-26 13:11:21.000000000 +0100
+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2011-11-14 22:11:40.000000000 +0000
++++ openjdk/jdk/make/sun/awt/mawt.gmk	2012-08-31 12:03:21.918641631 +0100
 @@ -28,14 +28,6 @@
  #
  INIT += $(LIB_LOCATION) 
@@ -1394,261 +1394,9 @@
  
  endif # !HEADLESS
  
-diff -Nru openjdk.orig/jdk/make/sun/awt/mawt.gmk.orig openjdk/jdk/make/sun/awt/mawt.gmk.orig
---- openjdk.orig/jdk/make/sun/awt/mawt.gmk.orig	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mawt.gmk.orig	2010-05-26 09:32:36.000000000 +0100
-@@ -0,0 +1,248 @@
-+#
-+# Copyright (c) 2000, 2007, Oracle and/or its affiliates. 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.  Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+
-+#
-+# to create directory:
-+#
-+INIT += $(LIB_LOCATION) 
-+
-+ifndef HEADLESS
-+ifeq ($(PLATFORM), linux)
-+ifeq ($(STATIC_MOTIF),false)
-+INIT += $(LIB_LOCATION)/libXm.so
-+endif
-+endif
-+endif
-+
-+#
-+# Files
-+#
-+# mawt.gmk is just used in building X/Motif native code, so
-+# this list of java files is no longer included.
-+#include FILES_java_unix.gmk
-+include $(BUILDDIR)/sun/awt/FILES_c_unix.gmk
-+
-+include $(BUILDDIR)/sun/awt/FILES_export_unix.gmk
-+
-+# Check which C files should be built.  Headless uses only
-+# non-motif files.  Also, a version-specific motif file is
-+# compiled based on the motif version.
-+ifdef HEADLESS
-+  FILES_c = $(FILES_NO_MOTIF_c)
-+else
-+  FILES_c = $(FILES_MOTIF_c) $(FILES_NO_MOTIF_c)
-+
-+  ifeq ($(MOTIF_VERSION), 2)
-+    FILES_c += awt_motif21.c
-+    FILES_c += awt_Choice21.c
-+  endif
-+
-+endif
-+
-+ifeq ($(PLATFORM), solaris)
-+  ifneq ($(ARCH), amd64)
-+    FILES_reorder += reorder-$(ARCH)
-+  endif
-+endif
-+
-+#
-+# Rules
-+#
-+
-+# Class files should be built & clobbered in make/sun/awt
-+# If removing this line, also reinclude sun_awt.jmk
-+DONT_CLOBBER_CLASSES = true
-+
-+
-+ifndef HEADLESS
-+ifeq ($(VARIANT), OPT)
-+FILES_m = ../awt/mapfile-mawt-vers
-+endif
-+endif
-+
-+# Since this library will be living in a subdirectory below the other libraries
-+#   we need to add an extra runpath so that libraries in the upper directory
-+#   are found at runtime.
-+LD_RUNPATH_EXTRAS = ..
-+
-+include $(BUILDDIR)/common/Mapfile-vers.gmk
-+include $(BUILDDIR)/common/Library.gmk
-+
-+$(LIB_LOCATION):
-+	$(MKDIR) -p $@
-+
-+ifeq ($(PLATFORM), linux)
-+ifeq ($(STATIC_MOTIF),false)
-+$(LIB_LOCATION)/libXm.so:
-+	$(CP) $(MOTIF_LIB)/libXm.so $(LIB_LOCATION)/libXm.so
-+# Automounter problem makes the link fail on Redhat 6.1.
-+#	$(LN) -s $(MOTIF_LIB)/libXm.so $(LIB_LOCATION)/libXm.so
-+endif
-+endif
-+
-+clean:: 
-+
-+#
-+# Add to the ambient vpath to pick up files in subdirectories
-+#
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/alphacomposite
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/gif
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/cvutils
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/shell
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/medialib
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
-+vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-+vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/debug
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../font
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
-+vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
-+vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image
-+vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/robot_child
-+
-+#
-+# Libraries to link in.
-+#
-+
-+
-+ifeq ($(DEBUG_BINARIES), true)
-+  CFLAGS += -g
-+endif
-+ifeq ($(HEADLESS),true)
-+CFLAGS += -DHEADLESS=$(HEADLESS)
-+CPPFLAGS += -DHEADLESS=$(HEADLESS)
-+OTHER_LDLIBS =
-+else
-+CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
-+
-+ifeq ($(STATIC_MOTIF),true)
-+    LIBXM = $(MOTIF_LIB)/libXm.a -lXp -lXmu
-+    ifeq ($(PLATFORM), linux)
-+	ifeq ($(ARCH_DATA_MODEL), 64)
-+            LIBXT = -lXt
-+        else
-+        # Allows for builds on Debian GNU Linux, X11 is in a different place 
-+	    LIBXT = $(firstword $(wildcard /usr/X11R6/lib/libXt.a) \
-+                            $(wildcard /usr/lib/libXt.a))
-+	    LIBSM = $(firstword $(wildcard /usr/X11R6/lib/libSM.a) \
-+                            $(wildcard /usr/lib/libSM.a))
-+	    LIBICE = $(firstword $(wildcard /usr/X11R6/lib/libICE.a) \
-+                             $(wildcard /usr/lib/libICE.a))
-+	endif
-+    endif
-+else
-+    LIBXM = -L$(MOTIF_LIB) -lXm -lXp
-+    ifeq ($(PLATFORM), linux)
-+	LIBXT = -lXt
-+	LIBSM = 
-+	LIBICE = 
-+    endif
-+endif
-+
-+LIBXTST = -lXtst
-+
-+# Use -lXmu for EditRes support
-+LIBXMU_DBG	= -lXmu
-+LIBXMU_OPT	=
-+LIBXMU		= $(LIBXMU_$(VARIANT))
-+
-+ifeq ($(PLATFORM), solaris)
-+OTHER_LDLIBS = $(LIBXM) -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
-+endif
-+
-+ifeq ($(PLATFORM), linux)
-+OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
-+OTHER_CFLAGS += -DMOTIF_VERSION=2
-+OTHER_CFLAGS += -DXMSTRINGDEFINES=1
-+OTHER_LDLIBS = $(LIBXM) $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
-+endif
-+
-+endif
-+# !HEADLESS
-+
-+OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \
-+                -lawt $(LIBM) -ldl
-+
-+#
-+# Sun CC with -Xa misdefines __STDC__ to 0 (zero).
-+# The following will force checking of X11 prototypes.
-+# 
-+ifneq ($(CC_VERSION),gcc)
-+CPPFLAGS += -DFUNCPROTO=15
-+endif
-+
-+#
-+# Other extra flags needed for compiling.
-+#
-+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-+
-+ifndef HEADLESS
-+CPPFLAGS += -I$(MOTIF_DIR)/include \
-+            -I$(OPENWIN_HOME)/include 
-+LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
-+
-+endif # !HEADLESS
-+
-+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-+            -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-+            -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-+            -I$(SHARE_SRC)/native/$(PKGDIR)/image \
-+	    -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
-+	    -I$(SHARE_SRC)/native/$(PKGDIR)/shell \
-+	    -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
-+            -I$(SHARE_SRC)/native/$(PKGDIR)/medialib \
-+            -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib \
-+	    -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d \
-+	    -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d \
-+	    -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops \
-+	    -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe \
-+            -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl \
-+            -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl \
-+            -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 \
-+        -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
-+        -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
-+            -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
-+        -I$(PLATFORM_SRC)/native/$(PKGDIR) \
-+        $(EVENT_MODEL)
-+
-+ifeq ($(PLATFORM), linux)
-+# Checking for the X11/extensions headers at the additional location
-+  CPPFLAGS += -I/X11R6/include/X11/extensions \
-+              -I/usr/include/X11/extensions
-+endif
-+
-+ifeq ($(PLATFORM), solaris)
-+  CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
-+endif
-+
-+
-+LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
-+	   $(AWT_RUNPATH)
-+
-+CLASSES.export += java.io.InputStream \
-+		  java.lang.ThreadGroup
-+
 diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
---- openjdk.orig/jdk/make/sun/jawt/Makefile	2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/sun/jawt/Makefile	2010-05-26 13:11:21.000000000 +0100
+--- openjdk.orig/jdk/make/sun/jawt/Makefile	2011-11-14 22:11:41.000000000 +0000
++++ openjdk/jdk/make/sun/jawt/Makefile	2012-08-31 12:03:21.922641686 +0100
 @@ -99,7 +99,6 @@
  # Other extra flags needed for compiling.
  #
@@ -1657,174 +1405,8 @@
  	    -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
              -I$(SHARE_SRC)/native/$(PKGDIR)/image \
  	    -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
-diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile.orig openjdk/jdk/make/sun/jawt/Makefile.orig
---- openjdk.orig/jdk/make/sun/jawt/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/sun/jawt/Makefile.orig	2010-05-26 09:32:36.000000000 +0100
-@@ -0,0 +1,162 @@
-+#
-+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. 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.  Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+
-+BUILDDIR = ../..
-+PACKAGE = sun.awt
-+LIBRARY = jawt
-+PRODUCT = sun
-+
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+#
-+# Files
-+#
-+ifeq ($(PLATFORM), windows)
-+FILES_cpp = jawt.cpp
-+else # PLATFORM
-+FILES_c = jawt.c
-+endif # PLATFORM
-+
-+FILES_h = $(INCLUDEDIR)/jawt.h \
-+    $(PLATFORM_INCLUDE)/jawt_md.h



More information about the distro-pkg-dev mailing list