- Update to b19 promoted build. [1]

- Merge two additional patches from the OpenJDK BSD porting project:

http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/f974aefae43d
http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/62dc2d00133f

- Add a message to note fdescfs(5) is necessary for this implementation.

PR:		ports/145806 [1]
Discussed with:	glewis, lev

1 files changed, 10 insertions, 10 deletions

diff --git a/java/openjdk6/files/patch-test b/java/openjdk6/files/patch-test
index 6373ad5e0e2b..39c165ded6d3 100644
--- a/java/openjdk6/files/patch-test
+++ b/java/openjdk6/files/patch-test
@@ -1,4 +1,4 @@
---- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java.orig	2010-01-18 12:03:26.000000000 +0100
+--- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2010-01-18 12:03:26.000000000 +0100
 +++ jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2010-01-18 12:03:42.000000000 +0100
 @@ -40,7 +40,7 @@
          InetAddress bogus = InetAddress.getByName("0.0.0.0");
@@ -9,7 +9,7 @@
  
          //Test1: connect only
          sc.connect(saddr);
---- jdk/test/java/nio/channels/SocketChannel/Shutdown.java.orig	2010-01-18 12:04:09.000000000 +0100
+--- jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2010-01-18 12:04:09.000000000 +0100
 +++ jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2010-01-18 12:04:20.000000000 +0100
 @@ -35,7 +35,7 @@
  
@@ -20,7 +20,7 @@
          SocketChannel sc = SocketChannel.open(sa);
          boolean before = sc.socket().isInputShutdown();
          sc.socket().shutdownInput();
---- jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh.orig	2010-01-18 12:04:54.000000000 +0100
+--- jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2010-01-18 12:04:54.000000000 +0100
 +++ jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2010-01-18 12:05:15.000000000 +0100
 @@ -33,7 +33,7 @@
  
@@ -31,7 +31,7 @@
  
  # fail gracefully if DNS is not configured or there 
  # isn't a CNAME record.
---- jdk/test/TestEnv.java.orig	2010-01-18 12:05:45.000000000 +0100
+--- jdk/test/TestEnv.java	2010-01-18 12:05:45.000000000 +0100
 +++ jdk/test/TestEnv.java	2010-01-18 12:06:40.000000000 +0100
 @@ -65,14 +65,14 @@
          // Reachable host with the following services running:
@@ -51,7 +51,7 @@
  
          // Hostname that cannot be resolved by named service
          { "unresovable_host", "blah-blah.blah-blah.blah" },
---- jdk/test/java/io/File/GetXSpace.java.orig	2010-01-20 14:12:07.000000000 +0100
+--- jdk/test/java/io/File/GetXSpace.java	2010-01-20 14:12:07.000000000 +0100
 +++ jdk/test/java/io/File/GetXSpace.java	2010-01-20 14:12:25.000000000 +0100
 @@ -49,7 +49,7 @@
      private static final String name = System.getProperty("os.name");
@@ -62,7 +62,7 @@
              // FileSystem Total Used Available Use% MountedOn
              dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)";
          } else if (name.startsWith("Windows")) {
---- jdk/test/tools/pack200/MemoryAllocatorTest.java.orig	2010-01-20 14:47:29.000000000 +0100
+--- jdk/test/tools/pack200/MemoryAllocatorTest.java	2010-01-20 14:47:29.000000000 +0100
 +++ jdk/test/tools/pack200/MemoryAllocatorTest.java	2010-01-20 14:48:02.000000000 +0100
 @@ -81,6 +81,7 @@
  
@@ -81,7 +81,7 @@
              System.out.println("Warning: Windows/Linux 64bit tests passes vacuously");
              return;
          }
---- jdk/test/tools/pack200/Pack200Simple.sh.orig	2010-01-20 14:48:44.000000000 +0100
+--- jdk/test/tools/pack200/Pack200Simple.sh	2010-01-20 14:48:44.000000000 +0100
 +++ jdk/test/tools/pack200/Pack200Simple.sh	2010-01-20 14:50:05.000000000 +0100
 @@ -134,7 +134,7 @@
    # A quick crc compare test to ensure a well formed zip
@@ -92,7 +92,7 @@
    if [ $? != 0 ]; then
      errorOut "$jfName unzip -t test failed"
    fi
---- jdk/test/java/lang/ProcessBuilder/Zombies.java.orig	2010-01-20 15:54:25.000000000 +0100
+--- jdk/test/java/lang/ProcessBuilder/Zombies.java	2010-01-20 15:54:25.000000000 +0100
 +++ jdk/test/java/lang/ProcessBuilder/Zombies.java	2010-01-20 15:54:41.000000000 +0100
 @@ -49,11 +49,11 @@
          } catch (IOException _) {/* OK */}
@@ -108,7 +108,7 @@
  
          // Count all the zombies that are children of this Java process
          final String[] zombieCounter = {
---- jdk/test/java/lang/ProcessBuilder/Basic.java.orig	2010-01-20 16:02:00.000000000 +0100
+--- jdk/test/java/lang/ProcessBuilder/Basic.java	2010-01-20 16:02:00.000000000 +0100
 +++ jdk/test/java/lang/ProcessBuilder/Basic.java	2010-01-20 16:05:07.000000000 +0100
 @@ -1096,7 +1096,7 @@
              String[] cmdp = childArgs.toArray(new String[childArgs.size()]);
@@ -119,7 +119,7 @@
              equal(commandOutput(p), expected);
              if (Windows.is()) {
                  ProcessBuilder pb = new ProcessBuilder(childArgs);
---- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.orig	2010-01-20 16:17:05.000000000 +0100
+--- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	2010-01-20 16:17:05.000000000 +0100
 +++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	2010-01-20 16:19:55.000000000 +0100
 @@ -79,7 +79,7 @@
          System.out.println("Test passed.");