r3702 - in glibc-package/branches/eglibc-2.10/debian: . patches patches/any
Author: aurel32
Date: 2009-07-26 23:25:56 +0000 (Sun, 26 Jul 2009)
New Revision: 3702
Added:
glibc-package/branches/eglibc-2.10/debian/patches/any/cvs-accept4.diff
Removed:
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:
Replace patches/any/submitted-accept4.diff by upstream version
any/cvs-accept4.diff.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-26 23:22:09 UTC (rev 3701)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-26 23:25:56 UTC (rev 3702)
@@ -83,7 +83,7 @@
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
+ * Add debian/patches/any/cvs-accept4.diff to fix nscd on non-amd64
architectures.
* Add debian/patches/any/local-linuxthreads-unwind.diff to fix exception
handling with linuxthreads.
Copied: glibc-package/branches/eglibc-2.10/debian/patches/any/cvs-accept4.diff (from rev 3700, glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff)
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/cvs-accept4.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/cvs-accept4.diff 2009-07-26 23:25:56 UTC (rev 3702)
@@ -0,0 +1,25 @@
+2009-05-21 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/accept4.c (__NR_accept4): Don't define.
+
+---
+ sysdeps/unix/sysv/linux/accept4.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- 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
Deleted: glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff 2009-07-26 23:22:09 UTC (rev 3701)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-accept4.diff 2009-07-26 23:25:56 UTC (rev 3702)
@@ -1,32 +0,0 @@
-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.
-
----
- sysdeps/unix/sysv/linux/accept4.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- 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
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-07-26 23:22:09 UTC (rev 3701)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-07-26 23:25:56 UTC (rev 3702)
@@ -188,7 +188,7 @@
any/submitted-autotools.diff
any/cvs-sunrpc-license.diff
any/submitted-tst-cpucount.diff
-any/submitted-accept4.diff
+any/cvs-accept4.diff
any/cvs-nptl-init.diff
any/submitted-accept4-hidden.diff
any/submitted-nptl_db-symbols.diff
Reply to: