--- a/ChangeLog	Tue Jan 12 01:23:12 2010 +0000
+++ b/ChangeLog	Sat Jan 16 04:25:58 2010 +0000
@@ -1,3 +1,15 @@
+2010-01-16 Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-liveconnect.patch:
+	Don't quote JAVA_ARGS twice.
+	(6888709: Change use of -DX=\""Y\"" to
+	-DX='"Y"', consistently for all platforms)
+	http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/93c580ce5e88
+	* patches/icedtea-override.patch:
+	Remove @Override on interface methods
+	in OCSPResponse.java
+	http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c33ca6c539bf
+	
 2010-01-11 Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/icedtea-libraries.patch:

--- a/patches/icedtea-liveconnect.patch	Tue Jan 12 01:23:12 2010 +0000
+++ b/patches/icedtea-liveconnect.patch	Sat Jan 16 04:25:58 2010 +0000
@@ -9,83 +9,6 @@
            native2ascii serialver tools jconsole
  
  all build clean clobber::
-diff -urN openjdk.orig/jdk/make/sun/Makefile.orig openjdk/jdk/make/sun/Makefile.orig
---- openjdk.orig/jdk/make/sun/Makefile.orig	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/jdk/make/sun/Makefile.orig	2008-09-18 14:28:41.000000000 -0400
-@@ -0,0 +1,73 @@
-+#
-+# Copyright 1995-2007 Sun Microsystems, Inc.  All Rights Reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation.  Sun designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Sun in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+# CA 95054 USA or visit www.sun.com if you need additional information or
-+# have any questions.
-+#
-+
-+#
-+# Makefile for building all of sun tools
-+#
-+
-+BUILDDIR = ..
-+PRODUCT  = sun
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+# Rhino/Mozilla java sources
-+ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
-+ifneq ("$(ORG_EXISTS)", "")
-+  ORG_SUBDIR = org
-+endif
-+
-+# Non windows subdirs
-+ifneq ($(PLATFORM), windows)
-+  ifndef OPENJDK
-+    ifeq ($(PLATFORM), solaris)
-+      ifneq ($(ARCH), amd64)
-+        DGA_SUBDIR = jdga
-+      endif
-+    endif
-+  endif
-+  ifeq ($(MOTIF_REQUIRED), true)
-+    MOTIF_SUBDIRS   = motif12 motif21
-+  endif
-+  HEADLESS_SUBDIR = headless
-+  XAWT_SUBDIR     = xawt
-+endif
-+
-+ifndef OPENJDK
-+  JDBC_SUBDIR = jdbc
-+endif
-+ifdef OPENJDK
-+  RENDER_SUBDIR = pisces
-+else
-+  RENDER_SUBDIR = dcpr
-+endif
-+SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
-+	  awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
-+          $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
-+	  font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
-+	  jawt text nio launcher management $(ORG_SUBDIR) \
-+          native2ascii serialver tools jconsole
-+
-+all build clean clobber::
-+	$(SUBDIRS-loop)
-+
 diff -urN openjdk.orig/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile
 --- openjdk.orig/jdk/make/sun/plugin/Makefile	1969-12-31 19:00:00.000000000 -0500
 +++ openjdk/jdk/make/sun/plugin/Makefile	2008-09-18 14:28:41.000000000 -0400
@@ -140,7 +63,7 @@
 +#
 +# Rules
 +#
-+JAVA_ARGS = "{ \"sun.applet.PluginMain\" }"
++JAVA_ARGS = { "sun.applet.PluginMain" }
 +include $(BUILDDIR)/common/Program.gmk
 +
 --- openjdk/jdk/make/docs/NON_CORE_PKGS.gmk.orig	2009-06-10 17:48:57.000000000 -0400

--- a/patches/icedtea-override.patch	Tue Jan 12 01:23:12 2010 +0000
+++ b/patches/icedtea-override.patch	Sat Jan 16 04:25:58 2010 +0000
@@ -170,3 +170,29 @@
          public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
              Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
  
+diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	2010-01-16 03:11:22.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	2010-01-16 03:11:57.000000000 +0000
+@@ -572,7 +572,7 @@
+         /*
+          * Return the certificate's revocation status code
+          */
+-        @Override public CertStatus getCertStatus() {
++        public CertStatus getCertStatus() {
+             return certStatus;
+         }
+ 
+@@ -580,11 +580,11 @@
+             return certId;
+         }
+ 
+-        @Override public Date getRevocationTime() {
++        public Date getRevocationTime() {
+             return (Date) revocationTime.clone();
+         }
+ 
+-        @Override public Reason getRevocationReason() {
++        public Reason getRevocationReason() {
+             return revocationReason;
+         }
+