fix compile when libnet is installed in STAGING_DIR

1 files changed, 224 insertions, 72 deletions

diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index e6458febe..cc6d69dbd 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,6 +1,6 @@
 diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
 --- icedtea-2.3.9.orig/Makefile.in	2013-04-21 22:48:31.000000000 +0200
-+++ icedtea-2.3.9/Makefile.in	2013-05-13 17:36:09.000000000 +0200
++++ icedtea-2.3.9/Makefile.in	2013-07-18 16:10:01.000000000 +0200
 @@ -90,7 +90,6 @@
  @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
  @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
@@ -29,11 +29,11 @@ diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
  
 diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk.patch
 --- icedtea-2.3.9.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.9/patches/openadk.patch	2013-05-13 17:42:47.000000000 +0200
-@@ -0,0 +1,330 @@
++++ icedtea-2.3.9/patches/openadk.patch	2013-07-18 16:25:18.000000000 +0200
+@@ -0,0 +1,482 @@
 +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-01-14 23:25:00.000000000 +0100
-++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-02-18 10:18:27.000000000 +0100
++--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-03-15 17:33:37.000000000 +0100
+++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-07-18 16:17:07.000000000 +0200
 +@@ -115,7 +115,6 @@
 + # include <string.h>
 + # include <syscall.h>
@@ -89,8 +89,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 + void os::pause() {
 +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-01-14 23:25:00.000000000 +0100
-++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-03-15 17:33:37.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-07-18 16:17:07.000000000 +0200
 +@@ -253,7 +253,7 @@
 + #elif defined(__APPLE__)
 + inline int g_isnan(double f) { return isnan(f); }
@@ -101,8 +101,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + #else
 + #error "missing platform-specific definition here"
 +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
-+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2013-07-18 16:17:07.000000000 +0200
 +@@ -80,7 +80,7 @@
 +     LDDFLAGS += $(ZIPOBJS)
 +   endif
@@ -112,9 +112,21 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +   OTHER_LDLIBS += $(JVMLIB)
 + endif
 + 
++diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
++--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2013-07-18 16:24:59.000000000 +0200
++@@ -64,7 +64,7 @@
++ COMPILER_WARNINGS_FATAL=true
++ endif
++ #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
++-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
+++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
++ endif
++ ifeq ($(PLATFORM), solaris)
++ #LIBSCTP = -lsctp
 +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
-+--- openjdk.orig/jdk/make/common/Defs.gmk	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/common/Defs.gmk	2013-02-18 10:22:13.000000000 +0100
++--- openjdk.orig/jdk/make/common/Defs.gmk	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/common/Defs.gmk	2013-07-18 16:17:07.000000000 +0200
 +@@ -204,7 +204,7 @@
 +       ifeq ($(PLATFORM), macosx)
 +         FREETYPE_HEADERS_PATH = /usr/X11R6/include
@@ -125,8 +137,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +     endif
 +   endif
 +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/common/shared/Platform.gmk	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/common/shared/Platform.gmk	2013-07-18 16:17:07.000000000 +0200
 +@@ -160,9 +160,6 @@
 +   else
 +     mach := $(shell uname -m)
@@ -138,8 +150,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +                 i[3-9]86) \
 +                     echo i586 \
 +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
-+--- openjdk.orig/jdk/make/java/instrument/Makefile	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/java/instrument/Makefile	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/make/java/instrument/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/java/instrument/Makefile	2013-07-18 16:17:07.000000000 +0200
 +@@ -140,6 +140,8 @@
 + # We don't want to link against -ljava
 + JAVALIB=
@@ -149,9 +161,30 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + #
 + # Add to ambient vpath so we pick up the library files
 + #
++diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
++--- openjdk.orig/jdk/make/java/net/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/java/net/Makefile	2013-07-18 16:17:53.000000000 +0200
++@@ -25,7 +25,7 @@
++ 
++ BUILDDIR = ../..
++ PACKAGE = java.net
++-LIBRARY = net
+++LIBRARY = javanet
++ PRODUCT = sun
++ include $(BUILDDIR)/common/Defs.gmk
++ 
 +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
-+--- openjdk.orig/jdk/make/java/nio/Makefile	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/java/nio/Makefile	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/make/java/nio/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/java/nio/Makefile	2013-07-18 16:24:27.000000000 +0200
++@@ -369,7 +369,7 @@
++ endif
++ 
++ ifeq ($(PLATFORM), linux)
++-  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
+++  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL)
++   ifdef USE_SYSTEM_GIO
++     OTHER_LDLIBS += $(GIO_LIBS)
++     OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
 +@@ -923,7 +923,7 @@
 + 
 + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
@@ -161,7 +194,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 	   -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
 + 
 + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
-+@@ -959,7 +963,7 @@
++@@ -959,7 +959,7 @@
 + 
 + $(GENUC_EXE) : $(GENUC_SRC)
 + 	$(prep-target)
@@ -171,8 +204,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
 + $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
 +diff -Nur openjdk.orig/jdk/make/java/npt/Makefile openjdk/jdk/make/java/npt/Makefile
-+--- openjdk.orig/jdk/make/java/npt/Makefile	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/java/npt/Makefile	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/make/java/npt/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/java/npt/Makefile	2013-07-18 16:17:07.000000000 +0200
 +@@ -64,6 +64,8 @@
 + # We don't want to link against -ljava
 + JAVALIB=
@@ -183,8 +216,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + ifeq ($(PLATFORM), windows)
 +   OTHER_LCF += -export:nptInitialize -export:nptTerminate
 +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
-+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-02-18 10:42:16.000000000 +0100
++--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-07-18 16:17:07.000000000 +0200
 +@@ -151,22 +151,6 @@
 + #endif
 + 
@@ -242,8 +275,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + ifeq ($(PLATFORM), macosx))
 +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
 +diff -Nur openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
-+--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/make/sun/splashscreen/Makefile	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/sun/splashscreen/Makefile	2013-07-18 16:17:07.000000000 +0200
 +@@ -55,6 +55,8 @@
 + 
 + JAVALIB=
@@ -253,9 +286,158 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + #
 + # C Flags
 + #
++diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
++--- openjdk.orig/jdk/make/sun/xawt/Makefile	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/make/sun/xawt/Makefile	2013-07-18 16:17:07.000000000 +0200
++@@ -292,16 +292,10 @@
++ SIZERS = $(SIZER).32
++ SIZERS_C = $(SIZER_32_C)
++ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
++-ifdef CROSS_COMPILE_ARCH
++-CFLAGS_32 = -m32
++-endif
++ else # !32
++ SIZERS = $(SIZER).64
++ SIZERS_C = $(SIZER_64_C)
++ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
++-ifdef CROSS_COMPILE_ARCH
++-CFLAGS_64 = -m64
++-endif
++ endif # 32
++ endif # !macosx
++ endif # solaris
++@@ -337,11 +331,7 @@
++ WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
++ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
++ 
++-ifndef CROSS_COMPILE_ARCH
++-SIZERS_CC = $(CC)
++-else
++-SIZERS_CC = $(HOST_CC)
++-endif
+++SIZERS_CC = $(CC) -static
++ 
++ $(SIZERS): $(SIZERS_C) 
++ 	$(prep-target)
++@@ -364,7 +354,7 @@
++ 	    $(CHMOD) +w $@;\
++ 	else	\
++ 	    $(ECHO) GENERATING $@; \
++-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
+++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
++ 	fi
++ 	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
++ 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
++diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-07-18 16:18:23.000000000 +0200
++@@ -69,7 +69,7 @@
++      */
++     static {
++         java.security.AccessController.doPrivileged(
++-                  new sun.security.action.LoadLibraryAction("net"));
+++                  new sun.security.action.LoadLibraryAction("javanet"));
++     }
++ 
++     /**
++diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-07-18 16:18:54.000000000 +0200
++@@ -78,7 +78,7 @@
++      */
++     static {
++         java.security.AccessController.doPrivileged(
++-                  new sun.security.action.LoadLibraryAction("net"));
+++                  new sun.security.action.LoadLibraryAction("javanet"));
++     }
++ 
++     /**
++diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
++--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2013-07-18 16:19:15.000000000 +0200
++@@ -47,7 +47,7 @@
++      */
++     static {
++         java.security.AccessController.doPrivileged(
++-                  new sun.security.action.LoadLibraryAction("net"));
+++                  new sun.security.action.LoadLibraryAction("javanet"));
++         init();
++     }
++ 
++diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
++--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2013-07-18 16:20:11.000000000 +0200
++@@ -260,7 +260,7 @@
++     static {
++         preferIPv6Address = java.security.AccessController.doPrivileged(
++             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
++-        AccessController.doPrivileged(new LoadLibraryAction("net"));
+++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
++         init();
++     }
++ 
++diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
++--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2013-07-18 16:20:27.000000000 +0200
++@@ -53,7 +53,7 @@
++     private static final int defaultIndex; /* index of defaultInterface */
++ 
++     static {
++-        AccessController.doPrivileged(new LoadLibraryAction("net"));
+++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
++         init();
++         defaultInterface = DefaultInterface.getDefault();
++         if (defaultInterface != null) {
++diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
++--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-07-18 16:22:51.000000000 +0200
++@@ -76,6 +76,6 @@
++ 
++     static {
++         AccessController.doPrivileged(
++-            new sun.security.action.LoadLibraryAction("net"));
+++            new sun.security.action.LoadLibraryAction("javanet"));
++     }
++ }
++diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
++--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-07-18 16:20:51.000000000 +0200
++@@ -95,7 +95,7 @@
++                 }});
++         if (b != null && b.booleanValue()) {
++             java.security.AccessController.doPrivileged(
++-                      new sun.security.action.LoadLibraryAction("net"));
+++                      new sun.security.action.LoadLibraryAction("javanet"));
++             hasSystemProxies = init();
++         }
++     }
++diff -Nur openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
++--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2013-07-18 16:21:22.000000000 +0200
++@@ -483,7 +483,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
++diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
++--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-07-18 16:23:37.000000000 +0200
++@@ -247,7 +247,7 @@
++ 
++     static {
++         java.security.AccessController.doPrivileged(
++-            new sun.security.action.LoadLibraryAction("net"));
+++            new sun.security.action.LoadLibraryAction("javanet"));
++     }
++ 
++ }
 +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
-+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-07-18 16:17:07.000000000 +0200
 +@@ -246,7 +246,8 @@
 +     if (wcs == NULL)
 +         return NULL;
@@ -267,8 +449,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +     mbs = (char *) malloc(n * sizeof(char));
 +     if (mbs == NULL) {
 +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
-+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-01-14 23:25:02.000000000 +0100
-++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-07-18 16:17:07.000000000 +0200
 +@@ -27,9 +27,6 @@
 + #include <X11/Xutil.h>
 + #include <X11/Xos.h>
@@ -305,9 +487,21 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 + Window get_xawt_root_shell(JNIEnv *env) {
 +   static jclass classXRootWindow = NULL;
++diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
++--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-04-16 00:41:13.000000000 +0200
+++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-07-18 16:23:50.000000000 +0200
++@@ -159,7 +159,7 @@
++ 
++     static {
++         java.security.AccessController.doPrivileged(
++-            new sun.security.action.LoadLibraryAction("net"));
+++            new sun.security.action.LoadLibraryAction("javanet"));
++         init0();
++ 
++         // start the address listener thread
 +diff -Nur openjdk.orig/Makefile openjdk/Makefile
-+--- openjdk.orig/Makefile	2013-01-14 23:24:55.000000000 +0100
-++++ openjdk/Makefile	2013-02-18 10:18:28.000000000 +0100
++--- openjdk.orig/Makefile	2013-03-08 17:04:19.000000000 +0100
+++++ openjdk/Makefile	2013-07-18 16:17:07.000000000 +0200
 +@@ -53,9 +53,7 @@
 + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
 + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
@@ -319,45 +513,3 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 + ifndef JDK_TOPDIR
 +   JDK_TOPDIR=$(TOPDIR)/jdk
-+diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
-+--- openjdk.orig/jdk/make/sun/xawt/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/sun/xawt/Makefile	2013-05-13 17:42:21.000000000 +0200
-+@@ -292,16 +292,10 @@
-+ SIZERS = $(SIZER).32
-+ SIZERS_C = $(SIZER_32_C)
-+ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-+-ifdef CROSS_COMPILE_ARCH
-+-CFLAGS_32 = -m32
-+-endif
-+ else # !32
-+ SIZERS = $(SIZER).64
-+ SIZERS_C = $(SIZER_64_C)
-+ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
-+-ifdef CROSS_COMPILE_ARCH
-+-CFLAGS_64 = -m64
-+-endif
-+ endif # 32
-+ endif # !macosx
-+ endif # solaris
-+@@ -337,11 +331,7 @@
-+ WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
-+ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
-+ 
-+-ifndef CROSS_COMPILE_ARCH
-+-SIZERS_CC = $(CC)
-+-else
-+-SIZERS_CC = $(HOST_CC)
-+-endif
-++SIZERS_CC = $(CC) -static
-+ 
-+ $(SIZERS): $(SIZERS_C) 
-+ 	$(prep-target)
-+@@ -364,7 +354,7 @@
-+ 	    $(CHMOD) +w $@;\
-+ 	else	\
-+ 	    $(ECHO) GENERATING $@; \
-+-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
-++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
-+ 	fi
-+ 	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
-+ 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \