/hg/release/icedtea6-1.6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 77b720a556d3 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=77b720a556d3
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 21 09:22:50 2010 +0100

	Fix use of fstatat in NIO2 on architectures other than x86 and
	x86_64.

	2010-07-20 Andrew John Hughes <ahughes at redhat.com>

	 * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/Un
	ixNativeDispatcher.c: Define _ATFILE_SOURCE to obtain
	fstatat64, regardless of architecture.


changeset 5ff85a33bb11 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=5ff85a33bb11
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 21 09:30:05 2010 +0100

	Turn off plugin by default and warn about its use.

	2010-07-21 Andrew John Hughes <ahughes at redhat.com>

	 * configure.ac: Turn off plugin by default and warn
	about its use.


diffstat:

3 files changed, 25 insertions(+), 30 deletions(-)
ChangeLog                                                                      |   12 ++-
configure.ac                                                                   |    6 +
overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c |   37 ++--------

diffs (102 lines):

diff -r f5cff4063cf3 -r 5ff85a33bb11 ChangeLog
--- a/ChangeLog	Fri Jul 16 16:56:44 2010 -0400
+++ b/ChangeLog	Wed Jul 21 09:30:05 2010 +0100
@@ -1,7 +1,17 @@ 2010-07-15  Deepak Bhole <dbhole at redhat.
+2010-07-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* configure.ac:
+	Turn off plugin by default and warn about its use.
+
+2010-07-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c:
+	Define _ATFILE_SOURCE to obtain fstatat64, regardless of architecture.
+
 2010-07-15  Deepak Bhole <dbhole at redhat.com>
 
 	* patches/openjdk/6678385.patch: Revert behaviour of isOverrideRedirect to
-	always return false, since XToolKit does not support isOverrideRedirect (as 
+	always return false, since XToolKit does not support isOverrideRedirect (as
 	upstream patch assumes).
 
 2010-07-16  Deepak Bhole <dbhole at redhat.com>
diff -r f5cff4063cf3 -r 5ff85a33bb11 configure.ac
--- a/configure.ac	Fri Jul 16 16:56:44 2010 -0400
+++ b/configure.ac	Wed Jul 21 09:30:05 2010 +0100
@@ -95,9 +95,13 @@ AC_ARG_ENABLE([plugin],
 AC_ARG_ENABLE([plugin],
               [AS_HELP_STRING([--disable-plugin],
                               [Disable compilation of browser plugin])],
-              [enable_plugin="${enableval}"], [enable_plugin="yes"])
+              [enable_plugin="${enableval}"], [enable_plugin="no"])
 AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
 AC_MSG_RESULT(${enable_plugin})
+
+if test "x${enable_plugin}" = "xyes"; then
+  AC_MSG_WARN([The plugin supplied with IcedTea6 ${PACKAGE_VERSION} is no longer maintained.  Please upgrade to IcedTea6 1.7.3 or later for plugin support.])
+fi
 
 AC_MSG_CHECKING([whether to build the new experimental browser plugin based on npruntime])
 AC_ARG_ENABLE([npplugin],
diff -r f5cff4063cf3 -r 5ff85a33bb11 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
--- a/overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c	Fri Jul 16 16:56:44 2010 -0400
+++ b/overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c	Wed Jul 21 09:30:05 2010 +0100
@@ -22,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+/**
+ * fstatat in glibc requires _ATFILE_SOURCE to be defined.
+ */
+#if defined(__linux__)
+#define _ATFILE_SOURCE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -102,32 +109,6 @@ static fdopendir_func* my_fdopendir_func
 static fdopendir_func* my_fdopendir_func = NULL;
 
 /**
- * fstatat missing from glibc on Linux. Temporary workaround
- * for x86/x64, will fail to compile on other architectures.
- */
-#if defined(__linux__) && defined(__i386)
-static int fstatat64_wrapper(int dfd, const char *path,
-                             struct stat64 *statbuf, int flag)
-{
-    #ifndef __NR_fstatat64
-    #define __NR_fstatat64  300
-    #endif
-    return syscall(__NR_fstatat64, dfd, path, statbuf, flag);
-}
-#endif
-
-#if defined(__linux__) && defined(__x86_64__)
-static int fstatat64_wrapper(int dfd, const char *path,
-                             struct stat64 *statbuf, int flag)
-{
-    #ifndef __NR_newfstatat
-    #define __NR_newfstatat  262
-    #endif
-    return syscall(__NR_newfstatat, dfd, path, statbuf, flag);
-}
-#endif
-
-/**
  * Call this to throw an internal UnixException when a system/library
  * call fails
  */
@@ -198,9 +179,9 @@ Java_sun_nio_fs_UnixNativeDispatcher_ini
     my_fdopendir_func = (fdopendir_func*) dlsym(RTLD_DEFAULT, "fdopendir");
 
 #if defined(__linux__)
-    /* fstatat64 missing from glibc */
+    /* fstatat64 from glibc requires a define */
     if (my_fstatat64_func == NULL)
-        my_fstatat64_func = (fstatat64_func*)&fstatat64_wrapper;
+        my_fstatat64_func = (fstatat64_func*)&fstatat64;
 #endif
 }