r5139 - in glibc-package/trunk/debian: . patches patches/alpha
Author: aurel32
Date: 2012-01-28 22:44:14 +0000 (Sat, 28 Jan 2012)
New Revision: 5139
Added:
glibc-package/trunk/debian/patches/alpha/submitted-epoll_create1.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/alpha/submitted-epoll_create1.diff: new patch from Mike
Frysinger to fix epoll_create1() on alpha.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-01-28 21:59:21 UTC (rev 5138)
+++ glibc-package/trunk/debian/changelog 2012-01-28 22:44:14 UTC (rev 5139)
@@ -15,6 +15,8 @@
* Update Polish debconf translation, by Michał Kułach. Closes: #657748.
* Update Spanish debconf translation, by Omar Campagne. Closes: #655850.
* Danish debconf translation update from Joe Hansen. Closes: #656681.
+ * patches/alpha/submitted-epoll_create1.diff: new patch from Mike
+ Frysinger to fix epoll_create1() on alpha.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-mmap.diff: New patch to fix iceweasel hang.
Added: glibc-package/trunk/debian/patches/alpha/submitted-epoll_create1.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/submitted-epoll_create1.diff (rev 0)
+++ glibc-package/trunk/debian/patches/alpha/submitted-epoll_create1.diff 2012-01-28 22:44:14 UTC (rev 5139)
@@ -0,0 +1,51 @@
+From feed50101967bd7b97762d68a3b592d9798e6eb2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 31 Aug 2010 16:06:02 -0400
+Subject: [PATCH 1/2] linux/alpha: convert from epoll_create2 to epoll_create1
+
+Alpha's epoll.h was missed when epoll_create2 was changed to epoll_create1.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+2010-08-31 Mike Frysinger <vapier@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/sysdeps/unix/sysv/linux/alpha/sys/epoll.h b/sysdeps/unix/sysv/linux/alpha/sys/epoll.h
+index 9f983a5..9177c31 100644
+--- a/sysdeps/unix/sysv/linux/alpha/sys/epoll.h
++++ b/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,
+--
+1.7.6
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2012-01-28 21:59:21 UTC (rev 5138)
+++ glibc-package/trunk/debian/patches/series 2012-01-28 22:44:14 UTC (rev 5139)
@@ -64,6 +64,7 @@
alpha/submitted-sysconf-cache.diff
alpha/submitted-statfs64.patch
alpha/submitted-fallocated.diff
+alpha/submitted-epoll_create1.diff
amd64/local-biarch.diff
amd64/local-clone.diff
Reply to: