r6605 - glibc-package/trunk/debian/patches/hurd-i386
Author: sthibault
Date: 2015-09-20 21:11:03 +0000 (Sun, 20 Sep 2015)
New Revision: 6605
Modified:
glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff
glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff
Log:
Fix fuzzy
Modified: glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff 2015-09-20 21:09:56 UTC (rev 6604)
+++ glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff 2015-09-20 21:11:03 UTC (rev 6605)
@@ -20,10 +20,8 @@
sysdeps/mach/hurd/sendmsg.c | 34 +++++++++++
2 files changed, 170 insertions(+)
-Index: glibc-2.19/sysdeps/mach/hurd/recvmsg.c
-===================================================================
---- glibc-2.19.orig/sysdeps/mach/hurd/recvmsg.c
-+++ glibc-2.19/sysdeps/mach/hurd/recvmsg.c
+--- a/sysdeps/mach/hurd/recvmsg.c
++++ b/sysdeps/mach/hurd/recvmsg.c
@@ -23,6 +23,123 @@
#include <hurd/fd.h>
#include <hurd/socket.h>
@@ -181,11 +179,9 @@
}
}
-Index: glibc-2.19/sysdeps/mach/hurd/sendmsg.c
-===================================================================
---- glibc-2.19.orig/sysdeps/mach/hurd/sendmsg.c
-+++ glibc-2.19/sysdeps/mach/hurd/sendmsg.c
-@@ -112,6 +112,8 @@ __libc_sendmsg (int fd, const struct msg
+--- a/sysdeps/mach/hurd/sendmsg.c
++++ b/sysdeps/mach/hurd/sendmsg.c
+@@ -111,6 +111,8 @@ __libc_sendmsg (int fd, const struct msg
if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
nports += (cmsg->cmsg_len - CMSG_ALIGN (sizeof (struct cmsghdr)))
/ sizeof (int);
@@ -194,7 +190,7 @@
if (nports)
ports = __alloca (nports * sizeof (mach_port_t));
-@@ -146,6 +148,38 @@ __libc_sendmsg (int fd, const struct msg
+@@ -145,6 +147,38 @@ __libc_sendmsg (int fd, const struct msg
goto out;
}
}
@@ -233,10 +229,8 @@
}
if (addr)
-Index: glibc-2.19/hurd/Makefile
-===================================================================
---- glibc-2.19.orig/hurd/Makefile
-+++ glibc-2.19/hurd/Makefile
+--- a/hurd/Makefile
++++ b/hurd/Makefile
@@ -33,7 +33,7 @@ inline-headers = hurd.h $(addprefix hurd
# The RPC interfaces go in a separate library.
interface-library := libhurduser
@@ -245,4 +239,4 @@
+ auth auth_request auth_reply startup \
process process_request \
msg msg_reply msg_request \
- exec exec_experimental exec_startup crash interrupt \
+ exec exec_startup crash interrupt \
Modified: glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff 2015-09-20 21:09:56 UTC (rev 6604)
+++ glibc-package/trunk/debian/patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff 2015-09-20 21:11:03 UTC (rev 6605)
@@ -8,10 +8,8 @@
sysdeps/mach/hurd/sendmsg.c | 73 +++++++++++++++++++++++++++++------
2 files changed, 152 insertions(+), 13 deletions(-)
-Index: glibc-2.19/sysdeps/mach/hurd/recvmsg.c
-===================================================================
---- glibc-2.19.orig/sysdeps/mach/hurd/recvmsg.c
-+++ glibc-2.19/sysdeps/mach/hurd/recvmsg.c
+--- a/sysdeps/mach/hurd/recvmsg.c
++++ b/sysdeps/mach/hurd/recvmsg.c
@@ -32,13 +32,33 @@ __libc_recvmsg (int fd, struct msghdr *m
addr_port_t aport;
char *data = NULL;
@@ -126,11 +124,9 @@
}
weak_alias (__libc_recvmsg, recvmsg)
-Index: glibc-2.19/sysdeps/mach/hurd/sendmsg.c
-===================================================================
---- glibc-2.19.orig/sysdeps/mach/hurd/sendmsg.c
-+++ glibc-2.19/sysdeps/mach/hurd/sendmsg.c
-@@ -32,6 +32,10 @@ ssize_t
+--- a/sysdeps/mach/hurd/sendmsg.c
++++ b/sysdeps/mach/hurd/sendmsg.c
+@@ -31,6 +31,10 @@ ssize_t
__libc_sendmsg (int fd, const struct msghdr *message, int flags)
{
error_t err = 0;
@@ -141,7 +137,7 @@
struct sockaddr_un *addr = message->msg_name;
socklen_t addr_len = message->msg_namelen;
addr_port_t aport = MACH_PORT_NULL;
-@@ -44,6 +48,7 @@ __libc_sendmsg (int fd, const struct msg
+@@ -43,6 +47,7 @@ __libc_sendmsg (int fd, const struct msg
mach_msg_type_number_t len;
mach_msg_type_number_t amount;
int dealloc = 0;
@@ -149,7 +145,7 @@
int i;
/* Find the total number of bytes to be written. */
-@@ -101,6 +106,48 @@ __libc_sendmsg (int fd, const struct msg
+@@ -100,6 +105,48 @@ __libc_sendmsg (int fd, const struct msg
}
}
@@ -198,8 +194,8 @@
if (addr)
{
if (addr->sun_family == AF_LOCAL)
-@@ -111,9 +158,8 @@ __libc_sendmsg (int fd, const struct msg
- file_t file = __file_name_lookup (name, 0, 0);
+@@ -109,9 +156,8 @@ __libc_sendmsg (int fd, const struct msg
+ file_t file = __file_name_lookup (addr->sun_path, 0, 0);
if (file == MACH_PORT_NULL)
{
- if (dealloc)
@@ -210,7 +206,7 @@
}
err = __ifsock_getsockaddr (file, &aport);
__mach_port_deallocate (__mach_task_self (), file);
-@@ -121,11 +167,7 @@ __libc_sendmsg (int fd, const struct msg
+@@ -119,11 +165,7 @@ __libc_sendmsg (int fd, const struct msg
/* The file did not grok the ifsock protocol. */
err = ENOTSOCK;
if (err)
@@ -223,7 +219,7 @@
}
else
err = EIEIO;
-@@ -144,8 +186,9 @@ __libc_sendmsg (int fd, const struct msg
+@@ -142,8 +184,9 @@ __libc_sendmsg (int fd, const struct msg
/* Send the data. */
err = __socket_send (port, aport,
flags, data.ptr, len,
@@ -235,7 +231,7 @@
message->msg_control,
message->msg_controllen,
&amount);
-@@ -154,11 +197,19 @@ __libc_sendmsg (int fd, const struct msg
+@@ -152,11 +195,19 @@ __libc_sendmsg (int fd, const struct msg
}
err;
}));
Reply to: