From bdb248dcb276bd324bd1c3c54997ead5704ee9ae Mon Sep 17 00:00:00 2001 From: glewis Date: Sat, 9 Sep 2006 02:10:02 +0000 Subject: . Prevent problems opening RandomAccessFile with "rws" as the mode by defining O_SYNC and O_DSYNC if they aren't defined. In particular we were previously defining O_SYNC bogusly to the same value as O_EXCL. PR not closed as this fixes jdk15, not diablo-jdk15. PR: 102888 --- java/jdk15/Makefile | 2 +- java/jdk15/files/patch-j2se::io::io_util.h | 21 +++++++++++++++++++++ java/jdk16/Makefile | 2 +- java/jdk16/files/patch-j2se::io::io_util.h | 21 +++++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 java/jdk15/files/patch-j2se::io::io_util.h create mode 100644 java/jdk16/files/patch-j2se::io::io_util.h (limited to 'java') diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index a0f3a06..a428d97 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk15.html diff --git a/java/jdk15/files/patch-j2se::io::io_util.h b/java/jdk15/files/patch-j2se::io::io_util.h new file mode 100644 index 0000000..0230858 --- /dev/null +++ b/java/jdk15/files/patch-j2se::io::io_util.h @@ -0,0 +1,21 @@ +$FreeBSD$ + +--- ../../j2se/src/share/native/java/io/io_util.h 8 Nov 2004 22:27:35 -0000 1.1.1.1 ++++ ../../j2se/src/share/native/java/io/io_util.h 7 Sep 2006 19:40:19 -0000 +@@ -11,7 +11,15 @@ + extern jfieldID IO_fd_fdID; + extern jfieldID IO_handle_fdID; + +-#if !defined(O_DSYNC) || !defined(O_SYNC) ++#ifdef _ALLBSD_SOURCE ++#include ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++#ifndef O_DSYNC ++#define O_DSYNC O_FSYNC ++#endif ++#elif !defined(O_DSYNC) || !defined(O_SYNC) + #define O_SYNC (0x0800) + #define O_DSYNC (0x2000) + #endif diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index a0f3a06..a428d97 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk15.html diff --git a/java/jdk16/files/patch-j2se::io::io_util.h b/java/jdk16/files/patch-j2se::io::io_util.h new file mode 100644 index 0000000..0230858 --- /dev/null +++ b/java/jdk16/files/patch-j2se::io::io_util.h @@ -0,0 +1,21 @@ +$FreeBSD$ + +--- ../../j2se/src/share/native/java/io/io_util.h 8 Nov 2004 22:27:35 -0000 1.1.1.1 ++++ ../../j2se/src/share/native/java/io/io_util.h 7 Sep 2006 19:40:19 -0000 +@@ -11,7 +11,15 @@ + extern jfieldID IO_fd_fdID; + extern jfieldID IO_handle_fdID; + +-#if !defined(O_DSYNC) || !defined(O_SYNC) ++#ifdef _ALLBSD_SOURCE ++#include ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++#ifndef O_DSYNC ++#define O_DSYNC O_FSYNC ++#endif ++#elif !defined(O_DSYNC) || !defined(O_SYNC) + #define O_SYNC (0x0800) + #define O_DSYNC (0x2000) + #endif -- cgit v1.1