[hurd] 01/01: Fix payload for pflocal

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 858c6b278773373d817b3d38d81f9c3fd3b9fb1e
Author: Samuel Thibault <address@hidden>
Date:   Fri Aug 14 00:59:27 2015 +0000

    Fix payload for pflocal
---
 debian/changelog                             |  7 ++++
 debian/patches/disable-payload-pflocal.patch | 52 ----------------------------
 debian/patches/fix-payload-pflocal.patch     | 13 +++++++
 debian/patches/series                        |  2 +-
 4 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a904796..b7940b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hurd (1:0.6.git20150704-3) UNRELEASED; urgency=medium
+
+  [ Justus Winter ]
+  * Fix payload for pflocal.
+
+ -- Samuel Thibault <address@hidden>  Fri, 14 Aug 2015 00:58:39 +0000
+
 hurd (1:0.6.git20150704-2) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff --git a/debian/patches/disable-payload-pflocal.patch 
b/debian/patches/disable-payload-pflocal.patch
deleted file mode 100644
index 37e7a5c..0000000
--- a/debian/patches/disable-payload-pflocal.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: hurd-debian/libports/manage-multithread.c
-===================================================================
---- hurd-debian.orig/libports/manage-multithread.c
-+++ hurd-debian/libports/manage-multithread.c
-@@ -173,6 +173,7 @@ ports_manage_port_operations_multithread
-       else
-       {
-         pi = ports_lookup_port (bucket, inp->msgh_local_port, 0);
-+#if 0
-         if (pi)
-           {
-             inp->msgh_bits = MACH_MSGH_BITS (
-@@ -180,6 +181,7 @@ ports_manage_port_operations_multithread
-               MACH_MSG_TYPE_PROTECTED_PAYLOAD);
-             inp->msgh_protected_payload = (unsigned long) pi;
-           }
-+#endif
-       }
- 
-       if (pi)
-Index: hurd-debian/libports/manage-one-thread.c
-===================================================================
---- hurd-debian.orig/libports/manage-one-thread.c
-+++ hurd-debian/libports/manage-one-thread.c
-@@ -64,6 +64,7 @@ ports_manage_port_operations_one_thread
-       else
-       {
-         pi = ports_lookup_port (bucket, inp->msgh_local_port, 0);
-+#if 0
-         if (pi)
-           {
-             inp->msgh_bits = MACH_MSGH_BITS (
-@@ -71,6 +72,7 @@ ports_manage_port_operations_one_thread
-               MACH_MSG_TYPE_PROTECTED_PAYLOAD);
-             inp->msgh_protected_payload = (unsigned long) pi;
-           }
-+#endif
-       }
- 
-       if (pi)
-Index: hurd-debian/pflocal/sock.c
-===================================================================
---- hurd-debian.orig/pflocal/sock.c
-+++ hurd-debian/pflocal/sock.c
-@@ -262,6 +262,7 @@ addr_create (struct addr **addr)
- 
-   if (! err)
-     {
-+      mach_port_clear_protected_payload (mach_task_self (), 
(*addr)->pi.port_right);
-       ensure_sock_server ();
-       (*addr)->sock = NULL;
-       pthread_mutex_init (&(*addr)->lock, NULL);
diff --git a/debian/patches/fix-payload-pflocal.patch 
b/debian/patches/fix-payload-pflocal.patch
new file mode 100644
index 0000000..7957113
--- /dev/null
+++ b/debian/patches/fix-payload-pflocal.patch
@@ -0,0 +1,13 @@
+Index: hurd-debian/pflocal/mig-decls.h
+===================================================================
+--- hurd-debian.orig/pflocal/mig-decls.h
++++ hurd-debian/pflocal/mig-decls.h
+@@ -58,7 +58,7 @@ begin_using_addr_port(mach_port_t port)
+ static inline addr_t __attribute__ ((unused))
+ begin_using_addr_payload (unsigned long payload)
+ {
+-  return ports_lookup_port (NULL, payload, addr_port_class);
++  return ports_lookup_payload (NULL, payload, addr_port_class);
+ }
+ 
+ static inline void __attribute__ ((unused))
diff --git a/debian/patches/series b/debian/patches/series
index 8144b20..47b90c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,4 +41,4 @@ term-for-tcl.patch
 disable_new_task_notification.diff
 newRPC.patch
 dl_origin.patch
-disable-payload-pflocal.patch
+fix-payload-pflocal.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git