patches/glibc/ports-2.10.1/260-assume-pipe2.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 17 23:06:02 2010 +0100 (2010-01-17)
changeset 1740 c57458bb354d
permissions -rw-r--r--
configure: do not require hg when configuring in an hg clone

When configuring in an hg clone, we need hg to compute the version string.
It can happen that users do not have Mercurial (eg. if they got a snapshot
rather that they did a full clone). In this case, we can still run, of
course, so simply fill the version string with a sufficiently explicit
value, that does not require hg. The date is a good candidate.
yann@1625
     1
http://bugs.gentoo.org/250342
yann@1625
     2
http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
yann@1625
     3
yann@1625
     4
we cant assume sock_cloexec and pipe2 are bound together as the former defines
yann@1625
     5
are found in glibc only while the latter are a combo of kernel headers and
yann@1625
     6
glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
yann@1625
     7
inside of glibc, we hit a problem.  for example:
yann@1625
     8
yann@1625
     9
#include <grp.h>
yann@1625
    10
#include <stdio.h>
yann@1625
    11
main()
yann@1625
    12
{
yann@1625
    13
	getgrnam("portage");
yann@1625
    14
	if (!popen("ls", "r"))
yann@1625
    15
		perror("popen()");
yann@1625
    16
}
yann@1625
    17
yann@1625
    18
getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
yann@1625
    19
__have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
yann@1625
    20
older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
yann@1625
    21
stub for it.  so popen() will always fail as glibc assumes pipe2() works.
yann@1625
    22
yann@1625
    23
diff -durN glibc-2.10.1.orig/include/unistd.h glibc-2.10.1/include/unistd.h
yann@1625
    24
--- glibc-2.10.1.orig/include/unistd.h	2008-07-27 20:23:17.000000000 +0200
yann@1625
    25
+++ glibc-2.10.1/include/unistd.h	2009-11-13 00:50:15.000000000 +0100
yann@1625
    26
@@ -167,9 +167,6 @@
yann@1625
    27
 extern int __pause_nocancel (void) attribute_hidden;
yann@1625
    28
 
yann@1625
    29
 extern int __have_sock_cloexec;
yann@1625
    30
-/* At lot of other functionality became available at the same time as
yann@1625
    31
-   SOCK_CLOEXEC.  Avoid defining separate variables for all of them
yann@1625
    32
-   unless it is really necessary.  */
yann@1625
    33
-#define __have_pipe2 __have_sock_cloexec
yann@1625
    34
+extern int __have_pipe2;
yann@1625
    35
 
yann@1625
    36
 #endif
yann@1625
    37
diff -durN glibc-2.10.1.orig/socket/have_sock_cloexec.c glibc-2.10.1/socket/have_sock_cloexec.c
yann@1625
    38
--- glibc-2.10.1.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
yann@1625
    39
+++ glibc-2.10.1/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
yann@1625
    40
@@ -16,9 +16,14 @@
yann@1625
    41
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
yann@1625
    42
    02111-1307 USA.  */
yann@1625
    43
 
yann@1625
    44
+#include <fcntl.h>
yann@1625
    45
 #include <sys/socket.h>
yann@1625
    46
 #include <kernel-features.h>
yann@1625
    47
 
yann@1625
    48
 #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
yann@1625
    49
 int __have_sock_cloexec;
yann@1625
    50
 #endif
yann@1625
    51
+
yann@1625
    52
+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
yann@1625
    53
+int __have_pipe2;
yann@1625
    54
+#endif