openadk/package/openjdk/patches/rename-libnet.patch

https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-libnet-renaming.patch?revision=864&view=markup&pathrev=867
--- w-openjdk-6.orig/openjdk-6/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/make/java/net/Makefile	2011-09-02 16:20:55.597991415 +0200
@@ -25,7 +25,7 @@
 
 BUILDDIR = ../..
 PACKAGE = java.net
-LIBRARY = net
+LIBRARY = javanet
 PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
--- w-openjdk-6.orig/openjdk-6/jdk/make/java/nio/Makefile	2011-02-28 17:06:11.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/make/java/nio/Makefile	2011-09-02 16:21:37.817990454 +0200
@@ -135,11 +135,11 @@
 endif
 ifeq ($(PLATFORM), linux)
 COMPILER_WARNINGS_FATAL=true
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
 endif
 ifeq ($(PLATFORM), solaris)
 OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
-		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
+		-L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
 endif # PLATFORM
 
 #
--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-09-02 16:22:26.507995127 +0200
@@ -59,7 +59,7 @@
      */
     static {
         java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("net"));
+                  new sun.security.action.LoadLibraryAction("javanet"));
     }
 
     /**
--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-09-02 16:22:58.041740544 +0200
@@ -79,7 +79,7 @@
      */
     static {
         java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("net"));
+                  new sun.security.action.LoadLibraryAction("javanet"));
     }
 
     /**
--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-02-28 17:06:22.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-09-02 16:23:20.197991292 +0200
@@ -47,7 +47,7 @@
      */
     static {
         java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("net"));
+                  new sun.security.action.LoadLibraryAction("javanet"));
         init();
     }
 
--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-02-28 17:06:22.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-09-02 16:23:57.670490341 +0200
@@ -231,7 +231,7 @@
     static {
         preferIPv6Address = java.security.AccessController.doPrivileged(
             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
-        AccessController.doPrivileged(new LoadLibraryAction("net"));
+        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
         init();
     }
 
--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-02-28 17:06:22.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-09-02 16:24:13.879239438 +0200
@@ -52,7 +52,7 @@
     private boolean virtual = false;
 
     static {
-        AccessController.doPrivileged(new LoadLibraryAction("net"));
+        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
         init();
     }
 
--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-02-28 17:06:34.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-09-02 16:24:50.877990409 +0200
@@ -89,7 +89,7 @@
                 }});
         if (b != null && b.booleanValue()) {
             java.security.AccessController.doPrivileged(
-                      new sun.security.action.LoadLibraryAction("net"));
+                      new sun.security.action.LoadLibraryAction("javanet"));
             hasSystemProxies = init();
         }
     }
--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-02-28 17:06:35.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-09-02 16:25:45.749240462 +0200
@@ -354,7 +354,7 @@
                 return;
             loaded = true;
             java.security.AccessController
-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
+                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
             java.security.AccessController
                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
             // IOUtil must be initialized; Its native methods are called from
--- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:48.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:26:36.017990742 +0200
@@ -244,7 +244,7 @@
 
     static {
         java.security.AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("net"));
+            new sun.security.action.LoadLibraryAction("javanet"));
     }
 
 }
--- w-openjdk-6.orig/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:51.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:27:07.069240501 +0200
@@ -160,7 +160,7 @@
 
     static {
         java.security.AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("net"));
+            new sun.security.action.LoadLibraryAction("javanet"));
         init0();
 
         // start the address listener thread