--- a/ChangeLog	Wed May 13 10:11:28 2009 -0400
+++ b/ChangeLog	Wed May 13 13:55:55 2009 -0400
@@ -1,3 +1,8 @@
+2009-05-13  Lillian Angel  <langel@redhat.com>
+
+	* patches/icedtea-certbundle.patch: Removed.
+	* patches/icedtea-liveconnect.patch: Removed.
+
 2009-05-13  Lillian Angel  <langel@redhat.com>
 
 	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java

--- a/patches/icedtea-certbundle.patch	Wed May 13 10:11:28 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,240 +0,0 @@
-diff -urN openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java openjdk/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/jdk/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>
-+
-+This file is part of IcedTea.
-+
-+IcedTea is free software; you can redistribute it and/or 
-+modify it under the terms of the GNU General Public License as
-+published by the Free Software Foundation, version 2.
-+
-+IcedTea 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 for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with IcedTea; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+Boston, MA 02110-1301 USA.
-+
-+Linking this library statically or dynamically with other modules is
-+making a combined work based on this library.  Thus, the terms and
-+conditions of the GNU General Public License cover the whole
-+combination.
-+
-+As a special exception, the copyright holders of this library give you
-+permission to link this library with independent modules to produce an
-+executable, regardless of the license terms of these independent
-+modules, and to copy and distribute the resulting executable under
-+terms of your choice, provided that you also meet, for each linked
-+independent module, the terms and conditions of the license of that
-+module.  An independent module is a module which is not derived from
-+or based on this library.  If you modify this library, you may extend
-+this exception to your version of the library, but you are not
-+obligated to do so.  If you do not wish to do so, delete this
-+exception statement from your version.  */
-+
-+
-+package sun.security.provider;
-+
-+import java.io.BufferedReader;
-+import java.io.ByteArrayInputStream;
-+import java.io.ByteArrayOutputStream;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.io.InputStreamReader;
-+import java.io.OutputStream;
-+import java.io.OutputStreamWriter;
-+import java.io.PrintWriter;
-+import java.security.Key;
-+import java.security.KeyStoreException;
-+import java.security.KeyStoreSpi;
-+import java.security.NoSuchAlgorithmException;
-+import java.security.UnrecoverableKeyException;
-+import java.security.cert.Certificate;
-+import java.security.cert.CertificateException;
-+import java.security.cert.CertificateFactory;
-+import java.util.Date;
-+import java.util.Enumeration;
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.Vector;
-+
-+/**
-+ * A key store implementation for "certificate bundle" files, commonly used
-+ * on many free operating systems. Certificate bundles are plain text files
-+ * containing one or more "PEM" encoded X.509 certificates, which comprise
-+ * a list of trusted root certificates.
-+ * 
-+ * This class implements a read-only key store that reads in one or more
-+ * certificate bundles, storing all certificates successfully read. Calling
-+ * load multiple times will add certificates to the store.
-+ * 
-+ * @author Casey Marshall (csm@gnu.org)
-+ */
-+public class CertBundleKeyStoreImpl extends KeyStoreSpi
-+{
-+  private int x = 0;
-+  private Map<String, Certificate> certs = new HashMap<String, Certificate>();
-+
-+  @Override public Enumeration<String> engineAliases()
-+  {
-+    return new Vector<String>(certs.keySet()).elements();
-+  }
-+
-+  @Override public boolean engineContainsAlias(String alias)
-+  {
-+    return certs.containsKey(alias);
-+  }
-+
-+  @Override public void engineDeleteEntry(String alias) throws KeyStoreException
-+  {
-+    certs.remove(alias);
-+  }
-+
-+  @Override public Certificate engineGetCertificate(String alias)
-+  {
-+    return certs.get(alias);
-+  }
-+
-+  @Override public String engineGetCertificateAlias(Certificate cert)
-+  {
-+    for (Map.Entry<String, Certificate> e : certs.entrySet())
-+      {
-+        if (e.getValue().equals(cert))
-+          return e.getKey();
-+      }
-+    return null;
-+  }
-+
-+  @Override public Certificate[] engineGetCertificateChain(String arg0)
-+  {
-+    return null;
-+  }
-+
-+  @Override public Date engineGetCreationDate(String alias)
-+  {
-+    return new Date(0);
-+  }
-+
-+  @Override public Key engineGetKey(String arg0, char[] arg1)
-+    throws NoSuchAlgorithmException, UnrecoverableKeyException
-+  {
-+    return null;
-+  }
-+
-+  @Override public boolean engineIsCertificateEntry(String alias)
-+  {
-+    return certs.containsKey(alias);
-+  }
-+
-+  @Override public boolean engineIsKeyEntry(String arg0)
-+  {
-+    return false;
-+  }
-+
-+  @Override public void engineLoad(InputStream in, char[] arg1)
-+    throws IOException, NoSuchAlgorithmException, CertificateException
-+  {
-+    CertificateFactory cf = CertificateFactory.getInstance("X.509");
-+    ByteArrayOutputStream bout = new ByteArrayOutputStream();
-+    PrintWriter out = new PrintWriter(new OutputStreamWriter(bout));
-+    BufferedReader rin = new BufferedReader(new InputStreamReader(in));
-+    String line;
-+    boolean push = false;
-+    while ((line = rin.readLine()) != null)
-+      {
-+        if (line.equals("-----BEGIN CERTIFICATE-----"))
-+          {
-+            push = true;
-+            out.println(line);
-+          }
-+        else if (push)
-+          {
-+            out.println(line);
-+            if (line.equals("-----END CERTIFICATE-----"))
-+              {
-+                push = false;
-+		out.flush();
-+		byte[] bytes = bout.toByteArray();
-+                Certificate cert = cf.generateCertificate(new ByteArrayInputStream(bytes));
-+                bout.reset();
-+                String alias = "cert-" + (x++);
-+                certs.put(alias, cert);
-+              }
-+          }
-+      }
-+  }
-+
-+  @Override public void engineSetCertificateEntry(String alias, Certificate cert)
-+    throws KeyStoreException
-+  {
-+    certs.put(alias, cert);
-+  }
-+
-+  @Override public void engineSetKeyEntry(String arg0, byte[] arg1,
-+                                          Certificate[] arg2)
-+    throws KeyStoreException
-+  {
-+    throw new KeyStoreException("not supported");
-+  }
-+
-+  @Override public void engineSetKeyEntry(String arg0, Key arg1, char[] arg2,
-+                                          Certificate[] arg3)
-+    throws KeyStoreException
-+  {
-+    throw new KeyStoreException("not supported");
-+  }
-+
-+  @Override public int engineSize()
-+  {
-+    return certs.size();
-+  }
-+
-+  @Override public void engineStore(OutputStream arg0, char[] arg1)
-+    throws IOException, NoSuchAlgorithmException, CertificateException
-+  {
-+    throw new UnsupportedOperationException("read-only key stores");
-+  }
-+}
---- ../opeinjdkb23/openjdk/jdk/src/share/classes/sun/security/provider/SunEntries.java	2007-10-30 04:38:07.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/security/provider/SunEntries.java	2007-11-13 13:13:21.000000000 -0500
-@@ -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
---- openjdkold/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2008-03-26 04:59:04.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2008-05-08 10:49:22.000000000 -0400
-@@ -142,16 +142,21 @@
-             public Void run() throws Exception {
-                 props.put("trustStore", System.getProperty(
-                                 "javax.net.ssl.trustStore"));
--                props.put("javaHome", System.getProperty(
--                                        "java.home"));
-                 props.put("trustStoreType", System.getProperty(
-                                 "javax.net.ssl.trustStoreType",
-                                 KeyStore.getDefaultType()));
-+		props.put("javaHome", System.getProperty(
-+                                        "java.home"));
-                 props.put("trustStoreProvider", System.getProperty(
-                                 "javax.net.ssl.trustStoreProvider", ""));
-                 props.put("trustStorePasswd", System.getProperty(
-                                 "javax.net.ssl.trustStorePassword", ""));
--                return null;
-+                props.put("/etc/pki/tls/certs/ca-bundle.crt", System.getProperty(
-+                                "javax.net.ssl.trustStore"));
-+		props.put("CertBundle", System.getProperty(
-+                                "javax.net.ssl.trustStoreType",
-+                                KeyStore.getDefaultType()));
-+	        return null;
-             }
-         });
- 

--- a/patches/icedtea-liveconnect.patch	Wed May 13 10:11:28 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-diff -urN openjdk.orig/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile
---- openjdk.orig/jdk/make/sun/Makefile	2008-07-10 15:54:44.000000000 -0400
-+++ openjdk/jdk/make/sun/Makefile	2008-09-18 14:28:41.000000000 -0400
-@@ -66,6 +66,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/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
-@@ -0,0 +1,53 @@
-+#
-+# Copyright 1995-2005 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 pluginappletviewer wrapper.
-+#
-+
-+BUILDDIR = ../..
-+PACKAGE = sun.applet
-+PRODUCT = sun
-+PROGRAM = pluginappletviewer
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+#
-+# Files to compile.
-+#
-+AUTO_FILES_JAVA_DIRS = sun/applet
-+
-+ifneq ($(PLATFORM), windows)
-+  #
-+  # Anything with a GUI needs X11 to be linked in.
-+  #
-+  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 
-+endif # PLATFORM
-+
-+#
-+# Rules
-+#
-+JAVA_ARGS = "{ \"sun.applet.PluginMain\" }"
-+include $(BUILDDIR)/common/Program.gmk
-+