yann@1365: Original patch from: gentoo/src/patchsets/glibc/2.9/1095_all_glibc-2.9-assume-pipe2.patch
yann@1365: 
yann@1365: -= BEGIN original header =-
yann@1365: http://bugs.gentoo.org/250342
yann@1365: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
yann@1365: 
yann@1365: we cant assume sock_cloexec and pipe2 are bound together as the former defines
yann@1365: are found in glibc only while the latter are a combo of kernel headers and
yann@1365: glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
yann@1365: inside of glibc, we hit a problem.  for example:
yann@1365: 
yann@1365: #include <grp.h>
yann@1365: #include <stdio.h>
yann@1365: main()
yann@1365: {
yann@1365: 	getgrnam("portage");
yann@1365: 	if (!popen("ls", "r"))
yann@1365: 		perror("popen()");
yann@1365: }
yann@1365: 
yann@1365: getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
yann@1365: __have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
yann@1365: older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
yann@1365: stub for it.  so popen() will always fail as glibc assumes pipe2() works.
yann@1365: 
yann@1365: -= END original header =-
yann@1365: 
yann@1365: diff -durN glibc-2_9.orig/include/unistd.h glibc-2_9/include/unistd.h
yann@1365: --- glibc-2_9.orig/include/unistd.h	2008-07-27 20:23:17.000000000 +0200
yann@1365: +++ glibc-2_9/include/unistd.h	2009-02-02 22:01:05.000000000 +0100
yann@1365: @@ -167,9 +167,6 @@
yann@1365:  extern int __pause_nocancel (void) attribute_hidden;
yann@1365:  
yann@1365:  extern int __have_sock_cloexec;
yann@1365: -/* At lot of other functionality became available at the same time as
yann@1365: -   SOCK_CLOEXEC.  Avoid defining separate variables for all of them
yann@1365: -   unless it is really necessary.  */
yann@1365: -#define __have_pipe2 __have_sock_cloexec
yann@1365: +extern int __have_pipe2;
yann@1365:  
yann@1365:  #endif
yann@1365: diff -durN glibc-2_9.orig/socket/have_sock_cloexec.c glibc-2_9/socket/have_sock_cloexec.c
yann@1365: --- glibc-2_9.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
yann@1365: +++ glibc-2_9/socket/have_sock_cloexec.c	2009-02-02 22:01:05.000000000 +0100
yann@1365: @@ -16,9 +16,14 @@
yann@1365:     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
yann@1365:     02111-1307 USA.  */
yann@1365:  
yann@1365: +#include <fcntl.h>
yann@1365:  #include <sys/socket.h>
yann@1365:  #include <kernel-features.h>
yann@1365:  
yann@1365:  #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
yann@1365:  int __have_sock_cloexec;
yann@1365:  #endif
yann@1365: +
yann@1365: +#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
yann@1365: +int __have_pipe2;
yann@1365: +#endif