r2687 - in glibc-package/branches/glibc-2.7/debian: . patches patches/hurd-i386
Author: sthibaul-guest
Date: 2007-11-18 23:06:57 +0000 (Sun, 18 Nov 2007)
New Revision: 2687
Added:
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-O_CLOEXEC_fix.diff
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
hurd-i386/cvs-O_CLOEXEC_fix.diff: New patch to fix conflicting O_CLOEXEC value.
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-11-18 21:13:00 UTC (rev 2686)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-11-18 23:06:57 UTC (rev 2687)
@@ -148,6 +148,8 @@
[ Samuel Thibault ]
* hurd-i386/submitted-ptr-mangle.diff: Define PTR_MANGLE for assembly.
+ * hurd-i386/cvs-O_CLOEXEC_fix.diff: New patch to fix conflicting O_CLOEXEC
+ value.
-- Aurelien Jarno <aurel32@debian.org> Sun, 18 Nov 2007 22:11:35 +0100
Added: glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-O_CLOEXEC_fix.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-O_CLOEXEC_fix.diff (rev 0)
+++ glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-O_CLOEXEC_fix.diff 2007-11-18 23:06:57 UTC (rev 2687)
@@ -0,0 +1,26 @@
+Index: sysdeps/mach/hurd/bits/fcntl.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/bits/fcntl.h,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -p -r1.13 -r1.14
+--- a/sysdeps/mach/hurd/bits/fcntl.h 17 Oct 2007 22:32:35 -0000 1.13
++++ b/sysdeps/mach/hurd/bits/fcntl.h 18 Nov 2007 22:51:16 -0000 1.14
+@@ -71,7 +71,6 @@
+ #define O_SYNC O_FSYNC
+ #ifdef __USE_GNU
+ # define O_NOATIME 0x0800 /* Don't set access time on read (owner). */
+-# define O_CLOEXEC 0x00010000 /* Set FD_CLOEXEC. */
+ #endif
+ #ifdef __USE_MISC
+ # define O_SHLOCK 0x00020000 /* Open with shared file lock. */
+@@ -118,6 +117,9 @@
+ once the file has been opened. */
+
+ #define O_TRUNC 0x00010000 /* Truncate file to zero length. */
++#ifdef __USE_GNU
++# define O_CLOEXEC 0x00400000 /* Set FD_CLOEXEC. */
++#endif
+
+
+ /* Controlling terminal flags. These are understood only by `open',
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-11-18 21:13:00 UTC (rev 2686)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-11-18 23:06:57 UTC (rev 2687)
@@ -93,6 +93,7 @@
hurd-i386/cvs-ECANCELED.diff
hurd-i386/cvs-kernel-features.diff -p1
hurd-i386/submitted-IPV6_PKTINFO.diff
+hurd-i386/cvs-O_CLOEXEC_fix.diff
i386/local-biarch.diff
i386/local-cmov.diff -p0
Reply to: