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

r2977 - in glibc-package/trunk/debian: . patches patches/hurd-i386



Author: sthibaul-guest
Date: 2008-07-02 23:39:33 +0000 (Wed, 02 Jul 2008)
New Revision: 2977

Added:
   glibc-package/trunk/debian/patches/hurd-i386/cvs-MSG_NOSIGNAL.diff
   glibc-package/trunk/debian/patches/hurd-i386/cvs-mig-init.diff
Removed:
   glibc-package/trunk/debian/patches/hurd-i386/submitted-mig-init.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/hurd-i386/local-msg-nosignal.diff
   glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff
   glibc-package/trunk/debian/patches/series
   glibc-package/trunk/debian/patches/series.hurd-i386
Log:
  * patches/hurd-i386/cvs-MSG_NOSIGNAL.diff: New patch to implement
    MSG_NOSIGNAL.
  * patches/hurd-i386/local-msg-nosignal.diff: Forcibly set MSG_NOSIGNAL to 0
    until pfinet gets recompiled.  Only apply on hurd-i386.
  * submitted-mig-init.diff got commited, renamed to cvs-mig-init.diff


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2008-06-25 08:57:13 UTC (rev 2976)
+++ glibc-package/trunk/debian/changelog	2008-07-02 23:39:33 UTC (rev 2977)
@@ -9,6 +9,12 @@
     headers.
   * kfreebsd/local-sysdeps.diff: update to revision 2201 (from glibc-bsd).
 
+  [ Samuel Thibault ]
+  * patches/hurd-i386/cvs-MSG_NOSIGNAL.diff: New patch to implement
+    MSG_NOSIGNAL.
+  * patches/hurd-i386/local-msg-nosignal.diff: Forcibly set MSG_NOSIGNAL to 0
+    until pfinet gets recompiled.  Only apply on hurd-i386.
+
  -- Aurelien Jarno <aurel32@debian.org>  Tue, 24 Jun 2008 11:36:17 +0200
 
 glibc (2.7-12) unstable; urgency=low

Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-MSG_NOSIGNAL.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-MSG_NOSIGNAL.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-MSG_NOSIGNAL.diff	2008-07-02 23:39:33 UTC (rev 2977)
@@ -0,0 +1,167 @@
+Index: sysdeps/unix/bsd/bsd4.4/bits/socket.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h,v
+retrieving revision 1.8
+diff -u -p -r1.8 socket.h
+--- sysdeps/unix/bsd/bsd4.4/bits/socket.h	11 Oct 2007 16:32:14 -0000	1.8
++++ sysdeps/unix/bsd/bsd4.4/bits/socket.h	1 Jul 2008 21:37:10 -0000
+@@ -171,8 +171,10 @@ enum
+ #define MSG_CTRUNC MSG_CTRUNC
+     MSG_WAITALL		= 0x40,	/* Wait for full request or error.  */
+ #define MSG_WAITALL MSG_WAITALL
+-    MSG_DONTWAIT	= 0x80	/* This message should be nonblocking.  */
++    MSG_DONTWAIT	= 0x80,	/* This message should be nonblocking.  */
+ #define MSG_DONTWAIT MSG_DONTWAIT
++    MSG_NOSIGNAL	= 0x0400	/* Do not generate SIGPIPE on EPIPE.  */
++#define MSG_NOSIGNAL MSG_NOSIGNAL
+   };
+ 
+ 
+Index: hurd/hurd/fd.h
+===================================================================
+RCS file: /cvs/glibc/libc/hurd/hurd/fd.h,v
+retrieving revision 1.36
+diff -u -p -r1.36 fd.h
+--- hurd/hurd/fd.h	17 Mar 2007 17:04:09 -0000	1.36
++++ hurd/hurd/fd.h	1 Jul 2008 21:37:11 -0000
+@@ -27,6 +27,7 @@
+ 
+ #include <hurd/hurd_types.h>
+ #include <hurd/port.h>
++#include <sys/socket.h>
+ 
+ 
+ /* Structure representing a file descriptor.  */
+@@ -179,6 +180,18 @@
+   errno = _hurd_fd_error (fd, err);
+   return -1;
+ }
++
++/* Likewise, but do not raise SIGPIPE on EPIPE if flags contain
++   MSG_NOSIGNAL.  */
++
++_HURD_FD_H_EXTERN_INLINE int
++__hurd_sockfail (int fd, int flags, error_t err)
++{
++  if (!(flags & MSG_NOSIGNAL) || err != EPIPE)
++    err = _hurd_fd_error (fd, err);
++  errno = err;
++  return -1;
++}
+ 
+ /* Set up *FD to have PORT its server port, doing appropriate ctty magic.
+    Does no locking or unlocking.  */
+Index: sysdeps/mach/hurd/send.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/send.c,v
+retrieving revision 1.12
+diff -u -p -r1.12 send.c
+--- sysdeps/mach/hurd/send.c	3 Aug 2002 06:53:36 -0000	1.12
++++ sysdeps/mach/hurd/send.c	1 Jul 2008 21:37:11 -0000
+@@ -38,7 +38,7 @@ __send (fd, buf, n, flags)
+ 					   NULL, MACH_MSG_TYPE_COPY_SEND, 0,
+ 					   NULL, 0, &wrote));
+ 
+-  return err ? __hurd_dfail (fd, err) : wrote;
++  return err ? __hurd_sockfail (fd, flags, err) : wrote;
+ }
+ libc_hidden_def (__send)
+ weak_alias (__send, send)
+Index: sysdeps/mach/hurd/sendmsg.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/sendmsg.c,v
+retrieving revision 1.4
+diff -u -p -r1.4 sendmsg.c
+--- sysdeps/mach/hurd/sendmsg.c	11 Feb 2004 02:01:03 -0000	1.4
++++ sysdeps/mach/hurd/sendmsg.c	1 Jul 2008 21:37:11 -0000
+@@ -149,7 +149,7 @@ __libc_sendmsg (int fd, const struct msg
+   if (dealloc)
+     __vm_deallocate (__mach_task_self (), data.addr, len);
+ 
+-  return err ? __hurd_dfail (fd, err) : amount;
++  return err ? __hurd_sockfail (fd, flags, err) : amount;
+ }
+ 
+ weak_alias (__libc_sendmsg, sendmsg)
+Index: sysdeps/mach/hurd/sendto.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/sendto.c,v
+retrieving revision 1.15
+diff -u -p -r1.15 sendto.c
+--- sysdeps/mach/hurd/sendto.c	15 May 2002 00:05:38 -0000	1.15
++++ sysdeps/mach/hurd/sendto.c	1 Jul 2008 21:37:11 -0000
+@@ -79,7 +79,7 @@ __sendto (int fd,
+ 			  err;
+ 			}));
+ 
+-  return err ? __hurd_dfail (fd, err) : wrote;
++  return err ? __hurd_sockfail (fd, flags, err) : wrote;
+ }
+ 
+ weak_alias (__sendto, sendto)
+Index: sysdeps/mach/hurd/recv.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/recv.c,v
+retrieving revision 1.9
+diff -u -p -r1.9 recv.c
+--- sysdeps/mach/hurd/recv.c	22 Feb 2005 22:51:00 -0000	1.9
++++ sysdeps/mach/hurd/recv.c	1 Jul 2008 21:37:11 -0000
+@@ -48,7 +48,7 @@ __recv (fd, buf, n, flags)
+ 					       &cdata, &clen,
+ 					       &flags,
+ 					       n)))
+-    return __hurd_dfail (fd, err);
++    return __hurd_sockfail (fd, flags, err);
+ 
+   __mach_port_deallocate (__mach_task_self (), addrport);
+   __vm_deallocate (__mach_task_self (), (vm_address_t) cdata, clen);
+Index: sysdeps/mach/hurd/recvfrom.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/recvfrom.c,v
+retrieving revision 1.12
+diff -u -p -r1.12 recvfrom.c
+--- sysdeps/mach/hurd/recvfrom.c	15 May 2002 00:08:24 -0000	1.12
++++ sysdeps/mach/hurd/recvfrom.c	1 Jul 2008 21:37:11 -0000
+@@ -52,7 +52,7 @@ __recvfrom (fd, buf, n, flags, addrarg, 
+ 					       &cdata, &clen,
+ 					       &flags,
+ 					       n)))
+-    return __hurd_dfail (fd, err);
++    return __hurd_sockfail (fd, flags, err);
+ 
+   /* Get address data for the returned address port if requested.  */
+   if (addr != NULL)
+@@ -74,7 +74,7 @@ __recvfrom (fd, buf, n, flags, addrarg, 
+       if (err)
+ 	{
+ 	  __mach_port_deallocate (__mach_task_self (), addrport);
+-	  return __hurd_dfail (fd, err);
++	  return __hurd_sockfail (fd, flags, err);
+ 	}
+       
+       if (*addr_len > buflen)
+Index: sysdeps/mach/hurd/recvmsg.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/recvmsg.c,v
+retrieving revision 1.3
+diff -u -p -r1.3 recvmsg.c
+--- sysdeps/mach/hurd/recvmsg.c	26 Aug 2002 22:39:46 -0000	1.3
++++ sysdeps/mach/hurd/recvmsg.c	1 Jul 2008 21:37:11 -0000
+@@ -63,7 +63,7 @@ __libc_recvmsg (int fd, struct msghdr *m
+ 					       &ports, &nports,
+ 					       &cdata, &clen,
+ 					       &message->msg_flags, amount)))
+-    return __hurd_dfail (fd, err);
++    return __hurd_sockfail (fd, flags, err);
+ 
+   if (message->msg_name != NULL)
+     {
+@@ -84,7 +84,7 @@ __libc_recvmsg (int fd, struct msghdr *m
+       if (err)
+ 	{
+ 	  __mach_port_deallocate (__mach_task_self (), aport);
+-	  return __hurd_dfail (fd, err);
++	  return __hurd_sockfail (fd, flags, err);
+ 	}
+ 
+       if (message->msg_namelen > buflen)

Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-mig-init.diff (from rev 2976, glibc-package/trunk/debian/patches/hurd-i386/submitted-mig-init.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-mig-init.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-mig-init.diff	2008-07-02 23:39:33 UTC (rev 2977)
@@ -0,0 +1,100 @@
+2008-03-04  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	Mig supposes these to be initialized.
+	* sysdeps/mach/hurd/recv.c (__recv): Initialize nports.
+	* sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise.
+	* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Likewise.
+	* hurd/fd-read.c (_hurd_fd_read): Initialize nread.
+	* hurd/get-host.c (_hurd_get_host_config): Likewise.
+	* sysdeps/mach/hurd/dl-sysdep.c (__libc_read): Likewise.
+
+Index: glibc/sysdeps/mach/hurd/recv.c
+===================================================================
+RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/recv.c,v
+retrieving revision 1.9
+diff -u -p -r1.9 recv.c
+--- glibc/sysdeps/mach/hurd/recv.c	22 Feb 2005 22:51:00 -0000	1.9
++++ glibc/sysdeps/mach/hurd/recv.c	4 Mar 2008 01:44:12 -0000
+@@ -38,7 +38,7 @@
+   char *bufp = buf;
+   mach_msg_type_number_t nread = n;
+   mach_port_t *ports;
+-  mach_msg_type_number_t nports;
++  mach_msg_type_number_t nports = 0;
+   char *cdata = NULL;
+   mach_msg_type_number_t clen = 0;
+ 
+Index: glibc/sysdeps/mach/hurd/recvfrom.c
+===================================================================
+RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/recvfrom.c,v
+retrieving revision 1.12
+--- glibc/sysdeps/mach/hurd/recvfrom.c	15 May 2002 00:08:24 -0000	1.12
++++ glibc/sysdeps/mach/hurd/recvfrom.c	4 Mar 2008 01:44:12 -0000
+@@ -41,7 +41,7 @@
+   char *bufp = buf;
+   mach_msg_type_number_t nread = n;
+   mach_port_t *ports;
+-  mach_msg_type_number_t nports;
++  mach_msg_type_number_t nports = 0;
+   char *cdata = NULL;
+   mach_msg_type_number_t clen = 0;
+   struct sockaddr *addr = addrarg.__sockaddr__;
+Index: glibc/sysdeps/mach/hurd/recvmsg.c
+===================================================================
+RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/recvmsg.c,v
+retrieving revision 1.3
+--- glibc/sysdeps/mach/hurd/recvmsg.c	26 Aug 2002 22:39:46 -0000	1.3
++++ glibc/sysdeps/mach/hurd/recvmsg.c	4 Mar 2008 01:44:12 -0000
+@@ -34,7 +34,7 @@
+   char *data = NULL;
+   mach_msg_type_number_t len = 0;
+   mach_port_t *ports;
+-  mach_msg_type_number_t nports;
++  mach_msg_type_number_t nports = 0;
+   char *cdata = NULL;
+   mach_msg_type_number_t clen = 0;
+   size_t amount;
+Index: glibc/hurd/fd-read.c
+===================================================================
+RCS file: /cvs/glibc/libc/hurd/fd-read.c,v
+retrieving revision 1.15
+diff -u -p -r1.15 fd-read.c
+--- glibc/hurd/fd-read.c	11 Jun 2002 23:03:16 -0000	1.15
++++ glibc/hurd/fd-read.c	4 Mar 2008 02:43:50 -0000
+@@ -35,6 +35,7 @@ _hurd_fd_read (struct hurd_fd *fd, void 
+     }
+ 
+   data = buf;
++  nread = *nbytes;
+   if (err = HURD_FD_PORT_USE (fd, _hurd_ctty_input (port, ctty, readfd)))
+     return err;
+ 
+Index: glibc/hurd/get-host.c
+===================================================================
+RCS file: /cvs/glibc/libc/hurd/get-host.c,v
+retrieving revision 1.10
+diff -u -p -r1.10 get-host.c
+--- glibc/hurd/get-host.c	6 Jul 2001 04:54:47 -0000	1.10
++++ glibc/hurd/get-host.c	4 Mar 2008 02:44:46 -0000
+@@ -51,6 +51,7 @@ _hurd_get_host_config (const char *item,
+     }
+ 
+   data = buf;
++  nread = buflen;
+   err = __io_read (config, &data, &nread, -1, buflen);
+   if (! err)
+     /* Check if there is more in the file we didn't read.  */
+Index: glibc/sysdeps/mach/hurd/dl-sysdep.c
+===================================================================
+RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/dl-sysdep.c,v
+retrieving revision 1.78
+--- glibc/sysdeps/mach/hurd/dl-sysdep.c	6 Sep 2004 21:31:38 -0000	1.78
++++ glibc/sysdeps/mach/hurd/dl-sysdep.c	4 Mar 2008 02:01:53 -0000
+@@ -367,6 +367,7 @@
+   mach_msg_type_number_t nread;
+ 
+   data = buf;
++  nread = nbytes;
+   err = __io_read ((mach_port_t) fd, &data, &nread, -1, nbytes);
+   if (err)
+     return __hurd_fail (err);

Modified: glibc-package/trunk/debian/patches/hurd-i386/local-msg-nosignal.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-msg-nosignal.diff	2008-06-25 08:57:13 UTC (rev 2976)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-msg-nosignal.diff	2008-07-02 23:39:33 UTC (rev 2977)
@@ -4,14 +4,12 @@
 
 --- resolv/res_send.c.orig
 +++ resolv/res_send.c
-@@ -102,6 +102,10 @@
+@@ -102,6 +102,8 @@
  #define MAXPACKET       65536
  #endif
  
-+#ifndef MSG_NOSIGNAL
-+# define MSG_NOSIGNAL	0
-+#endif
-+
++#undef MSG_NOSIGNAL
++#define MSG_NOSIGNAL	0
  
  /* From ev_streams.c.  */
  

Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff	2008-06-25 08:57:13 UTC (rev 2976)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff	2008-07-02 23:39:33 UTC (rev 2977)
@@ -73,7 +73,7 @@
  _HURD_FD_H_EXTERN_INLINE error_t
  _hurd_fd_error (int fd, error_t err)
  {
-@@ -169,16 +180,21 @@
+@@ -169,28 +180,37 @@
      }
    return err;
  }
@@ -92,6 +92,22 @@
    return -1;
  }
 +#endif
+ 
+ /* Likewise, but do not raise SIGPIPE on EPIPE if flags contain
+    MSG_NOSIGNAL.  */
+ 
++int __hurd_sockfail (int fd, int flags, error_t err);
++
++#ifdef __USE_EXTERN_INLINES
+ _HURD_FD_H_EXTERN_INLINE int
+ __hurd_sockfail (int fd, int flags, error_t err)
+ {
+   if (!(flags & MSG_NOSIGNAL) || err != EPIPE)
+     err = _hurd_fd_error (fd, err);
+   errno = err;
+   return -1;
+ }
++#endif
  
  /* Set up *FD to have PORT its server port, doing appropriate ctty magic.
     Does no locking or unlocking.  */

Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-mig-init.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-mig-init.diff	2008-06-25 08:57:13 UTC (rev 2976)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-mig-init.diff	2008-07-02 23:39:33 UTC (rev 2977)
@@ -1,100 +0,0 @@
-2008-03-04  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	Mig supposes these to be initialized.
-	* sysdeps/mach/hurd/recv.c (__recv): Initialize nports.
-	* sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise.
-	* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Likewise.
-	* hurd/fd-read.c (_hurd_fd_read): Initialize nread.
-	* hurd/get-host.c (_hurd_get_host_config): Likewise.
-	* sysdeps/mach/hurd/dl-sysdep.c (__libc_read): Likewise.
-
-Index: glibc/sysdeps/mach/hurd/recv.c
-===================================================================
-RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/recv.c,v
-retrieving revision 1.9
-diff -u -p -r1.9 recv.c
---- glibc/sysdeps/mach/hurd/recv.c	22 Feb 2005 22:51:00 -0000	1.9
-+++ glibc/sysdeps/mach/hurd/recv.c	4 Mar 2008 01:44:12 -0000
-@@ -38,7 +38,7 @@
-   char *bufp = buf;
-   mach_msg_type_number_t nread = n;
-   mach_port_t *ports;
--  mach_msg_type_number_t nports;
-+  mach_msg_type_number_t nports = 0;
-   char *cdata = NULL;
-   mach_msg_type_number_t clen = 0;
- 
-Index: glibc/sysdeps/mach/hurd/recvfrom.c
-===================================================================
-RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/recvfrom.c,v
-retrieving revision 1.12
---- glibc/sysdeps/mach/hurd/recvfrom.c	15 May 2002 00:08:24 -0000	1.12
-+++ glibc/sysdeps/mach/hurd/recvfrom.c	4 Mar 2008 01:44:12 -0000
-@@ -41,7 +41,7 @@
-   char *bufp = buf;
-   mach_msg_type_number_t nread = n;
-   mach_port_t *ports;
--  mach_msg_type_number_t nports;
-+  mach_msg_type_number_t nports = 0;
-   char *cdata = NULL;
-   mach_msg_type_number_t clen = 0;
-   struct sockaddr *addr = addrarg.__sockaddr__;
-Index: glibc/sysdeps/mach/hurd/recvmsg.c
-===================================================================
-RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/recvmsg.c,v
-retrieving revision 1.3
---- glibc/sysdeps/mach/hurd/recvmsg.c	26 Aug 2002 22:39:46 -0000	1.3
-+++ glibc/sysdeps/mach/hurd/recvmsg.c	4 Mar 2008 01:44:12 -0000
-@@ -34,7 +34,7 @@
-   char *data = NULL;
-   mach_msg_type_number_t len = 0;
-   mach_port_t *ports;
--  mach_msg_type_number_t nports;
-+  mach_msg_type_number_t nports = 0;
-   char *cdata = NULL;
-   mach_msg_type_number_t clen = 0;
-   size_t amount;
-Index: glibc/hurd/fd-read.c
-===================================================================
-RCS file: /cvs/glibc/libc/hurd/fd-read.c,v
-retrieving revision 1.15
-diff -u -p -r1.15 fd-read.c
---- glibc/hurd/fd-read.c	11 Jun 2002 23:03:16 -0000	1.15
-+++ glibc/hurd/fd-read.c	4 Mar 2008 02:43:50 -0000
-@@ -35,6 +35,7 @@ _hurd_fd_read (struct hurd_fd *fd, void 
-     }
- 
-   data = buf;
-+  nread = *nbytes;
-   if (err = HURD_FD_PORT_USE (fd, _hurd_ctty_input (port, ctty, readfd)))
-     return err;
- 
-Index: glibc/hurd/get-host.c
-===================================================================
-RCS file: /cvs/glibc/libc/hurd/get-host.c,v
-retrieving revision 1.10
-diff -u -p -r1.10 get-host.c
---- glibc/hurd/get-host.c	6 Jul 2001 04:54:47 -0000	1.10
-+++ glibc/hurd/get-host.c	4 Mar 2008 02:44:46 -0000
-@@ -51,6 +51,7 @@ _hurd_get_host_config (const char *item,
-     }
- 
-   data = buf;
-+  nread = buflen;
-   err = __io_read (config, &data, &nread, -1, buflen);
-   if (! err)
-     /* Check if there is more in the file we didn't read.  */
-Index: glibc/sysdeps/mach/hurd/dl-sysdep.c
-===================================================================
-RCS file: /cvs/glibc/libc/glibc/sysdeps/mach/hurd/dl-sysdep.c,v
-retrieving revision 1.78
---- glibc/sysdeps/mach/hurd/dl-sysdep.c	6 Sep 2004 21:31:38 -0000	1.78
-+++ glibc/sysdeps/mach/hurd/dl-sysdep.c	4 Mar 2008 02:01:53 -0000
-@@ -367,6 +367,7 @@
-   mach_msg_type_number_t nread;
- 
-   data = buf;
-+  nread = nbytes;
-   err = __io_read ((mach_port_t) fd, &data, &nread, -1, nbytes);
-   if (err)
-     return __hurd_fail (err);

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2008-06-25 08:57:13 UTC (rev 2976)
+++ glibc-package/trunk/debian/patches/series	2008-07-02 23:39:33 UTC (rev 2977)
@@ -78,7 +78,6 @@
 hurd-i386/local-dl-dynamic-weak.diff 
 hurd-i386/local-enable-ldconfig.diff -p0
 hurd-i386/local-mlock.diff 
-hurd-i386/local-msg-nosignal.diff -p0
 hurd-i386/local-tls.diff 
 hurd-i386/local-tls-support.diff -p0
 hurd-i386/local-gcc-4.1-init-first.diff
@@ -90,11 +89,12 @@
 hurd-i386/submitted-sysvshm.diff 
 hurd-i386/submitted-trivial.diff -p0
 hurd-i386/submitted-ioctl-unsigned-size_t.diff -p0
-hurd-i386/submitted-mig-init.diff
+hurd-i386/cvs-mig-init.diff
 hurd-i386/cvs-ECANCELED.diff
 hurd-i386/cvs-kernel-features.diff -p1
 hurd-i386/submitted-IPV6_PKTINFO.diff 
 hurd-i386/cvs-O_CLOEXEC_fix.diff
+hurd-i386/cvs-MSG_NOSIGNAL.diff -p0
 hurd-i386/submitted-extern_inline.diff -p0
 hurd-i386/cvs-epfnosupport.diff -p0
 hurd-i386/cvs-df.diff

Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386	2008-06-25 08:57:13 UTC (rev 2976)
+++ glibc-package/trunk/debian/patches/series.hurd-i386	2008-07-02 23:39:33 UTC (rev 2977)
@@ -4,3 +4,4 @@
 hurd-i386/local-pthread_stubs.diff
 hurd-i386/local-pthread-unsupported-stubs.diff
 hurd-i386/local-unlockpt-chroot.diff
+hurd-i386/local-msg-nosignal.diff -p0


Reply to: