[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2796 - in glibc-package/trunk/debian: . patches patches/any



Author: aurel32
Date: 2008-01-31 01:52:43 +0000 (Thu, 31 Jan 2008)
New Revision: 2796

Added:
   glibc-package/trunk/debian/patches/any/cvs-epoll_h.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * patches/any/cvs-epoll_h.diff: new patch from CVS to define EPOLLRDHUP
    in /usr/include/sys/epoll.h. Closes: #463342.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2008-01-27 19:12:09 UTC (rev 2795)
+++ glibc-package/trunk/debian/changelog	2008-01-31 01:52:43 UTC (rev 2796)
@@ -17,8 +17,10 @@
   * patches/mips/submitted-mipsn32.diff: new patch to fix truncate64()
     on MIPS n32.
   * kfreebsd/local-sysdeps.diff: update to revision 2117 (from glibc-bsd).
+  * patches/any/cvs-epoll_h.diff: new patch from CVS to define EPOLLRDHUP
+    in /usr/include/sys/epoll.h. Closes: #463342.
 
- -- Aurelien Jarno <aurel32@debian.org>  Sun, 27 Jan 2008 20:11:39 +0100
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 31 Jan 2008 02:51:37 +0100
 
 glibc (2.7-6) unstable; urgency=low
 

Added: glibc-package/trunk/debian/patches/any/cvs-epoll_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-epoll_h.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-epoll_h.diff	2008-01-31 01:52:43 UTC (rev 2796)
@@ -0,0 +1,57 @@
+2008-01-12  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #5040]
+	* sysdeps/unix/sysv/linux/x86_64/sys/epoll.h (enum EPOLL_EVENTS):
+	Add EPOLLRDHUP.
+
+2007-10-27  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #5040]
+	* sysdeps/unix/sysv/linux/sys/epoll.h (EPOLLRDHUP): Add value.
+
+Index: sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -d -p -r1.4 -r1.5
+--- sysdeps/unix/sysv/linux/x86_64/sys/epoll.h	21 May 2007 18:23:01 -0000	1.4
++++ sysdeps/unix/sysv/linux/x86_64/sys/epoll.h	21 Jan 2008 21:19:51 -0000	1.5
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
++/* Copyright (C) 2002,2003,2004,2005,2006,2007,2008 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
+@@ -53,6 +53,8 @@ enum EPOLL_EVENTS
+ #define EPOLLERR EPOLLERR
+     EPOLLHUP = 0x010,
+ #define EPOLLHUP EPOLLHUP
++    EPOLLRDHUP = 0x2000,
++#define EPOLLRDHUP EPOLLRDHUP
+     EPOLLONESHOT = (1 << 30),
+ #define EPOLLONESHOT EPOLLONESHOT
+     EPOLLET = (1 << 31)
+Index: sysdeps/unix/sysv/linux/sys/epoll.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sys/epoll.h,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -d -p -r1.6 -r1.7
+--- sysdeps/unix/sysv/linux/sys/epoll.h	11 Oct 2006 20:19:15 -0000	1.6
++++ sysdeps/unix/sysv/linux/sys/epoll.h	28 Oct 2007 01:33:44 -0000	1.7
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++/* Copyright (C) 2002-2006, 2007 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
+@@ -53,6 +53,8 @@ enum EPOLL_EVENTS
+ #define EPOLLERR EPOLLERR
+     EPOLLHUP = 0x010,
+ #define EPOLLHUP EPOLLHUP
++    EPOLLRDHUP = 0x2000,
++#define EPOLLRDHUP EPOLLRDHUP
+     EPOLLONESHOT = (1 << 30),
+ #define EPOLLONESHOT EPOLLONESHOT
+     EPOLLET = (1 << 31)

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2008-01-27 19:12:09 UTC (rev 2795)
+++ glibc-package/trunk/debian/patches/series	2008-01-31 01:52:43 UTC (rev 2796)
@@ -125,6 +125,7 @@
 all/local-remove-manual.diff
 all/local-ru_RU.diff 
 
+any/cvs-epoll_h.diff -p0
 any/cvs-ether_line.diff -p0
 any/cvs-fchmodat.diff -p1
 any/cvs-iconv-iso2022jp-loop-bug.diff


Reply to: