r3520 - in glibc-package/branches/eglibc-2.10/debian: . patches patches/any
Author: aurel32
Date: 2009-05-21 21:55:02 +0000 (Thu, 21 May 2009)
New Revision: 3520
Added:
glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
* Add debian/patches/any/submitted-accept4.diff to fix nscd on non-amd64
architectures.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-21 21:37:06 UTC (rev 3519)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-21 21:55:02 UTC (rev 3520)
@@ -72,6 +72,10 @@
debian/patches/alpha/submitted-includes.diff and
debian/patches/alpha/submitted-lowlevellock.diff to partially fix FTBFS
on alpha.
+ * Add debian/patches/ia64/submitted-memchr.diff to fix memchr() when
+ crossing page boundaries on ia64.
+ * Add debian/patches/any/submitted-accept4.diff to fix nscd on non-amd64
+ architectures.
-- Aurelien Jarno <aurel32@debian.org> Sun, 10 May 2009 15:03:39 +0200
Added: glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff 2009-05-21 21:55:02 UTC (rev 3520)
@@ -0,0 +1,33 @@
+288 is x86_64 specific, so either has to be surrounded by #ifdef __x86_64__,
+moved into linux/x86_64/ subdir or better yet not defined at all, it is
+kernel headers responsibility to define it.
+
+Without this nscd is very much broken on ppc, because 288 is mknodat, which
+will return -EFAULT with the arguments nscd calls it.
+
+2009-05-21 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/accept4.c (__NR_accept4): Don't define.
+
+diff --git a/sysdeps/unix/sysv/linux/accept4.c b/sysdeps/unix/sysv/linux/accept4.c
+index 97f7b8c..4be710f 100644
+--- a/sysdeps/unix/sysv/linux/accept4.c
++++ b/sysdeps/unix/sysv/linux/accept4.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2008 Free Software Foundation, Inc.
++/* Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2008.
+
+@@ -24,8 +24,6 @@
+ #include <sysdep-cancel.h>
+ #include <sys/syscall.h>
+
+-#define __NR_accept4 288
+-
+
+ #ifdef __NR_accept4
+ int
+
+ Jakub
+
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-21 21:37:06 UTC (rev 3519)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-21 21:55:02 UTC (rev 3520)
@@ -91,6 +91,7 @@
hurd-i386/submitted-itimer-lock.diff
hurd-i386/local-pthread_types.diff
+ia64/submitted-memchr.diff
ia64/submitted-sysconf.diff
i386/local-biarch.diff
@@ -178,3 +179,4 @@
any/submitted-autotools.diff
any/cvs-sunrpc-license.diff
any/submitted-tst-cpucount.diff
+any/submitted-accept4.diff
Reply to: