Mercurial > hg > icedtea6

changeset 254:ee0f1bb78ec6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-10-14 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (OPENJDK_VERSION): Update for b22. (OPENJDK_DATE): Likewise. (OPENJDK_MD5SUM): Likewise. (ICEDTEA_PATCHES): Remove patches/icedtea-xinerama.patch. Add patches/icedtea-xjc.patch. (OPENJDK_SOURCEPATH_DIRS): Add openjdk/jaxp/src/share/classes. (stamps/extract.stamp): Remove openjdk/jaxws. (ICEDTEA_ENV): Fix ANT_HOME, BUILD_NUMBER, JRE_RELEASE_VERSION, and HOTSPOT_RELEASE_VERSION. Add ALT_JDK_IMPORT_PATH. * Makefile.in: Regenerate. * patches/icedtea-xinerama.patch: Remove file.
author Thomas Fitzsimmons <fitzsim@redhat.com>
date Sun, 14 Oct 2007 23:24:57 -0400
parents f9b8887af3ab
children 3807a84f61c5
files ChangeLog Makefile.am Makefile.in patches/icedtea-ant.patch patches/icedtea-certbundle.patch patches/icedtea-copy-plugs.patch patches/icedtea-debuginfo.patch patches/icedtea-license-headers.patch patches/icedtea-memory-limits.patch patches/icedtea-paths.patch patches/icedtea-plugin.patch patches/icedtea-speed.patch patches/icedtea-use-system-tzdata.patch patches/icedtea-xinerama.patch patches/icedtea-xjc.patch
diffstat 15 files changed, 368 insertions(+), 330 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 12 12:26:19 2007 -0400
+++ b/ChangeLog	Sun Oct 14 23:24:57 2007 -0400
@@ -1,3 +1,17 @@
+2007-10-14  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* Makefile.am (OPENJDK_VERSION): Update for b22.
+	(OPENJDK_DATE): Likewise.
+	(OPENJDK_MD5SUM): Likewise.
+	(ICEDTEA_PATCHES): Remove patches/icedtea-xinerama.patch.  Add
+	patches/icedtea-xjc.patch.
+	(OPENJDK_SOURCEPATH_DIRS): Add openjdk/jaxp/src/share/classes.
+	(stamps/extract.stamp): Remove openjdk/jaxws.
+	(ICEDTEA_ENV): Fix ANT_HOME, BUILD_NUMBER, JRE_RELEASE_VERSION,
+	and HOTSPOT_RELEASE_VERSION.  Add ALT_JDK_IMPORT_PATH.
+	* Makefile.in: Regenerate.
+	* patches/icedtea-xinerama.patch: Remove file.
+
 2007-10-12  Lillian Angel  <langel@redhat.com>
 	
 	* NEWS: Updated for 1.4.
--- a/Makefile.am	Fri Oct 12 12:26:19 2007 -0400
+++ b/Makefile.am	Sun Oct 14 23:24:57 2007 -0400
@@ -1,6 +1,6 @@
-OPENJDK_VERSION = b21
-OPENJDK_DATE = 27_sep_2007
-OPENJDK_MD5SUM = 64ac356cd24af5e52cf9fd1217e234da
+OPENJDK_VERSION = b22
+OPENJDK_DATE = 12_oct_2007
+OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2
 
 # Top-Level Targets
 # =================
@@ -30,23 +30,25 @@
 
 # OpenJDK build environment.
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
+BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/
+	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/
 ICEDTEA_RT = \
 	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/classes
+	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_ENDORSED_DIR = \
 	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
 ICEDTEA_ENV = \
-	"ANT_HOME=@SYSTEM_ANT_DIR@" \
-	"BUILD_NUMBER=b21" \
-	"JRE_RELEASE_VERSION=1.7.0-b21" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-b21" \
+	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
+	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
+	"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -95,13 +97,14 @@
 	rm -f stamps/download.stamp
 	rm -f $(OPENJDK_SRC_ZIP)
 
