Author: aurel32 Date: 2010-09-01 07:36:11 +0000 (Wed, 01 Sep 2010) New Revision: 4397
Added: glibc-package/trunk/debian/patches/alpha/submitted-epoll.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: * Add alpha/submitted-epoll.diff and sparc/submitted-epoll.diff to fix epoll_create1() on Alpha and SPARC. Closes: #576826. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2010-08-31 22:09:53 UTC (rev 4396) +++ glibc-package/trunk/debian/changelog 2010-09-01 07:36:11 UTC (rev 4397) @@ -37,6 +37,8 @@ syscall on MIPS n32 and 64 ABI. * debian/control.in/libc: conflicts with prelink (<= 0.0.20090311-1). Earlier versions corrupts libc 2.11 libraries. Closes: #593966. + * Add alpha/submitted-epoll.diff and sparc/submitted-epoll.diff to fix + epoll_create1() on Alpha and SPARC. Closes: #576826. * Add any/cvs-sunrpc-license.diff from upstream to fix the license of Sun RPC: contrary to what Simon Phipps announced on his blog, and according to the lawyers, the copy in glibc wasn't contained in the Added: glibc-package/trunk/debian/patches/alpha/submitted-epoll.diff =================================================================== --- glibc-package/trunk/debian/patches/alpha/submitted-epoll.diff (rev 0) +++ glibc-package/trunk/debian/patches/alpha/submitted-epoll.diff 2010-09-01 07:36:11 UTC (rev 4397) @@ -0,0 +1,39 @@ +2010-08-31 Mike Frysinger <vap...@gentoo.org> + + * sysdeps/unix/sysv/linux/alpha/sys/epoll.h (epoll_create2): Delete. + (epoll_create1): Add. +--- + sysdeps/unix/sysv/linux/alpha/sys/epoll.h | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h b/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h +index 9f983a5..9177c31 100644 +--- a/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h ++++ b/ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2002-2006, 2007, 2008 Free Software Foundation, Inc. ++/* Copyright (C) 2002-2008, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -31,7 +31,7 @@ typedef __sigset_t sigset_t; + #endif + + +-/* Flags to be passed to epoll_create2. */ ++/* Flags to be passed to epoll_create1. */ + enum + { + EPOLL_CLOEXEC = 010000000, +@@ -101,8 +101,9 @@ __BEGIN_DECLS + returned by epoll_create() should be closed with close(). */ + extern int epoll_create (int __size) __THROW; + +-/* Same as epoll_create but with an additional FLAGS parameter. */ +-extern int epoll_create2 (int __size, int __flags) __THROW; ++/* Same as epoll_create but with an FLAGS parameter. The unused SIZE ++ parameter has been dropped. */ ++extern int epoll_create1 (int __flags) __THROW; + + + /* Manipulate an epoll instance "epfd". Returns 0 in case of success, Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2010-08-31 22:09:53 UTC (rev 4396) +++ glibc-package/trunk/debian/patches/series 2010-09-01 07:36:11 UTC (rev 4397) @@ -57,6 +57,7 @@ alpha/local-fcntl_h.diff alpha/cvs-longjmp-chk.diff alpha/local-lowlevellock.diff +alpha/submitted-epoll.diff alpha/submitted-syscall.diff amd64/local-biarch.diff @@ -167,6 +168,7 @@ sparc/local-sparcv9-target.diff sparc/submitted-timing.diff sparc/cvs-sparcv9-memchr.diff +sparc/submitted-epoll.diff sparc/submitted-msgrcv.diff all/local-alias-UTF-8.diff -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1oqhrl-0004bi...@alioth.debian.org