[openjdk-8] 01/01: refresh debain/patches/kfreebsd-support-jdk.diff.
Jan Henke
jhe-guest at moszumanska.debian.org
Thu Apr 3 12:36:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
jhe-guest pushed a commit to branch master
in repository openjdk-8.
commit 518c3fba2cdb910f823fca3112395687c38db6c5
Author: Jan Henke <Jan.Henke at taujhe.de>
Date: Thu Apr 3 14:34:09 2014 +0200
refresh debain/patches/kfreebsd-support-jdk.diff.
Some files seem gone in OpenJDK-8 other show significant changes. This commit
just allows to apply the patch, further modifications to make it work properly on
OpenJDK-8 are most likely needed.
---
debian/patches/kfreebsd-support-jdk.diff | 870 +++++++++----------------------
1 file changed, 236 insertions(+), 634 deletions(-)
diff --git a/debian/patches/kfreebsd-support-jdk.diff b/debian/patches/kfreebsd-support-jdk.diff
index 21c51b0..caf1a7a 100644
--- a/debian/patches/kfreebsd-support-jdk.diff
+++ b/debian/patches/kfreebsd-support-jdk.diff
@@ -1,4 +1,4 @@
-Description: Initial GNU/kFreeBSD support for openjdk-7 (JDK part)
+Description: Initial GNU/kFreeBSD support for openjdk-8 (JDK part)
- Alter build system to consider GNU/kFreeBSD like linux
since this port is libc based.
openjdk/jdk/make/common/shared/Platform.gmk
@@ -19,11 +19,11 @@ Description: Initial GNU/kFreeBSD support for openjdk-7 (JDK part)
openjdk/jdk/make/java/nio/Makefile
Author: Damien Raude-Morvan <drazzib at debian.org>
Author: Guido Günther <agx at sigxcpu.org>
-Last-Update: 2013-05-07
+Last-Update: 2014-04-02
Forwarded: no
---- openjdk/jdk/src/solaris/bin/ergo_i586.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/bin/ergo_i586.c 2014-01-15 13:29:32.816570862 +0100
+--- a/jdk/src/solaris/bin/ergo_i586.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/bin/ergo_i586.c 2014-04-02 13:17:35.000000000 +0200
@@ -106,7 +106,7 @@
#endif /* __solaris__ */
@@ -33,8 +33,8 @@ Forwarded: no
/*
* A utility method for asking the CPU about itself.
---- openjdk/jdk/src/solaris/bin/jexec.c.orig 2014-01-15 10:57:03.473190024 +0100
-+++ openjdk/jdk/src/solaris/bin/jexec.c 2014-01-15 13:29:32.816570862 +0100
+--- a/jdk/src/solaris/bin/jexec.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/bin/jexec.c 2014-04-02 13:17:35.000000000 +0200
@@ -76,7 +76,7 @@
#include <string.h>
#include <limits.h>
@@ -44,16 +44,16 @@ Forwarded: no
# include <sys/types.h>
# include <sys/stat.h>
# include <fcntl.h>
-@@ -89,7 +89,7 @@
- static const char * BAD_EXEC_MSG = "jexec failed";
- static const char * CRAZY_EXEC_MSG = "missing args";
+@@ -92,7 +92,7 @@
static const char * MISSING_JAVA_MSG = "can't locate java";
+ static const char * BAD_ARG_MSG = "incorrect number of arguments";
+ static const char * MEM_FAILED_MSG = "memory allocation failed";
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
static const char * BAD_PATHNAME_MSG = "invalid path";
static const char * BAD_FILE_MSG = "invalid file";
static const char * BAD_MAGIC_MSG = "invalid file (bad magic number)";
-@@ -98,7 +98,7 @@
+@@ -101,7 +101,7 @@
/* Define a constant that represents the number of directories to pop off the
* current location to find the java binary */
@@ -62,7 +62,7 @@ Forwarded: no
static const int RELATIVE_DEPTH = 2;
#else /* Solaris */
static const int RELATIVE_DEPTH = 3;
-@@ -111,7 +111,7 @@
+@@ -114,7 +114,7 @@
static const char * JAR_FLAG = "-jar";
@@ -71,7 +71,7 @@ Forwarded: no
/* largest possible size for a local file header */
static const size_t CHUNK_SIZE = 65535;
-@@ -123,7 +123,7 @@
+@@ -126,7 +126,7 @@
int main(int argc, const char * argv[]);
void errorExit(int error, const char * message);
int getJavaPath(const char * path, char * buf, int depth);
@@ -80,8 +80,8 @@ Forwarded: no
const char * isJar(const char * path);
#endif
-@@ -172,7 +172,7 @@
- nargv = (const char **) malloc((argc + 2) * (sizeof (const char *)));
+@@ -182,7 +182,7 @@
+ }
nargv[nargc++] = java;
-#ifdef __linux__
@@ -89,7 +89,7 @@ Forwarded: no
/* The "-jar" flag is already in the original args list on Solaris,
* so it only needs to be added on Linux. */
nargv[nargc++] = JAR_FLAG;
-@@ -182,7 +182,7 @@
+@@ -192,7 +192,7 @@
const char * jarfile = argv[argi++];
const char * message = NULL;
@@ -98,7 +98,7 @@ Forwarded: no
/* On Linux we also need to make sure argv[1] is really a JAR
* file (this will also resolve any symlinks, which helps). */
char jarPath[PATH_MAX + 1];
-@@ -291,7 +291,7 @@
+@@ -301,7 +301,7 @@
}
@@ -107,29 +107,9 @@ Forwarded: no
/*
* Check if the given file is a JAR file.
*
---- openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2014-01-15 13:29:32.816570862 +0100
-@@ -212,7 +212,7 @@
-
- JVM_Close(fd);
- return (jlong) psinfo.pr_size * 1024;
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD_kernel__)
- FILE *fp;
- unsigned long vsize = 0;
-
---- openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2014-01-15 13:29:32.824570921 +0100
-@@ -26,7 +26,7 @@
- /**
- * fstatat in glibc requires _ATFILE_SOURCE to be defined.
- */
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__GLIBC__)
- #define _ATFILE_SOURCE
- #endif
-
-@@ -49,7 +49,7 @@
+--- a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2014-04-02 13:17:35.000000000 +0200
+@@ -42,7 +42,7 @@
#include <strings.h>
#endif
@@ -138,8 +118,8 @@ Forwarded: no
#include <string.h>
#endif
---- openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c.orig 2014-01-15 13:29:32.824570921 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2014-01-15 13:33:52.030476488 +0100
+--- a/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2014-04-02 13:17:35.000000000 +0200
@@ -35,7 +35,7 @@
#include <strings.h>
#endif
@@ -149,8 +129,8 @@ Forwarded: no
#include <string.h>
#endif
---- openjdk/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
@@ -39,7 +39,7 @@
#if defined(__linux__) || defined(__solaris__)
@@ -192,8 +172,8 @@ Forwarded: no
if (result == -1) {
if (errno == EAGAIN)
---- openjdk/jdk/src/solaris/native/sun/nio/ch/Sctp.h.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/Sctp.h 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h 2014-04-02 13:17:35.000000000 +0200
@@ -319,8 +319,36 @@
typedef int sctp_bindx_func(int sd, struct sockaddr *addrs, int addrcnt, int flags);
typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
@@ -241,9 +221,9 @@ Forwarded: no
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- openjdk/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2014-01-15 13:29:32.824570921 +0100
-@@ -441,7 +441,7 @@
+--- a/jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
+@@ -443,7 +443,7 @@
} else if (errno == EINTR) {
return IOS_INTERRUPTED;
@@ -252,8 +232,8 @@ Forwarded: no
} else if (errno == ENOTCONN) {
/* ENOTCONN when EOF reached */
rv = 0;
---- openjdk/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
@@ -35,7 +35,7 @@
#include <string.h>
#include <errno.h>
@@ -272,19 +252,19 @@ Forwarded: no
{
int len;
SOCKADDR sa;
---- openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c 2014-01-15 13:29:32.824570921 +0100
-@@ -192,7 +192,7 @@
- return -1;
+--- a/jdk/src/solaris/native/sun/nio/ch/Net.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/Net.c 2014-04-02 13:17:35.000000000 +0200
+@@ -205,7 +205,7 @@
}
}
--#if defined(__linux__) && defined(AF_INET6)
-+#if ( defined(__linux__) || defined(__GLIBC__) ) && defined(AF_INET6)
- /* By default, Linux uses the route default */
- if (domain == AF_INET6 && type == SOCK_DGRAM) {
- int arg = 1;
---- openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-01-15 13:29:32.824570921 +0100
+
+-#if defined(__linux__)
++#if ( defined(__linux__) || defined(__GLIBC__) )
+ if (type == SOCK_DGRAM) {
+ int arg = 0;
+ int level = (domain == AF_INET6) ? IPPROTO_IPV6 : IPPROTO_IP;
+--- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-04-02 13:17:35.000000000 +0200
@@ -33,7 +33,7 @@
#include "nio_util.h"
@@ -321,8 +301,8 @@ Forwarded: no
if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
#endif
---- openjdk/jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
@@ -31,7 +31,7 @@
#include <string.h>
#include <poll.h>
@@ -332,8 +312,8 @@ Forwarded: no
#include <netinet/in.h>
#endif
---- openjdk/jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c 2014-04-02 13:17:35.000000000 +0200
@@ -28,7 +28,7 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -343,8 +323,8 @@ Forwarded: no
#include <netinet/in.h>
#endif
---- openjdk/jdk/src/solaris/native/sun/nio/ch/SctpNet.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c 2014-04-02 13:17:35.000000000 +0200
@@ -58,6 +58,7 @@
*/
jboolean loadSocketExtensionFuncs
@@ -361,59 +341,8 @@ Forwarded: no
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- openjdk/jdk/src/solaris/native/sun/awt/awt_util.h.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_util.h 2014-01-15 13:29:32.820570891 +0100
-@@ -200,7 +200,7 @@
-
-
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- typedef struct _XmImRefRec {
- Cardinal num_refs; /* Number of referencing widgets. */
- Cardinal max_refs; /* Maximum length of refs array. */
---- openjdk/jdk/src/solaris/native/sun/awt/awt_util.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_util.c 2014-01-15 13:29:32.820570891 +0100
-@@ -605,7 +605,7 @@
-
- return answer;
- }
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
-
-
- #define MAXARGS 10
-@@ -676,7 +676,7 @@
- return w;
- }
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- static XRectangle geometryRect;
- XVaNestedList awt_util_getXICStatusAreaList(Widget w)
- {
---- openjdk/jdk/src/solaris/native/sun/awt/multi_font.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/multi_font.c 2014-01-15 13:29:32.820570891 +0100
-@@ -348,7 +348,7 @@
- return JNI_TRUE;
- }
- #ifndef XAWT
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- XmString
- unicodeXmStringCreate(char* text, char* tag, int len) {
- XmString ret_val;
-@@ -433,7 +433,7 @@
- char *offsetStringData;
-
- offsetStringData = stringData + (4 * sizeof(char));
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- len = buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3];
- /* Motif XmStringCreate() API requests "text must be a NULL-terminated
- string" and its implementation uses "strlen()" to calculate the length
---- openjdk/jdk/src/solaris/native/sun/awt/extutil.h.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/extutil.h 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/sun/awt/extutil.h 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/awt/extutil.h 2014-04-02 13:17:35.000000000 +0200
@@ -58,7 +58,7 @@
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -423,8 +352,8 @@ Forwarded: no
#ifndef _EXTUTIL_H_
#define _EXTUTIL_H_
---- openjdk/jdk/src/solaris/native/sun/awt/VDrawingArea.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/VDrawingArea.c 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/sun/awt/VDrawingArea.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/awt/VDrawingArea.c 2014-04-02 13:17:35.000000000 +0200
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -434,9 +363,9 @@ Forwarded: no
/* XXX: Shouldn't be necessary. */
#include "awt_p.h"
#endif /* __linux__ */
---- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2014-01-15 13:29:32.820570891 +0100
-@@ -123,7 +123,8 @@
+--- a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2014-04-02 13:17:35.000000000 +0200
+@@ -120,7 +120,8 @@
*/
#define MAXFRAMEBUFFERS 16
@@ -446,7 +375,7 @@ Forwarded: no
typedef struct {
int screen_number;
short x_org;
-@@ -439,7 +440,7 @@
+@@ -436,7 +437,7 @@
RTLD_LAZY | RTLD_GLOBAL);
}
@@ -455,8 +384,8 @@ Forwarded: no
if (xrenderLibHandle == NULL) {
xrenderLibHandle = dlopen("/usr/sfw/lib/libXrender.so.1",
RTLD_LAZY | RTLD_GLOBAL);
-@@ -652,7 +653,8 @@
- #endif /* HEADLESS */
+@@ -580,7 +581,8 @@
+ }
#ifndef HEADLESS
-#if defined(__linux__) || defined(MACOSX)
@@ -465,7 +394,7 @@ Forwarded: no
static void xinerama_init_linux()
{
void* libHandle = NULL;
-@@ -703,7 +705,7 @@
+@@ -631,7 +633,7 @@
}
}
#endif
@@ -474,7 +403,7 @@ Forwarded: no
static void xinerama_init_solaris()
{
void* libHandle = NULL;
-@@ -763,11 +765,11 @@
+@@ -691,11 +693,11 @@
}
DTRACE_PRINTLN("Xinerama extension is available");
@@ -488,7 +417,7 @@ Forwarded: no
}
#endif /* HEADLESS */
-@@ -1645,7 +1647,7 @@
+@@ -1589,7 +1591,7 @@
{
jobject point = NULL;
#ifndef HEADLESS /* return NULL in HEADLESS, Linux */
@@ -497,9 +426,9 @@ Forwarded: no
int x,y;
AWT_LOCK();
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-01-15 13:29:32.820570891 +0100
-@@ -334,7 +334,7 @@
+--- a/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-04-02 13:17:35.000000000 +0200
+@@ -260,7 +260,7 @@
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
}
@@ -508,9 +437,9 @@ Forwarded: no
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-01-15 13:29:32.820570891 +0100
-@@ -67,7 +67,7 @@
+--- a/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-04-02 13:17:35.000000000 +0200
+@@ -52,7 +52,7 @@
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
XIMPreeditCaretCallbackStruct *);
@@ -519,7 +448,7 @@ Forwarded: no
static void StatusStartCallback(XIC, XPointer, XPointer);
static void StatusDoneCallback(XIC, XPointer, XPointer);
static void StatusDrawCallback(XIC, XPointer,
-@@ -81,7 +81,7 @@
+@@ -66,7 +66,7 @@
#define PreeditDoneIndex 1
#define PreeditDrawIndex 2
#define PreeditCaretIndex 3
@@ -528,7 +457,7 @@ Forwarded: no
#define StatusStartIndex 4
#define StatusDoneIndex 5
#define StatusDrawIndex 6
-@@ -99,14 +99,14 @@
+@@ -84,14 +84,14 @@
(XIMProc)PreeditDoneCallback,
(XIMProc)PreeditDrawCallback,
(XIMProc)PreeditCaretCallback,
@@ -545,16 +474,16 @@ Forwarded: no
#define MAX_STATUS_LEN 100
typedef struct {
Window w; /*status window id */
-@@ -146,7 +146,7 @@
- #endif /* XAWT */
+@@ -124,7 +124,7 @@
+ XIMCallback *callbacks; /* callback parameters */
jobject x11inputmethod; /* global ref to X11InputMethod instance */
/* associated with the XIC */
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
StatusWindow *statusWindow; /* our own status window */
- #else
- #ifndef XAWT
-@@ -425,7 +425,7 @@
+ #endif
+ char *lookup_buf; /* buffer used for XmbLookupString */
+@@ -369,7 +369,7 @@
static void
freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
{
@@ -563,7 +492,7 @@ Forwarded: no
if (pX11IMData->statusWindow != NULL){
StatusWindow *sw = pX11IMData->statusWindow;
XFreeGC(awt_display, sw->lightGC);
-@@ -531,7 +531,7 @@
+@@ -472,7 +472,7 @@
pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
if (pX11IMData == NULL) {
@@ -572,7 +501,7 @@ Forwarded: no
return False;
#else
return result;
-@@ -539,7 +539,7 @@
+@@ -480,7 +480,7 @@
}
if ((ic = pX11IMData->current_ic) == (XIC)0){
@@ -581,16 +510,16 @@ Forwarded: no
return False;
#else
return result;
-@@ -648,7 +648,7 @@
+@@ -572,7 +572,7 @@
return result;
}
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
static StatusWindow *createStatusWindow(
- #ifdef XAWT
Window parent) {
-@@ -993,7 +993,7 @@
+ StatusWindow *statusWindow;
+@@ -885,7 +885,7 @@
}
}
}
@@ -599,7 +528,7 @@ Forwarded: no
/*
* Creates two XICs, one for active clients and the other for passive
* clients. All information on those XICs are stored in the
-@@ -1050,7 +1050,7 @@
+@@ -929,7 +929,7 @@
return FALSE ;
}
@@ -608,25 +537,19 @@ Forwarded: no
on_the_spot_styles |= XIMStatusNothing;
/*kinput does not support XIMPreeditCallbacks and XIMStatusArea
-@@ -1063,7 +1063,7 @@
+@@ -942,9 +942,9 @@
break;
}
}
-#else /*! __linux__ && !MACOSX */
+#else /*! __linux__ && !MACOSX && !__GLIBC__ */
- #ifdef XAWT
on_the_spot_styles |= XIMStatusNothing;
- #else /* !XAWT */
-@@ -1086,7 +1086,7 @@
- on_the_spot_styles |= XIMStatusNothing;
-
- #endif /* XAWT */
-#endif /* __linux__ || MACOSX */
+#endif /* __linux__ || MACOSX || __GLIBC__ */
for (i = 0; i < im_styles->count_styles; i++) {
active_styles |= im_styles->supported_styles[i] & on_the_spot_styles;
-@@ -1134,7 +1134,7 @@
+@@ -992,7 +992,7 @@
NULL);
if (preedit == (XVaNestedList)NULL)
goto err;
@@ -635,25 +558,25 @@ Forwarded: no
/*always try XIMStatusCallbacks for active client...*/
{
status = (XVaNestedList)XVaCreateNestedList(0,
-@@ -1156,7 +1156,7 @@
+@@ -1014,7 +1014,7 @@
XFree((void *)status);
XFree((void *)preedit);
}
-#else /* !__linux__ && !MACOSX */
+#else /* !__linux__ && !MACOSX && !__GLIBC__ */
- #ifndef XAWT
- if (on_the_spot_styles & XIMStatusArea) {
- Widget parent;
-@@ -1184,7 +1184,7 @@
- }
- #endif /* XAWT */
+ pX11IMData->ic_active = XCreateIC(X11im,
+ XNClientWindow, w,
+ XNFocusWindow, w,
+@@ -1022,7 +1022,7 @@
+ XNPreeditAttributes, preedit,
+ NULL);
XFree((void *)preedit);
-#endif /* __linux__ || MACOSX */
+#endif /* __linux__ || MACOSX || __GLIBC__ */
pX11IMData->ic_passive = XCreateIC(X11im,
XNClientWindow, w,
XNFocusWindow, w,
-@@ -1343,7 +1343,7 @@
+@@ -1181,7 +1181,7 @@
}
@@ -662,7 +585,7 @@ Forwarded: no
static void
StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data)
{
-@@ -1411,7 +1411,7 @@
+@@ -1249,7 +1249,7 @@
finally:
AWT_UNLOCK();
}
@@ -671,7 +594,7 @@ Forwarded: no
static void CommitStringCallback(XIC ic, XPointer client_data, XPointer call_data) {
JNIEnv *env = GetJNIEnv();
-@@ -1517,14 +1517,14 @@
+@@ -1346,14 +1346,14 @@
/* Use IMInstantiate call back only on Linux, as there is a bug in Solaris
(4768335)
*/
@@ -688,24 +611,19 @@ Forwarded: no
}
#endif
-@@ -1588,13 +1588,13 @@
- #endif /* XAWT */
+@@ -1388,9 +1388,9 @@
+
globalRef = (*env)->NewGlobalRef(env, this);
pX11IMData->x11inputmethod = globalRef;
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
pX11IMData->statusWindow = NULL;
--#else /* !__linux__ && !MACOSX */
-+#else /* !__linux__ && !MACOSX && !__GLIBC__ */
- #ifndef XAWT
- pX11IMData->statusWidget = (Widget) NULL;
- #endif /* XAWT */
-#endif /* __linux__ || MACOSX */
+#endif /* __linux__ || MACOSX || __GLIBC__ */
pX11IMData->lookup_buf = 0;
pX11IMData->lookup_buf_len = 0;
-@@ -1741,14 +1741,14 @@
+@@ -1437,14 +1437,14 @@
setXICFocus(pX11IMData->current_ic, req);
currentX11InputMethodInstance = pX11IMData->x11inputmethod;
currentFocusWindow = w;
@@ -722,7 +640,7 @@ Forwarded: no
onoffStatusWindow(pX11IMData, 0, False);
if (pX11IMData->current_ic != NULL)
#endif
-@@ -1765,7 +1765,7 @@
+@@ -1461,7 +1461,7 @@
Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env,
jobject this)
{
@@ -731,16 +649,7 @@ Forwarded: no
X11InputMethodData *pX11IMData;
StatusWindow *statusWindow;
-@@ -1862,7 +1862,7 @@
- X11InputMethodData *pX11IMData;
- XVaNestedList status;
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- /*do nothing for linux? */
- #else
- AWT_LOCK();
-@@ -1968,7 +1968,7 @@
+@@ -1629,7 +1629,7 @@
JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow
(JNIEnv *env, jobject this, jlong window)
{
@@ -749,114 +658,23 @@ Forwarded: no
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- openjdk/jdk/src/solaris/native/sun/awt/awt_MToolkit.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2014-01-15 13:29:32.820570891 +0100
-@@ -63,7 +63,7 @@
- extern JavaVM *jvm;
-
- #ifndef HEADLESS
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- extern void statusWindowEventHandler(XEvent event);
- Boolean awt_dnd_process_event(XEvent* event);
- #endif
-@@ -1643,7 +1643,7 @@
- */
- Widget widget=XtWindowToWidget(awt_display, xev.xany.window);
- eventNumber++;
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- statusWindowEventHandler(xev);
- #endif
- xembed_eventHandler(&xev);
---- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c 2014-01-15 13:29:32.820570891 +0100
-@@ -35,7 +35,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
- #include <Xm/MwmUtil.h>
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- #include <execinfo.h>
- #endif
- #include <stdio.h>
-@@ -835,7 +835,7 @@
- AWT_UNLOCK();
- }
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- void
- print_stack (void)
- {
---- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c 2014-01-15 13:29:32.820570891 +0100
-@@ -23,7 +23,7 @@
+--- a/jdk/src/solaris/native/sun/awt/fontpath.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/awt/fontpath.c 2014-04-02 13:17:35.000000000 +0200
+@@ -23,9 +23,9 @@
* questions.
*/
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- #include <string.h>
- #endif /* __linux__ */
- #include <stdio.h>
-@@ -52,7 +52,7 @@
- #define AWT_UNLOCK()
- #endif /* !HEADLESS */
-
--#if defined(__linux__) && !defined(MAP_FAILED)
-+#if !defined(MAP_FAILED)
- #define MAP_FAILED ((caddr_t)-1)
- #endif
-
-@@ -66,7 +66,7 @@
-
- #define MAXFDIRS 512 /* Max number of directories that contain fonts */
-
--#if !defined(__linux__) && !defined(MACOSX)
-+#if !defined(__linux__) && !defined(MACOSX) && !defined(__GLIBC__)
- /*
- * This can be set in the makefile to "/usr/X11" if so desired.
- */
-@@ -388,7 +388,7 @@
-
- #endif /* !HEADLESS */
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- /* from awt_LoadLibrary.c */
- JNIEXPORT jboolean JNICALL AWTIsHeadless();
- #endif
-@@ -513,7 +513,7 @@
- */
- fcdirs = getFontConfigLocations();
-
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GLIBC__)
- knowndirs = fullLinuxFontPath;
- #elif defined(MACOSX)
- knowndirs = full_MACOSX_X11FontPath;
-@@ -527,7 +527,7 @@
- * be initialised.
- */
- #ifndef HEADLESS
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- /* There's no headless build on linux ... */
- if (!AWTIsHeadless()) { /* .. so need to call a function to check */
- #endif
-@@ -543,7 +543,7 @@
- x11dirs = getX11FontPath();
- }
- AWT_UNLOCK();
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(MACOSX) || defined(__GLIBC__)
- }
- #endif
- #endif /* !HEADLESS */
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-01-15 13:29:32.820570891 +0100
-@@ -46,7 +46,7 @@
+ #include <string.h>
+-#endif /* __linux__ */
++#endif /* __linux__ || __GLIBC__ */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <strings.h>
+--- a/jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-04-02 13:17:35.000000000 +0200
+@@ -45,7 +45,7 @@
#include "wsutils.h"
#include "list.h"
#include "multiVis.h"
@@ -865,8 +683,8 @@ Forwarded: no
#include <sys/socket.h>
#endif
---- openjdk/jdk/src/solaris/native/sun/java2d/j2d_md.h.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/java2d/j2d_md.h 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/java2d/j2d_md.h 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/java2d/j2d_md.h 2014-04-02 13:17:35.000000000 +0200
@@ -30,7 +30,8 @@
/*
* Linux and MACOSX's version of <sys/types.h> does not define intptr_t
@@ -877,8 +695,8 @@ Forwarded: no
#include <stdint.h>
#endif /* __linux__ || MACOSX */
---- openjdk/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2014-04-02 13:17:35.000000000 +0200
@@ -804,7 +804,7 @@
static int initialized;
static int usevis = JNI_TRUE;
@@ -888,8 +706,8 @@ Forwarded: no
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- openjdk/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2014-04-02 13:17:35.000000000 +0200
@@ -33,7 +33,7 @@
#include <strings.h>
#endif
@@ -899,19 +717,19 @@ Forwarded: no
#include <string.h>
#endif
---- openjdk/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2014-01-15 13:29:32.824570921 +0100
-@@ -29,7 +29,7 @@
- #include "jlong.h"
- #include "sun_net_spi_DefaultProxySelector.h"
+--- a/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2014-04-02 13:17:35.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <dlfcn.h>
#include <stdio.h>
+ #include <stdlib.h>
-#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+#if defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(__GLIBC__)
#include <string.h>
#else
#include <strings.h>
---- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2014-01-15 13:29:32.824570921 +0100
+--- a/jdk/src/solaris/native/sun/xawt/XToolkit.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c 2014-04-02 13:17:35.000000000 +0200
@@ -27,7 +27,7 @@
#include <X11/Xutil.h>
#include <X11/Xos.h>
@@ -921,7 +739,7 @@ Forwarded: no
#include <execinfo.h>
#endif
-@@ -785,7 +785,7 @@
+@@ -779,7 +779,7 @@
return ret;
}
@@ -930,8 +748,8 @@ Forwarded: no
void print_stack(void)
{
void *array[10];
---- openjdk/jdk/src/solaris/native/java/nio/MappedByteBuffer.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2014-04-02 13:17:35.000000000 +0200
@@ -40,7 +40,7 @@
int result = 0;
int i = 0;
@@ -941,8 +759,8 @@ Forwarded: no
unsigned char *vec = (unsigned char *)malloc(numPages * sizeof(char));
#else
char *vec = (char *)malloc(numPages * sizeof(char));
---- openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/java/util/TimeZone_md.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/util/TimeZone_md.c 2014-04-02 13:17:35.000000000 +0200
@@ -49,7 +49,7 @@
#define fileclose fclose
#endif
@@ -952,7 +770,7 @@ Forwarded: no
static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
-@@ -125,7 +125,7 @@
+@@ -123,7 +123,7 @@
return NULL;
}
@@ -961,7 +779,7 @@ Forwarded: no
&& (defined(_POSIX_PTHREAD_SEMANTICS) || defined(_LP64)))
while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
#else
-@@ -214,7 +214,7 @@
+@@ -211,7 +211,7 @@
return tz;
}
@@ -970,7 +788,7 @@ Forwarded: no
/*
* Performs Linux specific mapping and returns a zone ID
-@@ -230,7 +230,7 @@
+@@ -227,7 +227,7 @@
char *buf;
size_t size;
@@ -979,7 +797,7 @@ Forwarded: no
/*
* Try reading the /etc/timezone file for Debian distros. There's
* no spec of the file format available. This parsing assumes that
-@@ -697,7 +697,7 @@
+@@ -632,7 +632,7 @@
tz = getenv("TZ");
@@ -988,7 +806,7 @@ Forwarded: no
if (tz == NULL) {
#else
#ifdef __solaris__
-@@ -723,7 +723,7 @@
+@@ -658,7 +658,7 @@
#endif
if (tz != NULL) {
@@ -997,9 +815,9 @@ Forwarded: no
/*
* Ignore "posix/" prefix.
*/
---- openjdk/jdk/src/solaris/native/java/io/io_util_md.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/io/io_util_md.c 2014-01-15 13:29:32.816570862 +0100
-@@ -68,7 +68,7 @@
+--- a/jdk/src/solaris/native/java/io/io_util_md.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/io/io_util_md.c 2014-04-02 13:17:35.000000000 +0200
+@@ -99,7 +99,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
FD fd;
@@ -1008,8 +826,8 @@ Forwarded: no
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
---- openjdk/jdk/src/solaris/native/java/lang/locale_str.h.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/lang/locale_str.h 2014-01-15 13:29:32.816570862 +0100
+--- a/jdk/src/solaris/native/java/lang/locale_str.h 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/lang/locale_str.h 2014-04-02 13:17:35.000000000 +0200
@@ -48,7 +48,7 @@
"gl", "gl_ES",
"he", "iw_IL",
@@ -1070,28 +888,19 @@ Forwarded: no
"RN", "US", // used on Linux, not clear what it stands for
#endif
"YU", "CS", // YU has been removed from ISO 3166
---- openjdk/jdk/src/solaris/native/java/lang/UNIXProcess_md.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2014-01-15 13:29:32.816570862 +0100
-@@ -102,7 +102,7 @@
- #define START_CHILD_USE_CLONE 0 /* clone() currently disabled; see above. */
-
- #ifndef START_CHILD_USE_CLONE
-- #ifdef __linux__
-+ #if defined(__linux__) || defined(__GLIBC__)
- #define START_CHILD_USE_CLONE 1
- #else
- #define START_CHILD_USE_CLONE 0
-@@ -111,7 +111,7 @@
-
- /* By default, use vfork() on Linux. */
- #ifndef START_CHILD_USE_VFORK
-- #ifdef __linux__
-+ #if defined(__linux__) || defined(__GLIBC__)
- #define START_CHILD_USE_VFORK 1
- #else
- #define START_CHILD_USE_VFORK 0
---- openjdk/jdk/src/solaris/native/java/lang/java_props_md.c.orig 2014-01-15 10:57:03.553190612 +0100
-+++ openjdk/jdk/src/solaris/native/java/lang/java_props_md.c 2014-01-15 13:29:32.816570862 +0100
+--- a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2014-04-02 13:17:35.000000000 +0200
+@@ -396,7 +396,7 @@
+ #ifdef START_CHILD_USE_CLONE
+ static pid_t
+ cloneChild(ChildStuff *c) {
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ #define START_CHILD_CLONE_STACK_SIZE (64 * 1024)
+ /*
+ * See clone(2).
+--- a/jdk/src/solaris/native/java/lang/java_props_md.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/lang/java_props_md.c 2014-04-02 13:17:35.000000000 +0200
@@ -23,7 +23,7 @@
* questions.
*/
@@ -1119,7 +928,7 @@ Forwarded: no
if (lc == NULL) {
return 0;
}
-@@ -293,7 +293,7 @@
+@@ -331,7 +331,7 @@
* in order to use optimizations. */
*std_encoding = (*p != '\0') ? p : "ISO8859-1";
@@ -1128,7 +937,7 @@ Forwarded: no
/*
* Remap the encoding string to a different value for japanese
* locales on linux so that customized converters are used instead
-@@ -517,7 +517,7 @@
+@@ -559,7 +559,7 @@
sprops.unicode_encoding = "UnicodeBig";
#endif
#else /* !_ALLBSD_SOURCE */
@@ -1137,8 +946,8 @@ Forwarded: no
#if __BYTE_ORDER == __LITTLE_ENDIAN
sprops.unicode_encoding = "UnicodeLittle";
#else
---- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig 2014-01-15 10:57:03.733191937 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-04-02 13:17:35.000000000 +0200
@@ -33,7 +33,7 @@
#ifdef __solaris__
#include <fcntl.h>
@@ -1146,9 +955,9 @@ Forwarded: no
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
#include <unistd.h>
+ #include <sys/sysctl.h>
#include <sys/utsname.h>
- #include <netinet/ip.h>
-@@ -335,7 +335,7 @@
+@@ -292,7 +292,7 @@
/* The fdObj'fd */
jint fd;
@@ -1157,16 +966,13 @@ Forwarded: no
SOCKADDR addr;
int len;
#endif
-@@ -345,7 +345,7 @@
+@@ -302,19 +302,26 @@
}
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
-#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+#if defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(__GLIBC__)
- #ifdef __linux__
- if (isOldKernel) {
- int t = 1;
-@@ -356,14 +356,21 @@
+ memset(&addr, 0, sizeof(addr));
#ifdef AF_INET6
if (ipv6_available()) {
struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr;
@@ -1188,9 +994,9 @@ Forwarded: no
}
JVM_Connect(fd, (struct sockaddr *)&addr, len);
---- openjdk/jdk/src/solaris/native/java/net/Inet6AddressImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2014-01-15 13:29:32.820570891 +0100
-@@ -73,7 +73,7 @@
+--- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2014-04-02 13:17:35.000000000 +0200
+@@ -75,7 +75,7 @@
} else {
// ensure null-terminated
hostname[NI_MAXHOST] = '\0';
@@ -1199,7 +1005,7 @@ Forwarded: no
/* On Linux/FreeBSD gethostname() says "host.domain.sun.com". On
* Solaris gethostname() says "host", so extra work is needed.
*/
-@@ -670,7 +670,7 @@
+@@ -798,7 +798,7 @@
case ENETUNREACH: /* Network Unreachable */
case EAFNOSUPPORT: /* Address Family not supported */
case EADDRNOTAVAIL: /* address is not available on the remote machine */
@@ -1208,18 +1014,18 @@ Forwarded: no
case EINVAL:
case EHOSTUNREACH:
/*
---- openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2014-01-15 13:29:32.816570862 +0100
-@@ -333,7 +333,7 @@
- /* Something went wrong, maybe networking is not setup? */
- strcpy(hostname, "localhost");
- } else {
+--- a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2014-04-02 13:17:35.000000000 +0200
+@@ -644,7 +644,7 @@
+ n = sendto(fd, sendbuf, plen, 0, (struct sockaddr *)him,
+ sizeof(struct sockaddr));
+ if (n < 0 && errno != EINPROGRESS ) {
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
- /* On Linux gethostname() says "host.domain.sun.com". On
- * Solaris gethostname() says "host", so extra work is needed.
- */
-@@ -819,7 +819,7 @@
+ if (errno != EINVAL && errno != EHOSTUNREACH)
+ /*
+ * On some Linux versions, when a socket is bound to the loopback
+@@ -810,7 +810,7 @@
case ENETUNREACH: /* Network Unreachable */
case EAFNOSUPPORT: /* Address Family not supported */
case EADDRNOTAVAIL: /* address is not available on the remote machine */
@@ -1228,8 +1034,8 @@ Forwarded: no
case EINVAL:
case EHOSTUNREACH:
/*
---- openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/java/net/NetworkInterface.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/net/NetworkInterface.c 2014-04-02 13:17:35.000000000 +0200
@@ -56,17 +56,17 @@
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#endif
@@ -1251,7 +1057,7 @@ Forwarded: no
#endif
#include "jvm.h"
-@@ -1596,7 +1596,11 @@
+@@ -1616,7 +1616,11 @@
* try the old way.
*/
memset(&lif, 0, sizeof(lif));
@@ -1263,7 +1069,7 @@ Forwarded: no
if (ioctl(sock, SIOCGLIFHWADDR, &lif) != -1) {
struct sockaddr_dl *sp;
-@@ -1682,7 +1686,7 @@
+@@ -1702,7 +1706,7 @@
/** BSD **/
@@ -1272,7 +1078,7 @@ Forwarded: no
/* Open socket for further ioct calls, try v4 socket first and
* if it falls return v6 socket
*/
-@@ -1811,7 +1815,11 @@
+@@ -1831,7 +1835,11 @@
continue;
memset(&ifr6, 0, sizeof(ifr6));
@@ -1284,8 +1090,8 @@ Forwarded: no
memcpy(&ifr6.ifr_addr, ifa->ifa_addr, MIN(sizeof(ifr6.ifr_addr), ifa->ifa_addr->sa_len));
if (ioctl(sock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) {
---- openjdk/jdk/src/solaris/native/java/net/net_util_md.c.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/java/net/net_util_md.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/net/net_util_md.c 2014-04-02 13:17:35.000000000 +0200
@@ -56,6 +56,11 @@
#include <net/route.h>
#include <sys/utsname.h>
@@ -1298,8 +1104,8 @@ Forwarded: no
#ifndef IPV6_FLOWINFO_SEND
#define IPV6_FLOWINFO_SEND 33
#endif
---- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c.orig 2014-01-15 10:57:03.733191937 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-04-02 13:17:35.000000000 +0200
@@ -32,7 +32,7 @@
#endif
#include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */
@@ -1316,9 +1122,9 @@ Forwarded: no
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
#include <unistd.h>
+ #include <sys/sysctl.h>
#endif
-
-@@ -467,7 +467,7 @@
+@@ -468,7 +468,7 @@
/* report the appropriate exception */
if (connect_rv < 0) {
@@ -1327,8 +1133,8 @@ Forwarded: no
/*
* Linux/GNU distribution setup /etc/hosts so that
* InetAddress.getLocalHost gets back the loopback address
---- openjdk/jdk/src/solaris/native/java/net/net_util_md.h.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/net_util_md.h 2014-01-15 13:29:32.820570891 +0100
+--- a/jdk/src/solaris/native/java/net/net_util_md.h 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/java/net/net_util_md.h 2014-04-02 13:17:35.000000000 +0200
@@ -37,7 +37,7 @@
#endif
@@ -1338,17 +1144,17 @@ Forwarded: no
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
-@@ -147,7 +147,7 @@
+@@ -146,7 +146,7 @@
/************************************************************************
* Utilities
*/
-#ifdef __linux__
+#if defined(__linux__)
- extern int kernelIsV22();
extern int kernelIsV24();
#endif
---- openjdk/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java 2014-01-15 13:29:32.816570862 +0100
+
+--- a/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java 2014-04-02 13:17:35.000000000 +0200
@@ -295,7 +295,7 @@
super.setOsNameAndVersion();
@@ -1358,9 +1164,9 @@ Forwarded: no
return;
}
try {
---- openjdk/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2014-01-15 13:29:32.816570862 +0100
-@@ -129,6 +129,7 @@
+--- a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2014-04-02 13:17:35.000000000 +0200
+@@ -130,6 +130,7 @@
static boolean isBSD() {
return (osname.equals("Linux") ||
@@ -1368,10 +1174,10 @@ Forwarded: no
osname.contains("OS X"));
}
---- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2014-01-15 13:29:32.816570862 +0100
-@@ -101,9 +101,7 @@
- LinuxNativeDispatcher.fgetxattr(fd, "user.java".getBytes(), 0L, 0);
+--- a/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2014-04-02 13:17:35.000000000 +0200
+@@ -102,9 +102,7 @@
+ LinuxNativeDispatcher.fgetxattr(fd, name, 0L, 0);
return true;
} catch (UnixException e) {
- // attribute does not exist
@@ -1381,8 +1187,8 @@ Forwarded: no
} finally {
UnixNativeDispatcher.close(fd);
}
---- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java 2014-01-15 13:29:32.816570862 +0100
+--- a/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java 2014-04-02 13:17:35.000000000 +0200
@@ -238,9 +238,6 @@
}
throw new UnixException("Value of " + DOS_XATTR_NAME + " attribute is invalid");
@@ -1393,30 +1199,30 @@ Forwarded: no
throw x;
} finally {
buffer.release();
---- openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2014-01-15 13:29:32.816570862 +0100
-@@ -66,7 +66,7 @@
+--- a/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2014-04-02 13:17:35.000000000 +0200
+@@ -59,7 +59,7 @@
.doPrivileged(new GetPropertyAction("os.name"));
if (osname.equals("SunOS"))
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
- if (osname.equals("Linux"))
+ if (osname.equals("Linux") || osname.equals("GNU/kFreeBSD"))
return createProvider("sun.nio.fs.LinuxFileSystemProvider");
- if (osname.equals("Darwin") || osname.contains("OS X"))
+ if (osname.contains("OS X"))
return createProvider("sun.nio.fs.MacOSXFileSystemProvider");
---- openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2014-01-15 13:29:32.816570862 +0100
-@@ -48,7 +48,7 @@
+--- a/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2014-04-02 13:17:35.000000000 +0200
+@@ -64,7 +64,7 @@
.doPrivileged(new GetPropertyAction("os.name"));
if (osname.equals("SunOS"))
- return new SolarisAsynchronousChannelProvider();
+ return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider");
- if (osname.equals("Linux"))
+ if (osname.equals("Linux") || osname.equals("GNU/kFreeBSD"))
- return new LinuxAsynchronousChannelProvider();
+ return createProvider("sun.nio.ch.LinuxAsynchronousChannelProvider");
if (osname.contains("OS X"))
- return new BsdAsynchronousChannelProvider();
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java 2014-01-15 13:29:32.816570862 +0100
+ return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider");
+--- a/jdk/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java 2014-04-02 13:17:35.000000000 +0200
@@ -74,7 +74,7 @@
* Currently uses hardcoded values
*/
@@ -1426,8 +1232,8 @@ Forwarded: no
return DEFAULT_WIDTH_LINUX;
} else {
return DEFAULT_WIDTH_SOLARIS;
---- openjdk/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2014-01-15 13:29:32.816570862 +0100
+--- a/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2014-04-02 13:17:35.000000000 +0200
@@ -61,7 +61,7 @@
#define log1p jlog1p
#define expm1 jexpm1
@@ -1436,9 +1242,9 @@ Forwarded: no
+#if defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(__GLIBC__)
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
- #define __ieee754_acosh __j__ieee754_acosh
---- openjdk/jdk/src/share/classes/sun/font/FontUtilities.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/font/FontUtilities.java 2014-01-15 13:29:32.816570862 +0100
+ #define __ieee754_log __j__ieee754_log
+--- a/jdk/src/share/classes/sun/font/FontUtilities.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/share/classes/sun/font/FontUtilities.java 2014-04-02 13:17:35.000000000 +0200
@@ -76,7 +76,7 @@
String osName = System.getProperty("os.name", "unknownOS");
isSolaris = osName.startsWith("SunOS");
@@ -1448,9 +1254,9 @@ Forwarded: no
isMacOSX = osName.contains("OS X"); // TODO: MacOSX
---- openjdk/jdk/src/share/classes/sun/print/PSPrinterJob.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-01-15 13:29:32.816570862 +0100
-@@ -1568,7 +1568,9 @@
+--- a/jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-04-02 13:17:35.000000000 +0200
+@@ -1587,7 +1587,9 @@
}
String osname = System.getProperty("os.name");
@@ -1461,8 +1267,8 @@ Forwarded: no
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- openjdk/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2014-01-15 13:29:32.816570862 +0100
+--- a/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2014-04-02 13:17:35.000000000 +0200
@@ -1298,6 +1298,7 @@
String osName = AccessController.doPrivileged(
new GetPropertyAction("os.name"));
@@ -1471,28 +1277,28 @@ Forwarded: no
|| osName.contains("OS X")) {
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
new String[] {
---- openjdk/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2014-01-15 13:29:32.816570862 +0100
-@@ -48,6 +48,7 @@
- public Boolean run() {
+--- a/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2014-04-02 13:17:35.000000000 +0200
+@@ -49,6 +49,7 @@
String osname = System.getProperty("os.name");
if (osname.startsWith("SunOS") ||
+ osname.contains("OS X") ||
+ osname.startsWith("GNU/kFreeBSD") ||
osname.startsWith("Linux")) {
return new Boolean(System.getProperty
(USE_NATIVE_PROP));
---- openjdk/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-01-15 13:29:32.816570862 +0100
-@@ -413,6 +413,7 @@
+--- a/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-04-02 13:17:35.000000000 +0200
+@@ -403,6 +403,7 @@
+ long uid = 0;
- if (osname != null) {
if (osname.startsWith("SunOS") ||
+ osname.startsWith("GNU/kFreeBSD") ||
(osname.startsWith("Linux"))) {
try {
- // Load the native code if necessary
---- openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2014-01-15 13:29:32.816570862 +0100
+ Class<?> c = Class.forName
+--- a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2014-04-02 13:17:35.000000000 +0200
@@ -178,6 +178,7 @@
} else {
headless = defaultHeadless =
@@ -1501,212 +1307,8 @@ Forwarded: no
"SunOS".equals(osName) ||
"FreeBSD".equals(osName) ||
"NetBSD".equals(osName) ||
---- openjdk/jdk/make/com/sun/nio/Makefile.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/make/com/sun/nio/Makefile 2014-01-15 13:29:32.792570687 +0100
-@@ -38,7 +38,7 @@
-
-
- all build clean clobber::
-- $(SUBDIRS-loop)
-+# $(SUBDIRS-loop)
-
- clean clobber::
-- $(RM) -r $(CLASSDESTDIR)/com/sun/nio
-+# $(RM) -r $(CLASSDESTDIR)/com/sun/nio
---- openjdk/jdk/make/java/nio/Makefile.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/make/java/nio/Makefile 2014-01-15 13:30:51.545149630 +0100
-@@ -94,6 +94,70 @@
-
- else
-
-+ifeq ($(SYSTEM_UNAME),GNU/kFreeBSD)
-+
-+FILES_java += \
-+ sun/nio/ch/AbstractPollSelectorImpl.java \
-+ sun/nio/ch/DevPollArrayWrapper.java \
-+ sun/nio/ch/DevPollSelectorImpl.java \
-+ sun/nio/ch/DevPollSelectorProvider.java \
-+ sun/nio/ch/InheritedChannel.java \
-+ sun/nio/ch/LinuxAsynchronousChannelProvider.java \
-+ sun/nio/ch/PollSelectorProvider.java \
-+ sun/nio/ch/PollSelectorImpl.java \
-+ sun/nio/ch/Port.java \
-+ sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
-+ sun/nio/ch/SolarisAsynchronousChannelProvider.java \
-+ sun/nio/ch/SolarisEventPort.java \
-+ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
-+ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
-+ \
-+ sun/nio/fs/GnomeFileTypeDetector.java \
-+ sun/nio/fs/LinuxDosFileAttributeView.java \
-+ sun/nio/fs/LinuxFileStore.java \
-+ sun/nio/fs/LinuxFileSystem.java \
-+ sun/nio/fs/LinuxFileSystemProvider.java \
-+ sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
-+ sun/nio/fs/LinuxNativeDispatcher.java \
-+ sun/nio/fs/PollingWatchService.java \
-+ sun/nio/fs/SolarisNativeDispatcher.java \
-+ sun/nio/fs/SolarisWatchService.java \
-+ sun/nio/fs/UnixChannelFactory.java \
-+ sun/nio/fs/UnixCopyFile.java \
-+ sun/nio/fs/UnixDirectoryStream.java \
-+ sun/nio/fs/UnixException.java \
-+ sun/nio/fs/UnixFileAttributeViews.java \
-+ sun/nio/fs/UnixFileAttributes.java \
-+ sun/nio/fs/UnixFileKey.java \
-+ sun/nio/fs/UnixFileModeAttribute.java \
-+ sun/nio/fs/UnixFileStore.java \
-+ sun/nio/fs/UnixFileStoreAttributes.java \
-+ sun/nio/fs/UnixFileSystem.java \
-+ sun/nio/fs/UnixFileSystemProvider.java \
-+ sun/nio/fs/UnixMountEntry.java \
-+ sun/nio/fs/UnixNativeDispatcher.java \
-+ sun/nio/fs/UnixPath.java \
-+ sun/nio/fs/UnixSecureDirectoryStream.java \
-+ sun/nio/fs/UnixUriUtils.java \
-+ sun/nio/fs/UnixUserPrincipals.java
-+
-+FILES_export += \
-+ sun/nio/ch/DevPollArrayWrapper.java \
-+ sun/nio/ch/InheritedChannel.java \
-+ sun/nio/ch/NativeThread.java \
-+ sun/nio/ch/SolarisEventPort.java \
-+ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
-+ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
-+ \
-+ sun/nio/fs/GnomeFileTypeDetector.java \
-+ sun/nio/fs/LinuxNativeDispatcher.java \
-+ sun/nio/fs/SolarisNativeDispatcher.java \
-+ sun/nio/fs/SolarisWatchService.java \
-+ sun/nio/fs/UnixCopyFile.java \
-+ sun/nio/fs/UnixNativeDispatcher.java
-+
-+else
-+
- FILES_java += \
- sun/nio/ch/AbstractPollSelectorImpl.java \
- sun/nio/ch/DevPollArrayWrapper.java \
-@@ -164,6 +228,8 @@
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixNativeDispatcher.java
-
-+endif # kFreeBSD
-+
- FILES_gen += \
- sun/nio/fs/UnixConstants.java
-
-@@ -172,7 +238,7 @@
- syscalls_fp.c
- endif
-
--endif
-+endif # else
-
- ifeq ($(PLATFORM), solaris)
-
-@@ -221,6 +287,22 @@
-
- ifeq ($(PLATFORM), linux)
-
-+ifeq ($(SYSTEM_UNAME),GNU/kFreeBSD)
-+
-+FILES_c += \
-+ InheritedChannel.c \
-+ NativeThread.c \
-+ PollArrayWrapper.c \
-+ UnixAsynchronousServerSocketChannelImpl.c \
-+ UnixAsynchronousSocketChannelImpl.c \
-+ \
-+ GnomeFileTypeDetector.c \
-+ LinuxNativeDispatcher.c \
-+ UnixCopyFile.c \
-+ UnixNativeDispatcher.c
-+
-+else
-+
- FILES_c += \
- EPoll.c \
- EPollArrayWrapper.c \
-@@ -237,6 +319,8 @@
- UnixCopyFile.c \
- UnixNativeDispatcher.c
-
-+endif # kFreeBSD
-+
- ifndef USE_SYSTEM_GIO
- FILES_c += \
- gio_fp.c
---- openjdk/jdk/make/common/shared/Sanity.gmk.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-01-15 13:29:32.792570687 +0100
-@@ -114,12 +114,14 @@
- elif [ -f /etc/lsb-release ] ; then \
- $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's at .*DISTRIB_RELEASE=\(.*\)@\1@'; \
- fi)
-+ifneq ($(SYSTEM_UNAME),GNU/kFreeBSD)
- ALSA_INCLUDE=/usr/include/alsa/version.h
- ALSA_LIBRARY=/usr/lib/libasound.so
- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
- $(SED) -e 's at .*"\(.*\)".*@\1@' )
- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
- endif
-+endif
-
- ifeq ($(PLATFORM), macosx)
- # What kind of system we are using
---- openjdk/jdk/make/common/shared/Defs-versions.gmk.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2014-01-15 13:29:32.792570687 +0100
-@@ -153,7 +153,9 @@
- REQUIRED_OS_VERSION = 2.6
- REQUIRED_OS_VARIANT_NAME = Fedora
- REQUIRED_OS_VARIANT_VERSION = 9
-- REQUIRED_ALSA_VERSION = 0.9.1
-+ifneq ($(SYSTEM_UNAME),GNU/kFreeBSD)
-+ REQUIRED_ALSA_VERSION = 0.9.1
-+endif
- REQUIRED_COMPILER_NAME = GCC4
- REQUIRED_COMPILER_VERSION = GCC4
- REQUIRED_GCC_VER = 2.95
---- openjdk/jdk/make/common/shared/Platform.gmk.orig 2014-01-15 10:57:03.733191937 +0100
-+++ openjdk/jdk/make/common/shared/Platform.gmk 2014-01-15 13:29:32.792570687 +0100
-@@ -152,7 +152,7 @@
- endif
-
- # Platform settings specific to Linux
--ifeq ($(SYSTEM_UNAME), Linux)
-+ifneq (,$(filter Linux GNU/kFreeBSD, $(SYSTEM_UNAME)))
- PLATFORM = linux
- # Arch and OS name/version
- ifdef CROSS_COMPILE_ARCH
---- openjdk/jdk/make/common/shared/Sanity-Settings.gmk.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk 2014-01-15 13:29:32.792570687 +0100
-@@ -186,8 +186,10 @@
- endif
- ifeq ($(PLATFORM),linux)
- ifdef REQUIRED_ALSA_VERSION
-+ ifneq ($(SYSTEM_UNAME),GNU/kFreeBSD)
- ALL_SETTINGS+=$(call addRequiredSetting,ALSA_VERSION)
- endif
-+ endif
- endif
- ALL_SETTINGS+=$(call addRequiredVersionSetting,OS_VERSION)
- ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_NAME)
---- openjdk/jdk/make/javax/sound/Makefile.orig 2014-01-14 22:26:36.000000000 +0100
-+++ openjdk/jdk/make/javax/sound/Makefile 2014-01-15 13:29:32.816570862 +0100
-@@ -105,10 +105,12 @@
- endif # PLATFORM win32
-
- ifeq ($(PLATFORM), linux)
-+ifneq ($(SYSTEM_UNAME),GNU/kFreeBSD)
- # ALSA handles directaudio, ports, and MIDI
- SUBDIRS += jsoundalsa
- EXTRA_SOUND_JNI_LIBS += jsoundalsa
- #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
-+endif # kFreeBSD
- endif # PLATFORM linux
-
- ifeq ($(PLATFORM), macosx)
---- openjdk/jdk/src/solaris/native/sun/net/portconfig.c 2014-01-28 18:02:26.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/sun/net/portconfig.c 2014-02-15 02:58:07.102243089 +0000
+--- a/jdk/src/solaris/native/sun/net/portconfig.c 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/native/sun/net/portconfig.c 2014-04-02 13:17:35.000000000 +0200
@@ -28,7 +28,7 @@
#include <unistd.h>
#include <errno.h>
@@ -1716,8 +1318,8 @@ Forwarded: no
#include <sys/sysctl.h>
#endif
-@@ -66,7 +66,7 @@
- range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
+@@ -67,7 +67,7 @@
+ range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port");
return 0;
}
-#elif defined(_ALLBSD_SOURCE)
@@ -1725,8 +1327,8 @@ Forwarded: no
{
int ret;
size_t size = sizeof(range->lower);
---- openjdk/jdk/src/solaris/classes/sun/net/PortConfig.java 2014-01-28 18:02:26.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/net/PortConfig.java 2014-02-15 21:57:57.534279073 +0000
+--- a/jdk/src/solaris/classes/sun/net/PortConfig.java 2014-04-02 13:17:35.000000000 +0200
++++ b/jdk/src/solaris/classes/sun/net/PortConfig.java 2014-04-02 13:17:35.000000000 +0200
@@ -55,6 +55,9 @@
} else if (os.contains("OS X")) {
defaultLower = 49152;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git
More information about the pkg-java-commits
mailing list