[Glibc-bsd-commits] r2267 - in trunk: glibc-ports/kfreebsd/bits kfreebsd-7/debian kfreebsd-7/debian/patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-07-31 07:21:13 +0000 (Thu, 31 Jul 2008)
New Revision: 2267

Added:
   trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff
Modified:
   trunk/glibc-ports/kfreebsd/bits/siginfo.h
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/series
Log:
* redefine POLL_HUP to be distinct from POLL_ERR



Modified: trunk/glibc-ports/kfreebsd/bits/siginfo.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/siginfo.h	2008-07-30 06:01:13 UTC (rev 2266)
+++ trunk/glibc-ports/kfreebsd/bits/siginfo.h	2008-07-31 07:21:13 UTC (rev 2267)
@@ -173,9 +173,10 @@
 # define POLL_MSG	POLL_MSG
   POLL_ERR,			/* I/O error.  */
 # define POLL_ERR	POLL_ERR
-# define POLL_HUP	POLL_ERR /* Device disconnected.  */
-  POLL_PRI			/* High priority input available.  */
+  POLL_PRI,			/* High priority input available.  */
 # define POLL_PRI	POLL_PRI
+  POLL_HUP			/* Device disconnected.  */
+# define POLL_HUP	POLL_HUP
 };
 
 # undef __need_siginfo_t

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2008-07-30 06:01:13 UTC (rev 2266)
+++ trunk/kfreebsd-7/debian/changelog	2008-07-31 07:21:13 UTC (rev 2267)
@@ -1,4 +1,4 @@
-kfreebsd-7 (7.1~cvs20080717-1) EXPERIMENTAL; urgency=low
+kfreebsd-7 (7.1~cvs20080731-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of RELENG_7
@@ -10,6 +10,7 @@
   * Do not specify SMP in GENERIC, it is enabled on per flavour basis
   * Ship config file used for building corresponding flavour
   * libdb-dev is now a real package, build-depend only on it.
+  * redefine POLL_HUP to be distinct from POLL_ERR
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu, 17 Jul 2008 11:11:11 +0200
 

Added: trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff	                        (rev 0)
+++ trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff	2008-07-31 07:21:13 UTC (rev 2267)
@@ -0,0 +1,21 @@
+
+POLL_ERR and POLL_HUP are defined identically, looks like a typo,
+The same value causes problems for "case POLL_ERR:", "case POLL_HUP:" handling.
+It doesn't look like kernel generates these codes so far.
+
+http://www.freebsd.org/cgi/query-pr.cgi?pr=126076
+
+
+Index: sys/sys/signal.h
+===================================================================
+--- sys/sys/signal.h.orig
++++ sys/sys/signal.h
+@@ -284,7 +284,7 @@
+ #define POLL_MSG	3	/* Input message available		*/
+ #define POLL_ERR	4	/* I/O Error				*/
+ #define POLL_PRI	5	/* High priority input available	*/
+-#define POLL_HUP	4	/* Device disconnected			*/
++#define POLL_HUP	6	/* Device disconnected			*/
+ 
+ #endif
+ 

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2008-07-30 06:01:13 UTC (rev 2266)
+++ trunk/kfreebsd-7/debian/patches/series	2008-07-31 07:21:13 UTC (rev 2267)
@@ -10,6 +10,7 @@
 017_oss_compat.diff -p0
 020_linker.diff -p0
 101_subsecond_timestamp.diff -p0
+102_POLL_HUP.diff -p0
 902_version.diff -p0
 903_disable_non-free_drivers.diff -p0
 904_dev_full.diff -p0