main/openjdk7: upgrade to icedtea 2.5.0

1 files changed, 51 insertions, 40 deletions

diff --git a/main/openjdk7/icedtea-jdk-musl.patch b/main/openjdk7/icedtea-jdk-musl.patch
index b5456f9ae..49c16d73a 100644
--- a/main/openjdk7/icedtea-jdk-musl.patch
+++ b/main/openjdk7/icedtea-jdk-musl.patch
@@ -1,5 +1,6 @@
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2014-07-15 07:19:52.186682096 +0000
 @@ -46,6 +46,8 @@
  
  #include "zip.h"
@@ -9,8 +10,9 @@
  #ifdef NO_ZLIB
  
  inline bool jar::deflate_bytes(bytes& head, bytes& tail) {
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2014-07-15 07:19:52.186682096 +0000
 @@ -23,9 +23,7 @@
   * questions.
   */
@@ -22,8 +24,9 @@
  
  struct unpacker;
  
---- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h
-+++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h
+diff -ru openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h
+--- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2014-07-15 07:19:52.186682096 +0000
 @@ -27,6 +27,7 @@
  #ifndef MLIB_TYPES_H
  #define MLIB_TYPES_H
@@ -32,8 +35,9 @@
  #include <limits.h>
  #if defined(_MSC_VER)
  #include <float.h>                      /* for FLT_MAX and DBL_MAX */
---- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
-+++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2014-07-15 07:19:52.186682096 +0000
 @@ -47,7 +47,7 @@
  
  #include "java_net_Inet4AddressImpl.h"
@@ -43,8 +47,9 @@
  #define HAS_GLIBC_GETHOSTBY_R   1
  #endif
  
---- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c
-+++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c	2014-07-15 07:19:52.186682096 +0000
 @@ -47,7 +47,6 @@
  
  #ifdef __linux__
@@ -53,27 +58,53 @@
  #include <sys/utsname.h>
  #include <stdio.h>
  #endif
---- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c
-+++ openjdk/jdk/src/solaris/native/java/net/linux_close.c
-@@ -57,7 +57,7 @@
- /*
-  * Signal to unblock thread
-  */
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2014-07-15 07:19:52.190015524 +0000
+@@ -35,7 +35,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+ 
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2014-07-15 07:19:52.190015524 +0000
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c	2014-07-15 07:22:17.609355950 +0000
+@@ -75,7 +75,7 @@
+ #ifdef _AIX
+ static int sigWakeup = (SIGRTMAX - 1);
+ #else
 -static int sigWakeup = (__SIGRTMAX - 2);
 +static int sigWakeup;
+ #endif
  
  /*
-  * The fd table and the number of file descriptors
-@@ -96,6 +96,7 @@
+@@ -148,6 +148,9 @@
      /*
       * Setup the signal handler
       */
++#ifndef __AIX
 +    sigWakeup = SIGRTMAX - 2;
++#endif
      sa.sa_handler = sig_wakeup;
      sa.sa_flags   = 0;
      sigemptyset(&sa.sa_mask);
---- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
+diff -ru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2014-07-15 07:19:52.190015524 +0000
 @@ -38,7 +38,7 @@
  #include <sys/signal.h>
  
@@ -83,23 +114,3 @@
  
  static void
  nullHandler(int sig)
---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
-+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
-@@ -35,7 +35,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #include <sys/utsname.h>
- #include <netinet/ip.h>
- 
---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c
-+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
-@@ -43,7 +43,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #endif
- 
- #include "jvm.h"