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