-# Extract OpenJDK sources.
+# Extratc OpenJDK sources.
 stamps/extract.stamp: stamps/download.stamp
 	if ! test -d openjdk ; \
 	then \
 	  $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
 	  chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \
 	     -name sample.makefile.txt` ; \
+	  rm -rf openjdk/jaxws ; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
@@ -139,9 +142,9 @@
 	patches/icedtea-gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
 	patches/icedtea-float-double-trailing-zeros.patch \
-	patches/icedtea-xinerama.patch \
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
+	patches/icedtea-xjc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
@@ -195,16 +198,17 @@
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
+icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp \
+	stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	@echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR)
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
 icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
@@ -214,11 +218,11 @@
 	  -C openjdk/control/make \
 	  debug_build
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea (debug build) is served:" \
-	  openjdk/control/build/$(LINUX_DIR)-debug
+	  $(BUILD_OUTPUT_DIR)-debug
 
 clean-icedtea: stamps/extract.stamp
 	$(MAKE) \
@@ -298,8 +302,13 @@
 	  rm -rf rt/$$copy_dir ; \
 	done
 
+SHARE = openjdk/j2se/src/share/classes
+SOLARIS = openjdk/j2se/src/solaris/classes
+LANGTOOLS = openjdk/langtools/src/share/classes
+JAXP = openjdk/jaxp/src/share/classes
+
 OPENJDK_SOURCEPATH_DIRS = \
-        openjdk/j2se/src/share/classes:openjdk/j2se/src/solaris/classes:openjdk/langtools/src/share/classes
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP)
 
 # tools.jar class files.
 stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
--- a/Makefile.in	Fri Oct 12 12:26:19 2007 -0400
+++ b/Makefile.in	Sun Oct 14 23:24:57 2007 -0400
@@ -180,36 +180,38 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b21
-OPENJDK_DATE = 27_sep_2007
-OPENJDK_MD5SUM = 64ac356cd24af5e52cf9fd1217e234da
+OPENJDK_VERSION = b22
+OPENJDK_DATE = 12_oct_2007
+OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy-files.txt
 
 
 # OpenJDK build environment.
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
+BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/
+	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/
 
 ICEDTEA_RT = \
 	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/openjdk/control/build/$(LINUX_DIR)/classes
+	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
 
 ICEDTEA_ENDORSED_DIR = \
 	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
 
 ICEDTEA_ENV = \
-	"ANT_HOME=@SYSTEM_ANT_DIR@" \
-	"BUILD_NUMBER=b21" \
-	"JRE_RELEASE_VERSION=1.7.0-b21" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-b21" \
+	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
+	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
+	"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -255,9 +257,9 @@
 	patches/icedtea-gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
 	patches/icedtea-float-double-trailing-zeros.patch \
-	patches/icedtea-xinerama.patch \
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
+	patches/icedtea-xjc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
@@ -286,8 +288,12 @@
 	com/sun/tools/jdi \
 	java/util
 
+SHARE = openjdk/j2se/src/share/classes
+SOLARIS = openjdk/j2se/src/solaris/classes
+LANGTOOLS = openjdk/langtools/src/share/classes
+JAXP = openjdk/jaxp/src/share/classes
 OPENJDK_SOURCEPATH_DIRS = \
-        openjdk/j2se/src/share/classes:openjdk/j2se/src/solaris/classes:openjdk/langtools/src/share/classes
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP)
 
 all: all-am
 
@@ -605,13 +611,14 @@
 	rm -f stamps/download.stamp
 	rm -f $(OPENJDK_SRC_ZIP)
 
-# Extract OpenJDK sources.
+# Extratc OpenJDK sources.
 stamps/extract.stamp: stamps/download.stamp
 	if ! test -d openjdk ; \
 	then \
 	  $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
 	  chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \
 	     -name sample.makefile.txt` ; \
+	  rm -rf openjdk/jaxws ; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
@@ -665,16 +672,17 @@
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
+icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp \
+	stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	@echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR)
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
 icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
@@ -684,11 +692,11 @@
 	  -C openjdk/control/make \
 	  debug_build
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -af gcjwebplugin.so \
-	  openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea (debug build) is served:" \
-	  openjdk/control/build/$(LINUX_DIR)-debug
+	  $(BUILD_OUTPUT_DIR)-debug
 
 clean-icedtea: stamps/extract.stamp
 	$(MAKE) \
--- a/patches/icedtea-ant.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-ant.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,6 +1,17 @@
---- lang.orig	2007-10-02 11:57:53.000000000 -0400
-+++ openjdk/langtools/make/Makefile	2007-10-02 11:58:08.000000000 -0400
-@@ -129,16 +129,9 @@
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig	2007-10-14 17:34:43.000000000 -0400
++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2007-10-14 17:33:44.000000000 -0400
+@@ -71,7 +71,7 @@
+ ifndef ANT_HOME
+   ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest
+ endif
+-ANT = $(ANT_HOME)/bin/ant
++ANT = ant
+ ifndef FINDBUGS_HOME
+   FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest
+ endif
+--- openjdk.orig/langtools/make/Makefile	2007-10-12 03:47:30.000000000 -0400
++++ openjdk/langtools/make/Makefile	2007-10-12 17:11:46.000000000 -0400
+@@ -133,16 +133,9 @@
    ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
  endif
  
@@ -20,3 +31,36 @@
  endif
  
  # Default target and expected 'do everything' target
+--- openjdk/jaxp/make/Makefile.orig	2007-10-14 21:50:24.000000000 -0400
++++ openjdk/jaxp/make/Makefile	2007-10-14 21:50:56.000000000 -0400
+@@ -100,16 +100,9 @@
+   ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
+ endif
+ 
+-ifdef ANT_HOME
+-  ANT = $(ANT_HOME)/bin/ant
+-  ifneq ($(shell test -x $(ANT); echo $$?), 0)
+-    $(error "$(ANT) not found; please update ANT_HOME")
+-  endif
+-else
+-  ANT = ant
+-  ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
+-    $(error "\"ant\" not found; please set ANT_HOME or put \"ant\" on your PATH")
+-  endif
++ANT = ant
++ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
++  $(error "\"ant\" not found; please put \"ant\" on your PATH")
+ endif
+ 
+ # Default target and expected 'do everything' target
+--- openjdk/j2se/make/common/shared/Defs-utils.gmk.orig	2007-10-14 17:35:02.000000000 -0400
++++ openjdk/j2se/make/common/shared/Defs-utils.gmk	2007-10-14 17:34:07.000000000 -0400
+@@ -71,7 +71,7 @@
+ ifndef ANT_HOME
+   ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest
+ endif
+-ANT = $(ANT_HOME)/bin/ant
++ANT = ant
+ ifndef FINDBUGS_HOME
+   FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest
+ endif
--- a/patches/icedtea-certbundle.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-certbundle.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,10 +1,10 @@
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig	2007-08-21 21:53:38.000000000 -0400
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-08-21 22:02:32.000000000 -0400
-@@ -376,6 +376,21 @@
+diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2007-10-12 03:46:00.000000000 -0400
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-10-12 18:24:12.000000000 -0400
+@@ -376,6 +376,20 @@
      }
    }
  
-+  // Use the system zoneinfo files, if present
 +  SystemProperty* sp = Arguments::system_properties();
 +  Arguments::PropertyList_add (&sp,
 +			       "javax.net.ssl.trustStore",
@@ -22,19 +22,9 @@
  #undef malloc
  #undef getenv
  #undef EXTENSIONS_DIR
-diff -ruN openjdk.old/j2se/src/share/classes/sun/security/provider/SunEntries.java openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java
---- openjdk.old/j2se/src/share/classes/sun/security/provider/SunEntries.java	2007-09-27 04:07:14.000000000 -0400
-+++ openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java	2007-10-09 10:34:59.000000000 -0400
-@@ -178,6 +178,7 @@
- 	map.put("KeyStore.JKS", "sun.security.provider.JavaKeyStore$JKS");
- 	map.put("KeyStore.CaseExactJKS", 
- 			"sun.security.provider.JavaKeyStore$CaseExactJKS");
-+	map.put("KeyStore.CertBundle", "sun.security.provider.CertBundleKeyStoreImpl");
- 
- 	/*
- 	 * Policy
---- openjdk.old/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java	2007-10-09 11:06:30.000000000 -0400
+diff -urN openjdk.orig/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java openjdk/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java
+--- openjdk.orig/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java	1969-12-31 19:00:00.000000000 -0500
++++ openjdk/j2se/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java	2007-10-12 18:24:05.000000000 -0400
 @@ -0,0 +1,199 @@
 +/* CertBundleKeyStoreImpl.java
 +   Copyright (C) 2007  Casey Marshall <csm@gnu.org>
@@ -235,3 +225,14 @@
 +    throw new UnsupportedOperationException("read-only key stores");
 +  }
 +}
+diff -urN openjdk.orig/j2se/src/share/classes/sun/security/provider/SunEntries.java openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java
+--- openjdk.orig/j2se/src/share/classes/sun/security/provider/SunEntries.java	2007-10-12 04:03:24.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/security/provider/SunEntries.java	2007-10-12 18:24:05.000000000 -0400
+@@ -178,6 +178,7 @@
+ 	map.put("KeyStore.JKS", "sun.security.provider.JavaKeyStore$JKS");
+ 	map.put("KeyStore.CaseExactJKS", 
+ 			"sun.security.provider.JavaKeyStore$CaseExactJKS");
++	map.put("KeyStore.CertBundle", "sun.security.provider.CertBundleKeyStoreImpl");
+ 
+ 	/*
+ 	 * Policy
--- a/patches/icedtea-copy-plugs.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-copy-plugs.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,43 +1,7 @@
-diff -urN openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
---- openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2007-05-24 03:41:34.000000000 -0400
-+++ openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2007-06-22 17:06:14.000000000 -0400
-@@ -1154,7 +1154,7 @@
-             Set<BitSet> getterIndexSets = newSet();
-             for (Constructor constr : annotatedConstrList) {
-                 String[] propertyNames =
--                    constr.getAnnotation(propertyNamesClass).value();
-+                    ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
- 
-                 Type[] paramTypes = constr.getGenericParameterTypes();
-                 if (paramTypes.length != propertyNames.length) {
-diff -urN openjdk.orig/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- openjdk.orig/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-05-24 03:41:34.000000000 -0400
-+++ openjdk/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-06-22 17:06:14.000000000 -0400
-@@ -78,6 +78,9 @@
-      */
-     public long            timeStamp ;
- 
-+    // TODO: IcedTea: I am a stub.
-+    static public int trapAuthenticationFailure = 0;
-+
- 
- 
-     /**
-diff -urN openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java openjdk/j2se/src/share/classes/java/beans/MetaData.java
---- openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java	2007-05-24 03:42:31.000000000 -0400
-+++ openjdk/j2se/src/share/classes/java/beans/MetaData.java	2007-06-22 17:06:14.000000000 -0400
-@@ -1565,7 +1565,7 @@
-     }
- 
-     private static String[] getAnnotationValue(Constructor constructor) {
--        ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
-+        ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
-         return (annotation != null)
-                 ? annotation.value()
-                 : null;
---- ../openjdk-b21/openjdk/j2se/make/common/internal/BinaryPlugs.gmk	2007-09-27 22:30:28.000000000 -0400
-+++ openjdk/j2se/make/common/internal/BinaryPlugs.gmk	2007-09-28 11:02:55.000000000 -0400
-@@ -53,8 +53,6 @@
+diff -urN openjdk.orig/j2se/make/common/internal/BinaryPlugs.gmk openjdk/j2se/make/common/internal/BinaryPlugs.gmk
+--- openjdk.orig/j2se/make/common/internal/BinaryPlugs.gmk	2007-10-12 03:54:05.000000000 -0400
++++ openjdk/j2se/make/common/internal/BinaryPlugs.gmk	2007-10-12 17:23:25.000000000 -0400
+@@ -51,8 +51,6 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -46,7 +10,7 @@
  com/sun/jmx/snmp/SnmpOidRecord.class \
  com/sun/jmx/snmp/SnmpOidTable.class \
  com/sun/jmx/snmp/SnmpOidTableSupport.class \
-@@ -64,17 +62,9 @@
+@@ -62,17 +60,9 @@
  com/sun/jmx/snmp/SnmpTimeticks.class \
  com/sun/jmx/snmp/SnmpVarBind.class \
  com/sun/jmx/snmp/SnmpVarBindList.class \
@@ -65,7 +29,7 @@
  
  PLUG_SOUND_CLASS_NAMES = \
  com/sun/media/sound/AbstractPlayer.class \
-@@ -132,9 +122,6 @@
+@@ -130,9 +120,6 @@
  java/awt/color/CMMException.class \
  java/awt/color/ColorSpace.class \
  java/awt/color/ICC_ColorSpace.class \
@@ -75,20 +39,22 @@
  java/awt/color/ICC_Profile.class \
  java/awt/color/ICC_ProfileGray.class \
  java/awt/color/ICC_ProfileRGB.class \
-@@ -179,8 +166,10 @@
- 
- # Class list temp files (used by both import and export of plugs)
+@@ -160,10 +147,12 @@
+ java/awt/image/renderable/RenderableImageProducer.class \
+ java/awt/image/renderable/RenderedImageFactory.class
  
 +PLUG_GNU_CLASS_NAMES = gnu
 +
+ # Class list temp files (used by both import and export of plugs)
+ 
  PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf sound awt dc
-+PLUG_CLASS_AREAS = jmf sound awt dc gnu
+-PLUG_CLASS_AREAS = jmf sound awt
++PLUG_CLASS_AREAS = jmf sound awt gnu
  PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
  
  # Create jargs file command
-@@ -213,6 +202,11 @@
- 	@for i in $(PLUG_DC_CLASS_NAMES) ; do \
+@@ -191,6 +180,11 @@
+ 	@for i in $(PLUG_AWT_CLASS_NAMES) ; do \
  	  $(ECHO) "$$i" >> $@ ; \
  	done
 +$(PLUG_TEMPDIR)/gnu.clist:
@@ -99,16 +65,16 @@
  $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
  	@$(prep-target)
  	$(CAT) $(PLUG_CLISTS) > $@
-@@ -222,6 +216,8 @@
+@@ -200,6 +194,8 @@
  	$(plug-create-jargs)
  $(PLUG_TEMPDIR)/awt.jargs: $(PLUG_TEMPDIR)/awt.clist
  	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
 +	$(plug-create-jargs)
- $(PLUG_TEMPDIR)/dc.jargs: $(PLUG_TEMPDIR)/dc.clist
+ $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
- $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
-@@ -248,9 +244,9 @@
+ 
+@@ -224,9 +220,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -120,23 +86,58 @@
  endef # import-binary-plug-classes
  
  # Import specific area classes (the classes are always created)
-@@ -263,6 +259,8 @@
+@@ -237,13 +233,16 @@
+ 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
+ import-binary-plug-awt-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/awt.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/awt.clist)
- import-binary-plug-dc-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/dc.clist
- 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/dc.clist)
 +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
  
  # Import all classes from the jar file
  
-@@ -270,7 +268,9 @@
+ import-binary-plug-jar: \
  	     import-binary-plug-jmf-classes \
  	     import-binary-plug-sound-classes \
- 	     import-binary-plug-awt-classes \
--	     import-binary-plug-dc-classes 
-+	     import-binary-plug-dc-classes \
-+	     import-binary-plug-dc-classes \
-+	     import-binary-plug-gnu-classes		
+-	     import-binary-plug-awt-classes
++	     import-binary-plug-awt-classes \
++	     import-binary-plug-gnu-classes
  
  # Import native libraries
  
+diff -urN openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
+--- openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2007-10-12 04:01:55.000000000 -0400
++++ openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2007-10-12 17:17:28.000000000 -0400
+@@ -1154,7 +1154,7 @@
+             Set<BitSet> getterIndexSets = newSet();
+             for (Constructor constr : annotatedConstrList) {
+                 String[] propertyNames =
+-                    constr.getAnnotation(propertyNamesClass).value();
++                    ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
+ 
+                 Type[] paramTypes = constr.getGenericParameterTypes();
+                 if (paramTypes.length != propertyNames.length) {
+diff -urN openjdk.orig/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
+--- openjdk.orig/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-10-12 04:01:56.000000000 -0400
++++ openjdk/j2se/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-10-12 17:17:28.000000000 -0400
+@@ -78,6 +78,9 @@
+      */
+     public long            timeStamp ;
+ 
++    // TODO: IcedTea: I am a stub.
++    static public int trapAuthenticationFailure = 0;
++
+ 
+ 
+     /**
+diff -urN openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java openjdk/j2se/src/share/classes/java/beans/MetaData.java
+--- openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java	2007-10-12 04:02:14.000000000 -0400
++++ openjdk/j2se/src/share/classes/java/beans/MetaData.java	2007-10-12 17:17:28.000000000 -0400
+@@ -1565,7 +1565,7 @@
+     }
+ 
+     private static String[] getAnnotationValue(Constructor constructor) {
+-        ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
++        ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
+         return (annotation != null)
+                 ? annotation.value()
+                 : null;
--- a/patches/icedtea-debuginfo.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-debuginfo.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,5 +1,20 @@
---- openjdk/j2se/make/common/Defs-linux.gmk.orig	2007-09-27 08:52:06.000000000 +0100
-+++ openjdk/j2se/make/common/Defs-linux.gmk	2007-10-04 15:04:02.000000000 +0100
+diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-10-12 18:11:59.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-12 18:12:22.000000000 -0400
+@@ -63,6 +63,10 @@
+ CFLAGS += -D_REENTRANT
+ CFLAGS += -fcheck-new
+ 
++# Always generate full debuginfo on Linux.  It'll be in a separate
++# debuginfo package when building RPMs.
++CFLAGS += -g
++
+ ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
+ ARCHFLAG/i486    = -m32 -march=i586
+ ARCHFLAG/amd64   = -m64
+diff -urN openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
+--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-10-12 03:54:05.000000000 -0400
++++ openjdk/j2se/make/common/Defs-linux.gmk	2007-10-12 18:12:22.000000000 -0400
 @@ -155,13 +155,11 @@
     CFLAGS_COMMON   += $(GLOBAL_KPIC) $(GCC_WARNINGS)
  endif
@@ -27,19 +42,9 @@
    endif
  endif
  
---- openjdk/j2se/make/sun/awt/mawt.gmk~	2007-05-24 08:33:23.000000000 +0100
-+++ openjdk/j2se/make/sun/awt/mawt.gmk	2007-06-21 15:25:58.000000000 +0100
-@@ -132,7 +132,7 @@
- #
- 
- 
--#CFLAGS += -g
-+CFLAGS += -g
- ifeq ($(HEADLESS),true)
- CFLAGS += -DHEADLESS=$(HEADLESS)
- CPPFLAGS += -DHEADLESS=$(HEADLESS)
---- openjdk/j2se/make/common/shared/Defs-java.gmk	2007-09-13 03:52:42.000000000 -0400
-+++ openjdk/j2se/make/common/shared/Defs-java.gmk	2007-09-14 10:50:45.000000000 -0400
+diff -urN openjdk.orig/j2se/make/common/shared/Defs-java.gmk openjdk/j2se/make/common/shared/Defs-java.gmk
+--- openjdk.orig/j2se/make/common/shared/Defs-java.gmk	2007-10-12 03:54:05.000000000 -0400
++++ openjdk/j2se/make/common/shared/Defs-java.gmk	2007-10-12 18:12:22.000000000 -0400
 @@ -98,15 +98,9 @@
  #  -- Use JAVAC_CMD if you want to take the defaults given to you.
  #
@@ -59,16 +64,15 @@
  ifeq ($(COMPILER_WARNINGS_FATAL), true)
    JAVACFLAGS  += -Werror
  endif
---- openjdk/hotspot/build/linux/makefiles/gcc.make~	2007-10-03 17:54:11.000000000 +0100
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-03 18:19:33.000000000 +0100
-@@ -63,6 +63,10 @@
- CFLAGS += -D_REENTRANT
- CFLAGS += -fcheck-new
+diff -urN openjdk.orig/j2se/make/sun/awt/mawt.gmk openjdk/j2se/make/sun/awt/mawt.gmk
+--- openjdk.orig/j2se/make/sun/awt/mawt.gmk	2007-10-12 03:54:07.000000000 -0400
++++ openjdk/j2se/make/sun/awt/mawt.gmk	2007-10-12 18:12:22.000000000 -0400
+@@ -129,7 +129,7 @@
+ #
  
-+# Always generate full debuginfo on Linux.  It'll be in a separate
-+# debuginfo package when building RPMs.
+ 
+-#CFLAGS += -g
 +CFLAGS += -g
-+
- ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
- ARCHFLAG/i486    = -m32 -march=i586
- ARCHFLAG/amd64   = -m64
+ ifeq ($(HEADLESS),true)
+ CFLAGS += -DHEADLESS=$(HEADLESS)
+ CPPFLAGS += -DHEADLESS=$(HEADLESS)
--- a/patches/icedtea-license-headers.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-license-headers.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,40 +1,6 @@
---- genExceptions.sh.orig       2007-08-15 14:47:22.000000000 -0400
-+++ openjdk/j2se/make/java/nio/genExceptions.sh 2007-08-15 14:49:01.000000000 -0400
-@@ -42,10 +42,28 @@
-
-   cat >$out <<__END__
- /*
-- * Copyright 2007 by Sun Microsystems, Inc.  All Rights Reserved.
-- * 
-- * This software is the proprietary information of Sun Microsystems, Inc.  
-- * Use is subject to license terms.
-+ * Copyright 2003-2006 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.
-  */
-
- // -- This file was mechanically generated: Do not edit! -- //
---- /notnfs/langel/openjdk/j2se/make/tools/AutoMulti/AutoMulti.java	2007-08-16 03:17:52.000000000 -0400
-+++ openjdk/j2se/make/tools/src/build/tools/automulti/AutoMulti.java	2007-08-27 12:38:38.000000000 -0400
+diff -urN openjdk.orig/j2se/make/tools/src/build/tools/automulti/AutoMulti.java openjdk/j2se/make/tools/src/build/tools/automulti/AutoMulti.java
+--- openjdk.orig/j2se/make/tools/src/build/tools/automulti/AutoMulti.java	2007-10-12 03:54:09.000000000 -0400
++++ openjdk/j2se/make/tools/src/build/tools/automulti/AutoMulti.java	2007-10-12 17:31:18.000000000 -0400
 @@ -99,14 +99,29 @@
       */
      public static StringBuffer createPreamble(String prefixName) {
@@ -73,8 +39,9 @@
          s.append("package " + prefixName + ".swing.plaf.multi;\n");
          s.append("\n");
  	return s;
---- /notnfs/langel/openjdk/j2se/make/tools/AutoMulti/TestALFGenerator.java	2007-08-16 03:17:52.000000000 -0400
-+++ openjdk/j2se/make/tools/src/build/tools/automulti/TestALFGenerator.java	2007-08-27 12:40:00.000000000 -0400
+diff -urN openjdk.orig/j2se/make/tools/src/build/tools/automulti/TestALFGenerator.java openjdk/j2se/make/tools/src/build/tools/automulti/TestALFGenerator.java
+--- openjdk.orig/j2se/make/tools/src/build/tools/automulti/TestALFGenerator.java	2007-10-12 03:54:09.000000000 -0400
++++ openjdk/j2se/make/tools/src/build/tools/automulti/TestALFGenerator.java	2007-10-12 17:31:18.000000000 -0400
 @@ -102,13 +102,28 @@
       */
      public static StringBuffer createPreamble(String prefixName) {
--- a/patches/icedtea-memory-limits.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-memory-limits.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,16 +1,6 @@
---- openjdk/hotspot/src/share/vm/runtime/globals.hpp~	2007-09-27 08:46:16.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2007-10-05 19:06:32.000000000 +0100
-@@ -2612,7 +2612,7 @@
-           "an OS lock")                                                     \
-                                                                             \
-   /* gc parameters */                                                       \
--  product(uintx, MaxHeapSize, ScaleForWordSize(64*M),                       \
-+  product(uintx, MaxHeapSize, ScaleForWordSize(512*M),                       \
-           "Default maximum size for object heap (in bytes)")                \
-                                                                             \
-   product_pd(uintx, NewSize, 						    \
---- openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp~	2007-09-27 08:45:59.000000000 +0100
-+++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp	2007-10-05 19:02:37.000000000 +0100
+diff -urN openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp	2007-10-12 03:45:58.000000000 -0400
++++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp	2007-10-12 17:32:54.000000000 -0400
 @@ -101,7 +101,7 @@
  
  // Heap related flags
@@ -20,3 +10,15 @@
  
  // Ergonomics related flags
  define_pd_global(bool, NeverActAsServerClassMachine, false);
+diff -urN openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp	2007-10-12 03:46:16.000000000 -0400
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2007-10-12 17:32:54.000000000 -0400
+@@ -2615,7 +2615,7 @@
+           "an OS lock")                                                     \
+                                                                             \
+   /* gc parameters */                                                       \
+-  product(uintx, MaxHeapSize, ScaleForWordSize(64*M),                       \
++  product(uintx, MaxHeapSize, ScaleForWordSize(512*M),                       \
+           "Default maximum size for object heap (in bytes)")                \
+                                                                             \
+   product_pd(uintx, NewSize, 						    \
--- a/patches/icedtea-paths.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-paths.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,6 +1,6 @@
 diff -urN openjdk.orig/j2se/src/share/classes/java/awt/BasicStroke.java openjdk/j2se/src/share/classes/java/awt/BasicStroke.java
---- openjdk.orig/j2se/src/share/classes/java/awt/BasicStroke.java	2007-07-05 03:48:32.000000000 -0400
-+++ openjdk/j2se/src/share/classes/java/awt/BasicStroke.java	2007-07-19 13:44:58.000000000 -0400
+--- openjdk.orig/j2se/src/share/classes/java/awt/BasicStroke.java	2007-10-12 04:02:07.000000000 -0400
++++ openjdk/j2se/src/share/classes/java/awt/BasicStroke.java	2007-10-12 17:34:35.000000000 -0400
 @@ -25,6 +25,17 @@
  
  package java.awt;
@@ -521,9 +521,71 @@
 +        }
 +    }
  }
+diff -urN openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java openjdk/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java
+--- openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java	2007-10-12 04:03:11.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java	2007-10-12 17:34:35.000000000 -0400
+@@ -423,6 +423,7 @@
+                 transy = 0;
+             }
+             drawPath(sg2d, p2df, transx, transy);
++/*
+         } else if (sg2d.strokeState < sg2d.STROKE_CUSTOM) {
+             ShapeSpanIterator si = LoopPipe.getStrokeSpans(sg2d, s);
+             try {
+@@ -431,6 +432,7 @@
+                 si.dispose();
+             }
+         } else {
++*/
+             fill(sg2d, sg2d.stroke.createStrokedShape(s));
+         }
+     }
+diff -urN openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/LoopPipe.java openjdk/j2se/src/share/classes/sun/java2d/pipe/LoopPipe.java
+--- openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/LoopPipe.java	2007-10-12 04:03:11.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/java2d/pipe/LoopPipe.java	2007-10-12 17:34:35.000000000 -0400
+@@ -188,7 +188,7 @@
+                                              transX, transY, p2df); 
+             return;
+         }
+-
++/*
+         if (sg2d.strokeState == sg2d.STROKE_CUSTOM) {
+             fill(sg2d, sg2d.stroke.createStrokedShape(s));
+             return;
+@@ -201,6 +201,8 @@
+         } finally {
+             sr.dispose();
+         }
++*/
++        fill(sg2d, sg2d.stroke.createStrokedShape(s));
+     }
+ 
+     /**
+diff -urN openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java openjdk/j2se/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java
+--- openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java	2007-10-12 04:03:11.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java	2007-10-12 17:34:35.000000000 -0400
+@@ -82,6 +82,7 @@
+     }
+ 
+     public void draw(SunGraphics2D sg, Shape s) {
++/*
+ 	if (sg.stroke instanceof BasicStroke) {
+ 	    ShapeSpanIterator sr = LoopPipe.getStrokeSpans(sg, s);
+ 	    try {
+@@ -90,8 +91,9 @@
+ 		sr.dispose();
+ 	    }
+ 	} else {
++*/
+ 	    fill(sg, sg.stroke.createStrokedShape(s));
+-	}
++//	}
+     }
+ 
+     public static final int NON_RECTILINEAR_TRANSFORM_MASK =
 diff -urN openjdk.orig/j2se/src/solaris/classes/sun/java2d/x11/X11Renderer.java openjdk/j2se/src/solaris/classes/sun/java2d/x11/X11Renderer.java
---- openjdk.orig/j2se/src/solaris/classes/sun/java2d/x11/X11Renderer.java	2007-07-20 03:34:01.000000000 -0400
-+++ openjdk/j2se/src/solaris/classes/sun/java2d/x11/X11Renderer.java	2007-07-19 14:42:54.000000000 -0400
+--- openjdk.orig/j2se/src/solaris/classes/sun/java2d/x11/X11Renderer.java	2007-10-12 04:04:01.000000000 -0400
++++ openjdk/j2se/src/solaris/classes/sun/java2d/x11/X11Renderer.java	2007-10-12 17:34:35.000000000 -0400
 @@ -336,6 +336,10 @@
              // Otherwise we will use drawPath() for
              // high-quality thin paths.
@@ -543,80 +605,3 @@
  	} else {
  	    fill(sg2d, sg2d.stroke.createStrokedShape(s));
  	}
-diff -urN openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java openjdk/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java
---- openjdk.orig/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java	2007-07-20 03:33:17.000000000 -0400
-+++ openjdk/j2se/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java	2007-07-19 17:14:36.000000000 -0400
-@@ -423,6 +423,7 @@
-                 transy = 0;
-             }
-             drawPath(sg2d, p2df, transx, transy);
-+/*
-         } else if (sg2d.strokeState < sg2d.STROKE_CUSTOM) {
-             ShapeSpanIterator si = LoopPipe.getStrokeSpans(sg2d, s);
-             try {
-@@ -431,6 +432,7 @@
-                 si.dispose();
-             }
-         } else {
-+*/
-             fill(sg2d, sg2d.stroke.createStrokedShape(s));
-         }
-     }
---- ../openjdk-b20/openjdk/j2se/make/sun/dcpr/Makefile	2007-09-13 03:52:45.000000000 -0400
-+++ openjdk/j2se/make/sun/dcpr/Makefile	2007-09-14 10:33:07.000000000 -0400
-@@ -62,10 +62,13 @@
- # Specific to OpenJDK building
- #
- 
-+FILES_java = \
-+  sun/dc/DuctusRenderingEngine.java
-+
- # Plug lib will be copied instead of compiling.
- USE_BINARY_PLUG_LIBRARY=true
- 
--build: import-binary-plug-dc-classes import-binary-plug-dcpr-library
-+build: import-binary-plug-dc-classes import-binary-plug-dcpr-library classheaders
- 
- include $(BUILDDIR)/common/internal/BinaryPlugs.gmk
- 
---- ../openjdk-b20/openjdk/j2se/src/share/classes/sun/java2d/pipe/LoopPipe.java	2007-09-13 04:11:54.000000000 -0400
-+++ openjdk/j2se/src/share/classes/sun/java2d/pipe/LoopPipe.java	2007-09-14 10:34:49.000000000 -0400
-@@ -188,7 +188,7 @@
-                                              transX, transY, p2df); 
-             return;
-         }
--
-+/*
-         if (sg2d.strokeState == sg2d.STROKE_CUSTOM) {
-             fill(sg2d, sg2d.stroke.createStrokedShape(s));
-             return;
-@@ -201,6 +201,8 @@
-         } finally {
-             sr.dispose();
-         }
-+*/
-+        fill(sg2d, sg2d.stroke.createStrokedShape(s));
-     }
- 
-     /**
---- ../openjdk-b20/openjdk/j2se/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java	2007-09-13 04:11:54.000000000 -0400
-+++ openjdk/j2se/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java	2007-09-14 10:36:50.000000000 -0400
-@@ -82,6 +82,7 @@
-     }
- 
-     public void draw(SunGraphics2D sg, Shape s) {
-+/*
- 	if (sg.stroke instanceof BasicStroke) {
- 	    ShapeSpanIterator sr = LoopPipe.getStrokeSpans(sg, s);
- 	    try {
-@@ -90,8 +91,9 @@
- 		sr.dispose();
- 	    }
- 	} else {
-+*/
- 	    fill(sg, sg.stroke.createStrokedShape(s));
--	}
-+//	}
-     }
- 
-     public static final int NON_RECTILINEAR_TRANSFORM_MASK =
--- a/patches/icedtea-plugin.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-plugin.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,5 +1,17 @@
+diff -urN openjdk.orig/j2se/make/sun/Makefile openjdk/j2se/make/sun/Makefile
+--- openjdk.orig/j2se/make/sun/Makefile	2007-10-12 03:54:06.000000000 -0400
++++ openjdk/j2se/make/sun/Makefile	2007-10-12 17:39:04.000000000 -0400
+@@ -63,6 +63,7 @@
+           $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
+ 	  font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
+ 	  jawt text nio launcher management $(ORG_SUBDIR) \
++	  plugin \
+           native2ascii serialver tools jconsole
+ 
+ all build clean clobber::
+diff -urN openjdk.orig/j2se/make/sun/plugin/Makefile openjdk/j2se/make/sun/plugin/Makefile
 --- openjdk.orig/j2se/make/sun/plugin/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/j2se/make/sun/plugin/Makefile	2007-08-19 23:55:02.000000000 -0400
++++ openjdk/j2se/make/sun/plugin/Makefile	2007-10-12 17:37:54.000000000 -0400
 @@ -0,0 +1,53 @@
 +#
 +# Copyright 1995-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -54,8 +66,9 @@
 +JAVA_ARGS = "{ \"sun.applet.PluginMain\" }"
 +include $(BUILDDIR)/common/Program.gmk
 +
+diff -urN openjdk.orig/j2se/src/share/classes/sun/applet/PluginAppletViewer.java openjdk/j2se/src/share/classes/sun/applet/PluginAppletViewer.java
 --- openjdk.orig/j2se/src/share/classes/sun/applet/PluginAppletViewer.java	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/j2se/src/share/classes/sun/applet/PluginAppletViewer.java	2007-08-19 23:55:02.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/applet/PluginAppletViewer.java	2007-10-12 17:37:54.000000000 -0400
 @@ -0,0 +1,945 @@
 +/*
 + * Copyright 1995-2004 Sun Microsystems, Inc.  All Rights Reserved.
@@ -1002,8 +1015,9 @@
 +	}
 +    }
 +}
+diff -urN openjdk.orig/j2se/src/share/classes/sun/applet/PluginMain.java openjdk/j2se/src/share/classes/sun/applet/PluginMain.java
 --- openjdk.orig/j2se/src/share/classes/sun/applet/PluginMain.java	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/j2se/src/share/classes/sun/applet/PluginMain.java	2007-08-20 00:14:41.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/applet/PluginMain.java	2007-10-12 17:37:54.000000000 -0400
 @@ -0,0 +1,262 @@
 +/*
 + * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
@@ -1267,14 +1281,3 @@
 +	return message;
 +    }
 +}
---- openjdk/j2se/make/sun/Makefile.orig	2007-09-28 15:47:08.000000000 -0400
-+++ openjdk/j2se/make/sun/Makefile	2007-09-28 15:47:23.000000000 -0400
-@@ -60,7 +60,7 @@
- 	  awt splashscreen $(XAWT_SUBDIR) \
- 	  xjc schemagen wsgen wsimport \
-           $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
--	  font jpeg cmm applet corba rmi beans $(JDBC_SUBDIR) \
-+	  font jpeg cmm applet plugin corba rmi beans $(JDBC_SUBDIR) \
- 	  jawt text nio launcher management $(ORG_SUBDIR) \
-           native2ascii serialver tools jconsole
- 
--- a/patches/icedtea-speed.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-speed.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,7 +1,19 @@
+diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-10-12 03:46:25.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-12 17:41:02.000000000 -0400
+@@ -98,7 +98,7 @@
+ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
+ 
+ # The flags to use for an Optimized g++ build
+-OPT_CFLAGS += -O3
++OPT_CFLAGS += -O0 -g
+ 
+ # Hotspot uses very unstrict aliasing turn this optimization off
+ OPT_CFLAGS += -fno-strict-aliasing
 diff -urN openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
---- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-05-24 03:33:20.000000000 -0400
-+++ openjdk/j2se/make/common/Defs-linux.gmk	2007-06-18 16:02:48.000000000 -0400
-@@ -106,6 +106,7 @@
+--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-10-12 03:54:05.000000000 -0400
++++ openjdk/j2se/make/common/Defs-linux.gmk	2007-10-12 17:41:02.000000000 -0400
+@@ -97,6 +97,7 @@
      _OPT = $(CC_LOWER_OPT)
      CPPFLAGS_DBG    += -DLOGGING 
  endif
@@ -10,9 +22,9 @@
  # For all platforms, do not omit the frame pointer register usage. 
  #    We need this frame pointer to make it easy to walk the stacks.
 diff -urN openjdk.orig/j2se/make/Makefile openjdk/j2se/make/Makefile
---- openjdk.orig/j2se/make/Makefile	2007-05-24 03:33:16.000000000 -0400
-+++ openjdk/j2se/make/Makefile	2007-06-18 16:03:40.000000000 -0400
-@@ -245,9 +245,9 @@
+--- openjdk.orig/j2se/make/Makefile	2007-10-12 03:54:03.000000000 -0400
++++ openjdk/j2se/make/Makefile	2007-10-12 17:41:02.000000000 -0400
+@@ -249,9 +249,9 @@
  #
  # Docs
  #
@@ -25,15 +37,3 @@
  
  #
  # Release engineering targets.
-diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-05-24 03:31:18.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-06-18 18:02:39.000000000 -0400
-@@ -96,7 +94,7 @@
- CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
- 
- # The flags to use for an Optimized g++ build
--OPT_CFLAGS += -O3
-+OPT_CFLAGS += -O0 -g
- 
- # Hotspot uses very unstrict aliasing turn this optimization off
- OPT_CFLAGS += -fno-strict-aliasing
--- a/patches/icedtea-use-system-tzdata.patch	Fri Oct 12 12:26:19 2007 -0400
+++ b/patches/icedtea-use-system-tzdata.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -1,6 +1,7 @@
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.keiths	2007-10-03 08:39:51.000000000 -0700
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-10-03 08:41:49.000000000 -0700
-@@ -391,6 +391,10 @@ void os::init_system_properties_values()
+diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2007-10-12 18:25:55.000000000 -0400
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-10-12 18:26:02.000000000 -0400
+@@ -390,6 +390,10 @@
  			       "javax.net.ssl.trustStorePassword",
  			       "");
  
@@ -11,9 +12,10 @@
  #undef malloc
  #undef getenv
  #undef EXTENSIONS_DIR
---- openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java.keiths	2007-10-03 13:42:51.000000000 -0700
-+++ openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-10-03 13:42:57.000000000 -0700
-@@ -30,6 +30,7 @@ import	java.io.FileInputStream;
+diff -urN openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java
+--- openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-10-12 04:03:35.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-10-12 18:26:02.000000000 -0400
+@@ -30,6 +30,7 @@
  import	java.io.FileNotFoundException;
  import	java.io.IOException;
  import	java.lang.ref.SoftReference;
@@ -21,7 +23,7 @@
  import	java.security.AccessController;
  import	java.security.PrivilegedAction;
  import	java.security.PrivilegedActionException;
-@@ -1021,10 +1022,28 @@ public class ZoneInfoFile {
+@@ -1021,10 +1022,28 @@
  	byte[] buffer = null;
  
  	try {
--- a/patches/icedtea-xinerama.patch	Fri Oct 12 12:26:19 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -up openjdk/j2se/make/sun/xawt/Makefile.jx openjdk/j2se/make/sun/xawt/Makefile
---- openjdk/j2se/make/sun/xawt/Makefile.jx	2007-08-30 03:19:44.000000000 -0400
-+++ openjdk/j2se/make/sun/xawt/Makefile	2007-10-03 14:49:11.000000000 -0400
-@@ -49,8 +49,7 @@ AUTO_JAVA_PRUNE = WrapperGenerator.java
- LDFLAGS += -L$(OPENWIN_LIB)
- 
- ifeq ($(PLATFORM), linux)
--FILES_c += Xinerama.c
--LDFLAGS += -lpthread
-+LDFLAGS += -lXinerama -lpthread
- dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
- endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-xjc.patch	Sun Oct 14 23:24:57 2007 -0400
@@ -0,0 +1,10 @@
+--- openjdk/j2se/make/common/Release.gmk.orig	2007-10-14 17:36:38.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-14 17:37:01.000000000 -0400
+@@ -382,7 +382,6 @@
+ 	com/sun/tools/internal/xjc       \
+ 	com/sun/tools/internal/ws       \
+ 	META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \
+-	META-INF/services/com.sun.tools.xjc.Plugin \
+ 	com/sun/istack/internal/tools       \
+ 	com/sun/istack/internal/ws       \
+         com/sun/codemodel       \