--- a/ChangeLog	Tue Dec 02 19:20:50 2008 +0100
+++ b/ChangeLog	Wed Dec 03 00:45:09 2008 +0100
@@ -1,3 +1,12 @@
+2008-12-02  Mark Wielaard  <mark@klomp.org>
+
+	* overlays/openjdk/jdk/test/closed/sun/security/rsa/keystore.bad,
+	overlays/openjdk/jdk/test/closed/sun/security/rsa/keystore.good:
+	New keystore files.
+	* patches/icedtea-6497740.patch: Remove binary file diffs.
+	* patches/icedtea-6721753.patch: Remove @key closed-security.
+	* patches/icedtea-6733959.patch: Add @build ZipMeUp.
+
 2008-12-02  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am (stamps/extract.stamp): Fix extraction of

Binary file overlays/openjdk/jdk/test/closed/sun/security/rsa/keystore.bad has changed

Binary file overlays/openjdk/jdk/test/closed/sun/security/rsa/keystore.good has changed

--- a/patches/icedtea-6497740.patch	Tue Dec 02 19:20:50 2008 +0100
+++ b/patches/icedtea-6497740.patch	Wed Dec 03 00:45:09 2008 +0100
@@ -1546,8 +1546,6 @@
 +        }
 +    }
 +}
-Binary files /tmp/dnlaqOr and new/test/closed/sun/security/rsa/keystore.bad differ
-Binary files /tmp/dxQaGis and new/test/closed/sun/security/rsa/keystore.good differ
 --- /dev/null	Fri Aug 22 18:59:31 2008
 +++ openjdk/jdk/test/closed/sun/security/rsa/sunpkcs11-solaris_enableSHA1withRSAsig.cfg	Fri Aug 22 18:59:29 2008
 @@ -0,0 +1,36 @@

--- a/patches/icedtea-6721753.patch	Tue Dec 02 19:20:50 2008 +0100
+++ b/patches/icedtea-6721753.patch	Wed Dec 03 00:45:09 2008 +0100
@@ -88,10 +88,9 @@
      /**
 --- /dev/null	Thu Oct  9 16:12:28 2008
 +++ openjdk/jdk/test/closed/java/io/File/createTempFile/GuessNext.java	Thu Oct  9 16:12:25 2008
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,25 @@
 +/* @test
 + * @bug 6721753
-+ * @key closed-security
 + * @summary Test that temporary files don't use incrementing counter
 + */
 +

--- a/patches/icedtea-6733959.patch	Tue Dec 02 19:20:50 2008 +0100
+++ b/patches/icedtea-6733959.patch	Wed Dec 03 00:45:09 2008 +0100
@@ -112,6 +112,14 @@
 +}
 --- MultipleJRE.sh	2008-11-21 14:18:54.000000000 -0500
 +++ openjdk/jdk/test/tools/launcher/MultipleJRE.sh	2008-11-21 14:23:48.000000000 -0500
+@@ -2,6 +2,7 @@
+ # @bug 4811102 4953711 4955505 4956301 4991229 4998210 5018605 6387069
+ # @build PrintVersion
+ # @build UglyPrintVersion
++# @build ZipMeUp
+ # @run shell MultipleJRE.sh
+ # @summary Verify Multiple JRE version support
+ # @author Joseph E. Kowalski
 @@ -48,10 +48,23 @@
    exit 1
  fi

--- a/patches/icedtea-version.patch	Tue Dec 02 19:20:50 2008 +0100
+++ b/patches/icedtea-version.patch	Wed Dec 03 00:45:09 2008 +0100
@@ -26,3 +26,34 @@
  endif
  
  ifdef BUILD_NUMBER
+--- openjdk.orig/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	2008-11-05 10:27:27.000000000 +0100
++++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	2008-11-24 21:47:38.000000000 +0100
+@@ -138,7 +138,15 @@
+         tableHeaderEnd();
+         Iterator it = usingPackageToUsedClasses.keySet().iterator();
+         while (it.hasNext()) {
+-            PackageDoc pkg = configuration.root.packageNamed((String)it.next());
++	    String pkgstr = (String)it.next();
++            PackageDoc pkg = configuration.root.packageNamed(pkgstr);
++	    if (pkg == null)
++		{
++			System.err.println("null package returned for '"
++					   + pkgstr + "', which uses package '"
++					   + Util.getPackageName(pkgdoc)
++					   + "'");
++		}
+             generatePackageUse(pkg);
+         }
+         tableEnd();
+@@ -195,7 +203,10 @@
+         trBgcolorStyle("white", "TableRowColor");
+         summaryRow(0);
+         //Just want an anchor here.
+-        printHyperLink("", pkg.name(), Util.getPackageName(pkg), true);
++        if (pkg != null)
++	  printHyperLink("", pkg.name(), Util.getPackageName(pkg), true);
++	else
++          printHyperLink("WHOA!", "PKG IS NULL", Util.getPackageName(pkg), true);
+         summaryRowEnd();
+         summaryRow(0);
+         if (pkg != null) {