r4423 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2010-09-14 13:03:04 +0000 (Tue, 14 Sep 2010)
New Revision: 4423
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads29.diff
Log:
* kfreebsd/local-linuxthreads29.diff: correctly disable SO_CLOEXEC
support when it is not available. Closes: #596367.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-09-13 21:43:26 UTC (rev 4422)
+++ glibc-package/trunk/debian/changelog 2010-09-14 13:03:04 UTC (rev 4423)
@@ -4,12 +4,14 @@
* Update Arabic debconf translation, by Ossama Khayat. Closes: #596161.
* libc6-i386: remplace <= breaks by << breaks now that the transitioned
version of the packages is known. Closes: #566720.
+ * kfreebsd/local-linuxthreads29.diff: correctly disable SO_CLOEXEC
+ support when it is not available. Closes: #596367.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-catch-signal.diff: New patch to fix
signal-catching functions.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 13 Sep 2010 23:40:49 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 14 Sep 2010 14:59:43 +0200
eglibc (2.11.2-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads29.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads29.diff 2010-09-13 21:43:26 UTC (rev 4422)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads29.diff 2010-09-14 13:03:04 UTC (rev 4423)
@@ -11,10 +11,12 @@
/* Create the socket. */
#ifndef __ASSUME_SOCK_CLOEXEC
sock = -1;
-@@ -885,6 +886,7 @@
+@@ -885,6 +886,9 @@
have_sock_cloexec = sock != -1 || errno != EINVAL ? 1 : -1;
#endif
}
++#else
++have_sock_cloexec = -1;
+#endif
#ifndef __ASSUME_SOCK_CLOEXEC
if (have_sock_cloexec < 0)
Reply to: