patches/glibc/2.9/320-2.9-assume-pipe2.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Oct 03 23:10:46 2010 +0200 (2010-10-03)
changeset 2130 b46ecc90d3ab
parent 1201 c9967a6e3b25
permissions -rw-r--r--
complibs: better deduce whether to backup complibs or not

To decide whether we need to backup the companion libraries,
do not rely on the !shared case. In the future other cases
may require not to save the companion libraries (eg. if using
the ones provided by the host distro).

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