drop old patch series

29 files changed, 1 insertions, 2820 deletions

diff --git a/debian/patches/0001-libshouldbeinlibc-move-the-reference-counting-primit.patch b/debian/patches/0001-libshouldbeinlibc-move-the-reference-counting-primit.patch
deleted file mode 100644
index da210e9b..00000000
--- a/debian/patches/0001-libshouldbeinlibc-move-the-reference-counting-primit.patch
+++ /dev/null
@@ -1,733 +0,0 @@
-From 0d3b80f04a1caee51b9995c9626838f85295bb06 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sun, 23 Nov 2014 19:09:51 +0100
-Subject: [PATCH hurd 01/28] libshouldbeinlibc: move the reference counting
- primitives here
-
-Declare all functions `extern inline' instead of `static inline'.
-This allows us to use them in functions declared as `extern inline'.
-
-* libshouldbeinlibc/refcount.h: Move here, and declare all functions
-`extern inline'.
-* libshouldbeinlibc/refcount.c: And define the functions here.
-* libshouldbeinlibc/Makefile: Add `refcount.{c,h}'.
----
- include/refcount.h           | 320 ------------------------------------------
- libshouldbeinlibc/Makefile   |   8 +-
- libshouldbeinlibc/refcount.c |  23 +++
- libshouldbeinlibc/refcount.h | 326 +++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 355 insertions(+), 322 deletions(-)
- delete mode 100644 include/refcount.h
- create mode 100644 libshouldbeinlibc/refcount.c
- create mode 100644 libshouldbeinlibc/refcount.h
-
-diff --git a/include/refcount.h b/include/refcount.h
-deleted file mode 100644
-index ebde42d..0000000
---- a/include/refcount.h
-+++ /dev/null
-@@ -1,320 +0,0 @@
--/* Lock-less reference counting primitives
--
--   Copyright (C) 2014 Free Software Foundation, Inc.
--
--   Written by Justus Winter <4winter@informatik.uni-hamburg.de>
--
--   This file is part of the GNU Hurd.
--
--   The GNU Hurd is free software; you can redistribute it and/or
--   modify it under the terms of the GNU General Public License as
--   published by the Free Software Foundation; either version 2, or (at
--   your option) any later version.
--
--   The GNU Hurd is distributed in the hope that it will be useful, but
--   WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
--
--#ifndef _HURD_REFCOUNT_H_
--#define _HURD_REFCOUNT_H_
--
--#include <assert.h>
--#include <limits.h>
--#include <stdint.h>
--
--/* Simple reference counting.  */
--
--/* An opaque type.  You must not access these values directly.  */
--typedef unsigned int refcount_t;
--
--/* Initialize REF with REFERENCES.  REFERENCES must not be zero.  */
--static inline void
--refcount_init (refcount_t *ref, unsigned int references)
--{
--  assert (references > 0 || !"references must not be zero!");
--  *ref = references;
--}
--
--/* Increment REF.  Return the result of the operation.  This function
--   uses atomic operations.  It is not required to serialize calls to
--   this function.
--
--   This is the unsafe version of refcount_ref.  refcount_ref also
--   checks for use-after-free errors.  When in doubt, use that one
--   instead.  */
--static inline unsigned int
--refcount_unsafe_ref (refcount_t *ref)
--{
--  unsigned int r;
--  r = __atomic_add_fetch (ref, 1, __ATOMIC_RELAXED);
--  assert (r != UINT_MAX || !"refcount overflowed!");
--  return r;
--}
--
--/* Increment REF.  Return the result of the operation.  This function
--   uses atomic operations.  It is not required to serialize calls to
--   this function.  */
--static inline unsigned int
--refcount_ref (refcount_t *ref)
--{
--  unsigned int r;
--  r = refcount_unsafe_ref (ref);
--  assert (r != 1 || !"refcount detected use-after-free!");
--  return r;
--}
--
--/* Decrement REF.  Return the result of the operation.  This function
--   uses atomic operations.  It is not required to serialize calls to
--   this function.  */
--static inline unsigned int
--refcount_deref (refcount_t *ref)
--{
--  unsigned int r;
--  r = __atomic_sub_fetch (ref, 1, __ATOMIC_RELAXED);
--  assert (r != UINT_MAX || !"refcount underflowed!");
--  return r;
--}
--
--/* Return REF.  This function uses atomic operations.  It is not
--   required to serialize calls to this function.  */
--static inline unsigned int
--refcount_references (refcount_t *ref)
--{
--  return __atomic_load_n (ref, __ATOMIC_RELAXED);
--}
--
--/* Reference counting with weak references.  */
--
--/* An opaque type.  You must not access these values directly.  */
--typedef union _references refcounts_t;
--
--/* Instead, the functions manipulating refcounts_t values write the
--   results into this kind of objects.  */
--struct references {
--  /* We chose the layout of this struct so that when it is used in the
--     union _references, the hard reference counts occupy the least
--     significant bits.  We rely on this layout for atomic promotion
--     and demotion of references.  See refcounts_promote and
--     refcounts_demote for details.  */
--#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
--  uint32_t hard;
--  uint32_t weak;
--#else
--  uint32_t weak;
--  uint32_t hard;
--#endif
--};
--
--/* We use a union to convert struct reference values to uint64_t which
--   we can manipulate atomically.  While this behavior is not
--   guaranteed by the C standard, it is supported by all major
--   compilers.  */
--union _references {
--  struct references references;
--  uint64_t value;
--};
--
--/* Initialize REF with HARD and WEAK references.  HARD and WEAK must
--   not both be zero.  */
--static inline void
--refcounts_init (refcounts_t *ref, uint32_t hard, uint32_t weak)
--{
--  assert ((hard != 0 || weak != 0) || !"references must not both be zero!");
--  ref->references = (struct references) { .hard = hard, .weak = weak };
--}
--
--/* Increment the hard reference count of REF.  If RESULT is not NULL,
--   the result of the operation is written there.  This function uses
--   atomic operations.  It is not required to serialize calls to this
--   function.
--
--   This is the unsafe version of refcounts_ref.  refcounts_ref also
--   checks for use-after-free errors.  When in doubt, use that one
--   instead.  */
--static inline void
--refcounts_unsafe_ref (refcounts_t *ref, struct references *result)
--{
--  const union _references op = { .references = { .hard = 1 } };
--  union _references r;
--  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
--  assert (r.references.hard != UINT32_MAX || !"refcount overflowed!");
--  if (result)
--    *result = r.references;
--}
--
--/* Increment the hard reference count of REF.  If RESULT is not NULL,
--   the result of the operation is written there.  This function uses
--   atomic operations.  It is not required to serialize calls to this
--   function.  */
--static inline void
--refcounts_ref (refcounts_t *ref, struct references *result)
--{
--  struct references r;
--  refcounts_unsafe_ref (ref, &r);
--  assert (! (r.hard == 1 && r.weak == 0)
--          || !"refcount detected use-after-free!");
--  if (result)
--    *result = r;
--}
--
--/* Decrement the hard reference count of REF.  If RESULT is not NULL,
--   the result of the operation is written there.  This function uses
--   atomic operations.  It is not required to serialize calls to this
--   function.  */
--static inline void
--refcounts_deref (refcounts_t *ref, struct references *result)
--{
--  const union _references op = { .references = { .hard = 1 } };
--  union _references r;
--  r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
--  assert (r.references.hard != UINT32_MAX || !"refcount underflowed!");
--  if (result)
--    *result = r.references;
--}
--
--/* Promote a weak reference to a hard reference.  If RESULT is not
--   NULL, the result of the operation is written there.  This function
--   uses atomic operations.  It is not required to serialize calls to
--   this function.  */
--static inline void
--refcounts_promote (refcounts_t *ref, struct references *result)
--{
--  /* To promote a weak reference, we need to atomically subtract 1
--     from the weak reference count, and add 1 to the hard reference
--     count.
--
--     We can subtract by 1 by adding the two's complement of 1 = ~0 to
--     a fixed-width value, discarding the overflow.
--
--     We do the same in our uint64_t value, but we have chosen the
--     layout of struct references so that when it is used in the union
--     _references, the weak reference counts occupy the most
--     significant bits.  When we add ~0 to the weak references, the
--     overflow will be discarded as unsigned arithmetic is modulo 2^n.
--     So we just add a hard reference.  In combination, this is the
--     desired operation.  */
--  const union _references op =
--    { .references = { .weak = ~0U, .hard = 1} };
--  union _references r;
--  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
--  assert (r.references.hard != UINT32_MAX || !"refcount overflowed!");
--  assert (r.references.weak != UINT32_MAX || !"refcount underflowed!");
--  if (result)
--    *result = r.references;
--}
--
--/* Demote a hard reference to a weak reference.  If RESULT is not
--   NULL, the result of the operation is written there.  This function
--   uses atomic operations.  It is not required to serialize calls to
--   this function.  */
--static inline void
--refcounts_demote (refcounts_t *ref, struct references *result)
--{
--  /* To demote a hard reference, we need to atomically subtract 1 from
--     the hard reference count, and add 1 to the weak reference count.
--
--     We can subtract by 1 by adding the two's complement of 1 = ~0 to
--     a fixed-width value, discarding the overflow.
--
--     We do the same in our uint64_t value, but we have chosen the
--     layout of struct references so that when it is used in the union
--     _references, the hard reference counts occupy the least
--     significant bits.  When we add ~0 to the hard references, it will
--     overflow into the weak references.  This is the desired
--     operation.  */
--  const union _references op = { .references = { .hard = ~0U } };
--  union _references r;
--  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
--  assert (r.references.hard != UINT32_MAX || !"refcount underflowed!");
--  assert (r.references.weak != UINT32_MAX || !"refcount overflowed!");
--  if (result)
--    *result = r.references;
--}
--
--/* Increment the weak reference count of REF.  If RESULT is not NULL,
--   the result of the operation is written there.  This function uses
--   atomic operations.  It is not required to serialize calls to this
--   function.
--
--   This is the unsafe version of refcounts_ref_weak.
--   refcounts_ref_weak also checks for use-after-free errors.  When in
--   doubt, use that one instead.  */
--static inline void
--refcounts_unsafe_ref_weak (refcounts_t *ref, struct references *result)
--{
--  const union _references op = { .references = { .weak = 1 } };
--  union _references r;
--  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
--  assert (r.references.weak != UINT32_MAX || !"refcount overflowed!");
--  if (result)
--    *result = r.references;
--}
--
--/* Increment the weak reference count of REF.  If RESULT is not NULL,
--   the result of the operation is written there.  This function uses
--   atomic operations.  It is not required to serialize calls to this
--   function.  */
--static inline void
--refcounts_ref_weak (refcounts_t *ref, struct references *result)
--{
--  struct references r;
--  refcounts_unsafe_ref_weak (ref, &r);
--  assert (! (r.hard == 0 && r.weak == 1)
--          || !"refcount detected use-after-free!");
--  if (result)
--    *result = r;
--}
--
--/* Decrement the weak reference count of REF.  If RESULT is not NULL,
--   the result of the operation is written there.  This function uses
--   atomic operations.  It is not required to serialize calls to this
--   function.  */
--static inline void
--refcounts_deref_weak (refcounts_t *ref, struct references *result)
--{
--  const union _references op = { .references = { .weak = 1 } };
--  union _references r;
--  r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
--  assert (r.references.weak != UINT32_MAX || !"refcount underflowed!");
--  if (result)
--    *result = r.references;
--}
--
--/* Store the current reference counts of REF in RESULT.  This function
--   uses atomic operations.  It is not required to serialize calls to
--   this function.  */
--static inline void
--refcounts_references (refcounts_t *ref, struct references *result)
--{
--  union _references r;
--  r.value =__atomic_load_n (&ref->value, __ATOMIC_RELAXED);
--  *result = r.references;
--}
--
--/* Return the hard reference count of REF.  This function uses atomic
--   operations.  It is not required to serialize calls to this
--   function.  */
--static inline uint32_t
--refcounts_hard_references (refcounts_t *ref)
--{
--  struct references result;
--  refcounts_references (ref, &result);
--  return result.hard;
--}
--
--/* Return the weak reference count of REF.  This function uses atomic
--   operations.  It is not required to serialize calls to this
--   function.  */
--static inline uint32_t
--refcounts_weak_references (refcounts_t *ref)
--{
--  struct references result;
--  refcounts_references (ref, &result);
--  return result.weak;
--}
--
--#endif /* _HURD_REFCOUNT_H_ */
-diff --git a/libshouldbeinlibc/Makefile b/libshouldbeinlibc/Makefile
-index 14a7939..633d60e 100644
---- a/libshouldbeinlibc/Makefile
-+++ b/libshouldbeinlibc/Makefile
-@@ -27,9 +27,13 @@ SRCS = termsize.c timefmt.c exec-reauth.c maptime-funcs.c \
-        idvec-impgids.c idvec-verify.c idvec-rep.c \
-        ugids.c ugids-argp.c ugids-rep.c ugids-verify.c ugids-subtract.c \
-        ugids-auth.c ugids-xinl.c ugids-merge.c ugids-imply.c ugids-posix.c \
--       ugids-verify-auth.c nullauth.c
-+       ugids-verify-auth.c nullauth.c \
-+       refcount.c \
-+
- installhdrs = idvec.h timefmt.h maptime.h \
--	      wire.h portinfo.h portxlate.h cacheq.h ugids.h nullauth.h
-+	      wire.h portinfo.h portxlate.h cacheq.h ugids.h nullauth.h \
-+	      refcount.h \
-+
- installhdrsubdir = .
- 
- OBJS = $(SRCS:.c=.o)
-diff --git a/libshouldbeinlibc/refcount.c b/libshouldbeinlibc/refcount.c
-new file mode 100644
-index 0000000..17e01c5
---- /dev/null
-+++ b/libshouldbeinlibc/refcount.c
-@@ -0,0 +1,23 @@
-+/* Lock-less reference counting primitives
-+
-+   Copyright (C) 2014 Free Software Foundation, Inc.
-+
-+   Written by Justus Winter <4winter@informatik.uni-hamburg.de>
-+
-+   This file is part of the GNU Hurd.
-+
-+   The GNU Hurd is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2, or (at
-+   your option) any later version.
-+
-+   The GNU Hurd is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#define REFCOUNT_DEFINE_EI
-+#include "refcount.h"
-diff --git a/libshouldbeinlibc/refcount.h b/libshouldbeinlibc/refcount.h
-new file mode 100644
-index 0000000..e8b0f5b
---- /dev/null
-+++ b/libshouldbeinlibc/refcount.h
-@@ -0,0 +1,326 @@
-+/* Lock-less reference counting primitives
-+
-+   Copyright (C) 2014 Free Software Foundation, Inc.
-+
-+   Written by Justus Winter <4winter@informatik.uni-hamburg.de>
-+
-+   This file is part of the GNU Hurd.
-+
-+   The GNU Hurd is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2, or (at
-+   your option) any later version.
-+
-+   The GNU Hurd is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef _HURD_REFCOUNT_H_
-+#define _HURD_REFCOUNT_H_
-+
-+#ifdef REFCOUNT_DEFINE_EI
-+#define REFCOUNT_EI
-+#else
-+#define REFCOUNT_EI __extern_inline
-+#endif
-+
-+#include <assert.h>
-+#include <limits.h>
-+#include <stdint.h>
-+
-+/* Simple reference counting.  */
-+
-+/* An opaque type.  You must not access these values directly.  */
-+typedef unsigned int refcount_t;
-+
-+/* Initialize REF with REFERENCES.  REFERENCES must not be zero.  */
-+REFCOUNT_EI void
-+refcount_init (refcount_t *ref, unsigned int references)
-+{
-+  assert (references > 0 || !"references must not be zero!");
-+  *ref = references;
-+}
-+
-+/* Increment REF.  Return the result of the operation.  This function
-+   uses atomic operations.  It is not required to serialize calls to
-+   this function.
-+
-+   This is the unsafe version of refcount_ref.  refcount_ref also
-+   checks for use-after-free errors.  When in doubt, use that one
-+   instead.  */
-+REFCOUNT_EI unsigned int
-+refcount_unsafe_ref (refcount_t *ref)
-+{
-+  unsigned int r;
-+  r = __atomic_add_fetch (ref, 1, __ATOMIC_RELAXED);
-+  assert (r != UINT_MAX || !"refcount overflowed!");
-+  return r;
-+}
-+
-+/* Increment REF.  Return the result of the operation.  This function
-+   uses atomic operations.  It is not required to serialize calls to
-+   this function.  */
-+REFCOUNT_EI unsigned int
-+refcount_ref (refcount_t *ref)
-+{
-+  unsigned int r;
-+  r = refcount_unsafe_ref (ref);
-+  assert (r != 1 || !"refcount detected use-after-free!");
-+  return r;
-+}
-+
-+/* Decrement REF.  Return the result of the operation.  This function
-+   uses atomic operations.  It is not required to serialize calls to
-+   this function.  */
-+REFCOUNT_EI unsigned int
-+refcount_deref (refcount_t *ref)
-+{
-+  unsigned int r;
-+  r = __atomic_sub_fetch (ref, 1, __ATOMIC_RELAXED);
-+  assert (r != UINT_MAX || !"refcount underflowed!");
-+  return r;
-+}
-+
-+/* Return REF.  This function uses atomic operations.  It is not
-+   required to serialize calls to this function.  */
-+REFCOUNT_EI unsigned int
-+refcount_references (refcount_t *ref)
-+{
-+  return __atomic_load_n (ref, __ATOMIC_RELAXED);
-+}
-+
-+/* Reference counting with weak references.  */
-+
-+/* An opaque type.  You must not access these values directly.  */
-+typedef union _references refcounts_t;
-+
-+/* Instead, the functions manipulating refcounts_t values write the
-+   results into this kind of objects.  */
-+struct references {
-+  /* We chose the layout of this struct so that when it is used in the
-+     union _references, the hard reference counts occupy the least
-+     significant bits.  We rely on this layout for atomic promotion
-+     and demotion of references.  See refcounts_promote and
-+     refcounts_demote for details.  */
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+  uint32_t hard;
-+  uint32_t weak;
-+#else
-+  uint32_t weak;
-+  uint32_t hard;
-+#endif
-+};
-+
-+/* We use a union to convert struct reference values to uint64_t which
-+   we can manipulate atomically.  While this behavior is not
-+   guaranteed by the C standard, it is supported by all major
-+   compilers.  */
-+union _references {
-+  struct references references;
-+  uint64_t value;
-+};
-+
-+/* Initialize REF with HARD and WEAK references.  HARD and WEAK must
-+   not both be zero.  */
-+REFCOUNT_EI void
-+refcounts_init (refcounts_t *ref, uint32_t hard, uint32_t weak)
-+{
-+  assert ((hard != 0 || weak != 0) || !"references must not both be zero!");
-+  ref->references = (struct references) { .hard = hard, .weak = weak };
-+}
-+
-+/* Increment the hard reference count of REF.  If RESULT is not NULL,
-+   the result of the operation is written there.  This function uses
-+   atomic operations.  It is not required to serialize calls to this
-+   function.
-+
-+   This is the unsafe version of refcounts_ref.  refcounts_ref also
-+   checks for use-after-free errors.  When in doubt, use that one
-+   instead.  */
-+REFCOUNT_EI void
-+refcounts_unsafe_ref (refcounts_t *ref, struct references *result)
-+{
-+  const union _references op = { .references = { .hard = 1 } };
-+  union _references r;
-+  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+  assert (r.references.hard != UINT32_MAX || !"refcount overflowed!");
-+  if (result)
-+    *result = r.references;
-+}
-+
-+/* Increment the hard reference count of REF.  If RESULT is not NULL,
-+   the result of the operation is written there.  This function uses
-+   atomic operations.  It is not required to serialize calls to this
-+   function.  */
-+REFCOUNT_EI void
-+refcounts_ref (refcounts_t *ref, struct references *result)
-+{
-+  struct references r;
-+  refcounts_unsafe_ref (ref, &r);
-+  assert (! (r.hard == 1 && r.weak == 0)
-+          || !"refcount detected use-after-free!");
-+  if (result)
-+    *result = r;
-+}
-+
-+/* Decrement the hard reference count of REF.  If RESULT is not NULL,
-+   the result of the operation is written there.  This function uses
-+   atomic operations.  It is not required to serialize calls to this
-+   function.  */
-+REFCOUNT_EI void
-+refcounts_deref (refcounts_t *ref, struct references *result)
-+{
-+  const union _references op = { .references = { .hard = 1 } };
-+  union _references r;
-+  r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+  assert (r.references.hard != UINT32_MAX || !"refcount underflowed!");
-+  if (result)
-+    *result = r.references;
-+}
-+
-+/* Promote a weak reference to a hard reference.  If RESULT is not
-+   NULL, the result of the operation is written there.  This function
-+   uses atomic operations.  It is not required to serialize calls to
-+   this function.  */
-+REFCOUNT_EI void
-+refcounts_promote (refcounts_t *ref, struct references *result)
-+{
-+  /* To promote a weak reference, we need to atomically subtract 1
-+     from the weak reference count, and add 1 to the hard reference
-+     count.
-+
-+     We can subtract by 1 by adding the two's complement of 1 = ~0 to
-+     a fixed-width value, discarding the overflow.
-+
-+     We do the same in our uint64_t value, but we have chosen the
-+     layout of struct references so that when it is used in the union
-+     _references, the weak reference counts occupy the most
-+     significant bits.  When we add ~0 to the weak references, the
-+     overflow will be discarded as unsigned arithmetic is modulo 2^n.
-+     So we just add a hard reference.  In combination, this is the
-+     desired operation.  */
-+  const union _references op =
-+    { .references = { .weak = ~0U, .hard = 1} };
-+  union _references r;
-+  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+  assert (r.references.hard != UINT32_MAX || !"refcount overflowed!");
-+  assert (r.references.weak != UINT32_MAX || !"refcount underflowed!");
-+  if (result)
-+    *result = r.references;
-+}
-+
-+/* Demote a hard reference to a weak reference.  If RESULT is not
-+   NULL, the result of the operation is written there.  This function
-+   uses atomic operations.  It is not required to serialize calls to
-+   this function.  */
-+REFCOUNT_EI void
-+refcounts_demote (refcounts_t *ref, struct references *result)
-+{
-+  /* To demote a hard reference, we need to atomically subtract 1 from
-+     the hard reference count, and add 1 to the weak reference count.
-+
-+     We can subtract by 1 by adding the two's complement of 1 = ~0 to
-+     a fixed-width value, discarding the overflow.
-+
-+     We do the same in our uint64_t value, but we have chosen the
-+     layout of struct references so that when it is used in the union
-+     _references, the hard reference counts occupy the least
-+     significant bits.  When we add ~0 to the hard references, it will
-+     overflow into the weak references.  This is the desired
-+     operation.  */
-+  const union _references op = { .references = { .hard = ~0U } };
-+  union _references r;
-+  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+  assert (r.references.hard != UINT32_MAX || !"refcount underflowed!");
-+  assert (r.references.weak != UINT32_MAX || !"refcount overflowed!");
-+  if (result)
-+    *result = r.references;
-+}
-+
-+/* Increment the weak reference count of REF.  If RESULT is not NULL,
-+   the result of the operation is written there.  This function uses
-+   atomic operations.  It is not required to serialize calls to this
-+   function.
-+
-+   This is the unsafe version of refcounts_ref_weak.
-+   refcounts_ref_weak also checks for use-after-free errors.  When in
-+   doubt, use that one instead.  */
-+REFCOUNT_EI void
-+refcounts_unsafe_ref_weak (refcounts_t *ref, struct references *result)
-+{
-+  const union _references op = { .references = { .weak = 1 } };
-+  union _references r;
-+  r.value = __atomic_add_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+  assert (r.references.weak != UINT32_MAX || !"refcount overflowed!");
-+  if (result)
-+    *result = r.references;
-+}
-+
-+/* Increment the weak reference count of REF.  If RESULT is not NULL,
-+   the result of the operation is written there.  This function uses
-+   atomic operations.  It is not required to serialize calls to this
-+   function.  */
-+REFCOUNT_EI void
-+refcounts_ref_weak (refcounts_t *ref, struct references *result)
-+{
-+  struct references r;
-+  refcounts_unsafe_ref_weak (ref, &r);
-+  assert (! (r.hard == 0 && r.weak == 1)
-+          || !"refcount detected use-after-free!");
-+  if (result)
-+    *result = r;
-+}
-+
-+/* Decrement the weak reference count of REF.  If RESULT is not NULL,
-+   the result of the operation is written there.  This function uses
-+   atomic operations.  It is not required to serialize calls to this
-+   function.  */
-+REFCOUNT_EI void
-+refcounts_deref_weak (refcounts_t *ref, struct references *result)
-+{
-+  const union _references op = { .references = { .weak = 1 } };
-+  union _references r;
-+  r.value = __atomic_sub_fetch (&ref->value, op.value, __ATOMIC_RELAXED);
-+  assert (r.references.weak != UINT32_MAX || !"refcount underflowed!");
-+  if (result)
-+    *result = r.references;
-+}
-+
-+/* Store the current reference counts of REF in RESULT.  This function
-+   uses atomic operations.  It is not required to serialize calls to
-+   this function.  */
-+REFCOUNT_EI void
-+refcounts_references (refcounts_t *ref, struct references *result)
-+{
-+  union _references r;
-+  r.value =__atomic_load_n (&ref->value, __ATOMIC_RELAXED);
-+  *result = r.references;
-+}
-+
-+/* Return the hard reference count of REF.  This function uses atomic
-+   operations.  It is not required to serialize calls to this
-+   function.  */
-+REFCOUNT_EI uint32_t
-+refcounts_hard_references (refcounts_t *ref)
-+{
-+  struct references result;
-+  refcounts_references (ref, &result);
-+  return result.hard;
-+}
-+
-+/* Return the weak reference count of REF.  This function uses atomic
-+   operations.  It is not required to serialize calls to this
-+   function.  */
-+REFCOUNT_EI uint32_t
-+refcounts_weak_references (refcounts_t *ref)
-+{
-+  struct references result;
-+  refcounts_references (ref, &result);
-+  return result.weak;
-+}
-+
-+#endif /* _HURD_REFCOUNT_H_ */
--- 
-2.1.3
-
diff --git a/debian/patches/0002-libports-add-ports_lookup_payload-and-ports_payload_.patch b/debian/patches/0002-libports-add-ports_lookup_payload-and-ports_payload_.patch
deleted file mode 100644
index 87d7dfee..00000000
--- a/debian/patches/0002-libports-add-ports_lookup_payload-and-ports_payload_.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 580b142c1e0c76195888f4a1101ee831e7f986be Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sat, 23 Nov 2013 16:19:08 +0100
-Subject: [PATCH hurd 02/28] libports: add `ports_lookup_payload' and
- `ports_payload_get_name'
-
-These two functions map payloads to objects and port names. The former
-can be used like `ports_lookup_port' to look up objects, the latter to
-map payloads to port names if the server function expects a
-`mach_port_t'.
-
-* libports/ports.h: Add function ports_payload_get_name.
-* libports/lookup-payload.c: New file.
-* libports/ports.h (ports_lookup_payload): Add declaration.
-* libports/Makefile (SRCS): Add lookup-payload.c.
----
- libports/Makefile        |  2 +-
- libports/extern-inline.c | 22 ++++++++++++++++++++
- libports/ports.h         | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 76 insertions(+), 1 deletion(-)
- create mode 100644 libports/extern-inline.c
-
-diff --git a/libports/Makefile b/libports/Makefile
-index 30da1c1..f49cb9f 100644
---- a/libports/Makefile
-+++ b/libports/Makefile
-@@ -36,7 +36,7 @@ SRCS = create-bucket.c create-class.c \
-  interrupt-operation.c interrupt-on-notify.c interrupt-notified-rpcs.c \
-  dead-name.c create-port.c import-port.c default-uninhibitable-rpcs.c \
-  claim-right.c transfer-right.c create-port-noinstall.c create-internal.c \
-- interrupted.c
-+ interrupted.c extern-inline.c
- 
- installhdrs = ports.h
- 
-diff --git a/libports/extern-inline.c b/libports/extern-inline.c
-new file mode 100644
-index 0000000..fbc9e53
---- /dev/null
-+++ b/libports/extern-inline.c
-@@ -0,0 +1,22 @@
-+/* Run time callable functions for extern inlines.
-+   Copyright (C) 2014 Free Software Foundation, Inc.
-+
-+   Written by Justus Winter <4winter@informatik.uni-hamburg.de>
-+
-+   This file is part of the GNU Hurd.
-+
-+   The GNU Hurd is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2, or (at
-+   your option) any later version.
-+
-+   The GNU Hurd is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#define PORTS_DEFINE_EI
-+#include "ports.h"
-diff --git a/libports/ports.h b/libports/ports.h
-index 652edb8..a625b47 100644
---- a/libports/ports.h
-+++ b/libports/ports.h
-@@ -29,6 +29,12 @@
- #include <pthread.h>
- #include <refcount.h>
- 
-+#ifdef PORTS_DEFINE_EI
-+#define PORTS_EI
-+#else
-+#define PORTS_EI __extern_inline
-+#endif
-+
- /* These are global values for common flags used in the various structures.
-    Not all of these are meaningful in all flag fields.  */
- #define PORTS_INHIBITED		0x0100 /* block RPC's */
-@@ -234,6 +240,53 @@ mach_port_t ports_get_send_right (void *port);
- void *ports_lookup_port (struct port_bucket *bucket,
- 			 mach_port_t port, struct port_class *class);
- 
-+/* Like ports_lookup_port, but uses PAYLOAD to look up the object.  If
-+   this function is used, PAYLOAD must be a pointer to the port
-+   structure.  */
-+extern void *ports_lookup_payload (struct port_bucket *bucket,
-+				   unsigned long payload,
-+				   struct port_class *class);
-+
-+/* This returns the ports name.  This function can be used as
-+   intranpayload function turning payloads back into port names.  If
-+   this function is used, PAYLOAD must be a pointer to the port
-+   structure.  */
-+extern mach_port_t ports_payload_get_name (unsigned int payload);
-+
-+#if defined(__USE_EXTERN_INLINES) || defined(PORTS_DEFINE_EI)
-+
-+PORTS_EI void *
-+ports_lookup_payload (struct port_bucket *bucket,
-+		      unsigned long payload,
-+		      struct port_class *class)
-+{
-+  struct port_info *pi = (struct port_info *) payload;
-+
-+  if (pi && bucket && pi->bucket != bucket)
-+    pi = NULL;
-+
-+  if (pi && class && pi->class != class)
-+    pi = NULL;
-+
-+  if (pi)
-+    refcounts_unsafe_ref (&pi->refcounts, NULL);
-+
-+  return pi;
-+}
-+
-+PORTS_EI mach_port_t
-+ports_payload_get_name (unsigned int payload)
-+{
-+  struct port_info *pi = (struct port_info *) payload;
-+
-+  if (pi)
-+    return pi->port_right;
-+
-+  return MACH_PORT_NULL;
-+}
-+
-+#endif /* Use extern inlines.  */
-+
- /* Allocate another reference to PORT. */
- void ports_port_ref (void *port);
- 
--- 
-2.1.3
-
diff --git a/debian/patches/0003-libports-add-a-payload-aware-intrans-function.patch b/debian/patches/0003-libports-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index c1b31f25..00000000
--- a/debian/patches/0003-libports-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 466bacfa2728a9b164196d002a5c49d644ef9c95 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Tue, 8 Apr 2014 23:40:26 +0200
-Subject: [PATCH hurd 03/28] libports: add a payload-aware intrans function
-
-* libports/mig-decls.h (begin_using_port_info_payload): New function.
-* libports/mig-mutate.h: Add mutator.
----
- libports/mig-decls.h  | 6 ++++++
- libports/mig-mutate.h | 4 ++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/libports/mig-decls.h b/libports/mig-decls.h
-index f8c4f15..c88ff26 100644
---- a/libports/mig-decls.h
-+++ b/libports/mig-decls.h
-@@ -30,6 +30,12 @@ begin_using_port_info_port (mach_port_t port)
-   return ports_lookup_port (0, port, 0);
- }
- 
-+static inline struct port_info * __attribute__ ((unused))
-+begin_using_port_info_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (0, payload, 0);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_port_info (struct port_info *p)
- {
-diff --git a/libports/mig-mutate.h b/libports/mig-mutate.h
-index 4c011b6..1c96fea 100644
---- a/libports/mig-mutate.h
-+++ b/libports/mig-mutate.h
-@@ -19,6 +19,8 @@
- 
- #define NOTIFY_INTRAN						\
-   port_info_t begin_using_port_info_port (mach_port_t)
-+#define NOTIFY_INTRAN_PAYLOAD					\
-+  port_info_t begin_using_port_info_payload
- #define NOTIFY_DESTRUCTOR					\
-   end_using_port_info (port_info_t)
- #define NOTIFY_IMPORTS						\
-@@ -26,6 +28,8 @@
- 
- #define INTERRUPT_INTRAN					\
-   port_info_t begin_using_port_info_port (mach_port_t)
-+#define INTERRUPT_INTRAN_PAYLOAD				\
-+  port_info_t begin_using_port_info_payload
- #define INTERRUPT_DESTRUCTOR					\
-   end_using_port_info (port_info_t)
- #define INTERRUPT_IMPORTS					\
--- 
-2.1.3
-
diff --git a/debian/patches/0004-libdiskfs-add-payload-aware-intrans-functions.patch b/debian/patches/0004-libdiskfs-add-payload-aware-intrans-functions.patch
deleted file mode 100644
index 2801be45..00000000
--- a/debian/patches/0004-libdiskfs-add-payload-aware-intrans-functions.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 23c08045d7afca712d0a22f5663e7e74cc420345 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 10:43:18 +0100
-Subject: [PATCH hurd 04/28] libdiskfs: add payload-aware intrans functions
-
-* libdiskfs/diskfs.h (diskfs_begin_using_protid_payload): New function.
-(diskfs_begin_using_control_payload): Likewise.
-(diskfs_begin_using_bootinfo_payload): Likewise.
-* libdiskfs/fsmutations.h: Add mutators.
----
- libdiskfs/diskfs.h      | 29 +++++++++++++++++++++++++++++
- libdiskfs/fsmutations.h |  5 +++++
- 2 files changed, 34 insertions(+)
-
-diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h
-index e59ba99..2818225 100644
---- a/libdiskfs/diskfs.h
-+++ b/libdiskfs/diskfs.h
-@@ -833,8 +833,14 @@ error_t diskfs_start_protid (struct peropen *po, struct protid **cred);
- void diskfs_finish_protid (struct protid *cred, struct iouser *user);
- 
- extern struct protid * diskfs_begin_using_protid_port (file_t port);
-+extern struct protid *
-+diskfs_begin_using_protid_payload (unsigned long payload);
- extern struct diskfs_control * diskfs_begin_using_control_port (fsys_t port);
-+extern struct diskfs_control *
-+diskfs_begin_using_control_port_payload (unsigned long payload);
- extern struct bootinfo *diskfs_begin_using_bootinfo_port (exec_startup_t port);
-+struct bootinfo *
-+diskfs_begin_using_bootinfo_payload (unsigned long payload);
- 
- extern void diskfs_end_using_protid_port (struct protid *cred);
- extern void diskfs_end_using_control_port (struct diskfs_control *cred);
-@@ -851,6 +857,14 @@ diskfs_begin_using_protid_port (file_t port)
-   return ports_lookup_port (diskfs_port_bucket, port, diskfs_protid_class);
- }
- 
-+DISKFS_EXTERN_INLINE struct protid *
-+diskfs_begin_using_protid_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (diskfs_port_bucket,
-+			       payload,
-+			       diskfs_protid_class);
-+}
-+
- /* And for the fsys interface. */
- DISKFS_EXTERN_INLINE struct diskfs_control *
- diskfs_begin_using_control_port (fsys_t port)
-@@ -858,6 +872,14 @@ diskfs_begin_using_control_port (fsys_t port)
-   return ports_lookup_port (diskfs_port_bucket, port, NULL);
- }
- 
-+DISKFS_EXTERN_INLINE struct diskfs_control *
-+diskfs_begin_using_control_port_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (diskfs_port_bucket,
-+			       payload,
-+			       NULL);
-+}
-+
- /* And for the exec_startup interface. */
- DISKFS_EXTERN_INLINE struct bootinfo *
- diskfs_begin_using_bootinfo_port (exec_startup_t port)
-@@ -865,6 +887,13 @@ diskfs_begin_using_bootinfo_port (exec_startup_t port)
-   return ports_lookup_port (diskfs_port_bucket, port, diskfs_execboot_class);
- }
- 
-+DISKFS_EXTERN_INLINE struct bootinfo *
-+diskfs_begin_using_bootinfo_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (diskfs_port_bucket,
-+			       payload,
-+			       diskfs_execboot_class);
-+}
- 
- /* Called by MiG after server routines have been run; this
-    balances begin_using_protid_port, and is arranged for the io
-diff --git a/libdiskfs/fsmutations.h b/libdiskfs/fsmutations.h
-index 3f9362b..c2167c6 100644
---- a/libdiskfs/fsmutations.h
-+++ b/libdiskfs/fsmutations.h
-@@ -18,12 +18,15 @@
- /* Only CPP macro definitions should go in this file. */
- 
- #define FILE_INTRAN protid_t diskfs_begin_using_protid_port (file_t)
-+#define FILE_INTRAN_PAYLOAD protid_t diskfs_begin_using_protid_payload
- #define FILE_DESTRUCTOR diskfs_end_using_protid_port (protid_t)
- 
- #define IO_INTRAN protid_t diskfs_begin_using_protid_port (io_t)
-+#define IO_INTRAN_PAYLOAD protid_t diskfs_begin_using_protid_payload
- #define IO_DESTRUCTOR diskfs_end_using_protid_port (protid_t)
- 
- #define FSYS_INTRAN control_t diskfs_begin_using_control_port (fsys_t)
-+#define FSYS_INTRAN_PAYLOAD control_t diskfs_begin_using_control_port_payload
- #define FSYS_DESTRUCTOR diskfs_end_using_control_port (control_t)
- 
- #define FILE_IMPORTS import "libdiskfs/priv.h";
-@@ -33,6 +36,8 @@
- 
- #define EXEC_STARTUP_INTRAN                             \
-   bootinfo_t diskfs_begin_using_bootinfo_port (exec_startup_t)
-+#define EXEC_STARTUP_INTRAN_PAYLOAD                     \
-+  bootinfo_t diskfs_begin_using_bootinfo_payload
- #define EXEC_STARTUP_DESTRUCTOR                         \
-   diskfs_end_using_bootinfo (bootinfo_t)
- #define EXEC_STARTUP_IMPORTS                            \
--- 
-2.1.3
-
diff --git a/debian/patches/0005-libnetfs-add-a-payload-aware-intrans-function.patch b/debian/patches/0005-libnetfs-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index 9fd9beca..00000000
--- a/debian/patches/0005-libnetfs-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9a4bee5a8d6726d71002889a9e9d54dc417ce9d6 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 10:45:44 +0100
-Subject: [PATCH hurd 05/28] libnetfs: add a payload-aware intrans function
-
-* libnetfs/priv.h (begin_using_protid_payload): New function.
-* libnetfs/mutations.h: Add mutator.
----
- libnetfs/mutations.h | 3 +++
- libnetfs/priv.h      | 6 ++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/libnetfs/mutations.h b/libnetfs/mutations.h
-index e60a220..088d8a0 100644
---- a/libnetfs/mutations.h
-+++ b/libnetfs/mutations.h
-@@ -23,12 +23,15 @@
- #define IO_SELECT_REPLY_PORT
- 
- #define FILE_INTRAN protid_t begin_using_protid_port (file_t)
-+#define FILE_INTRAN_PAYLOAD protid_t begin_using_protid_payload
- #define FILE_DESTRUCTOR end_using_protid_port (protid_t)
- 
- #define IO_INTRAN protid_t begin_using_protid_port (io_t)
-+#define IO_INTRAN_PAYLOAD protid_t begin_using_protid_payload
- #define IO_DESTRUCTOR end_using_protid_port (protid_t)
- 
- #define FSYS_INTRAN control_t begin_using_control_port (fsys_t)
-+#define FSYS_INTRAN_PAYLOAD control_t begin_using_control_payload
- #define FSYS_DESTRUCTOR end_using_control_port (control_t)
- 
- #define FILE_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h";
-diff --git a/libnetfs/priv.h b/libnetfs/priv.h
-index ba31080..36c8f53 100644
---- a/libnetfs/priv.h
-+++ b/libnetfs/priv.h
-@@ -44,6 +44,12 @@ begin_using_control_port (fsys_t port)
-   return ports_lookup_port (netfs_port_bucket, port, netfs_control_class);
- }
- 
-+static inline struct netfs_control * __attribute__ ((unused))
-+begin_using_control_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (netfs_port_bucket, payload, netfs_control_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_control_port (struct netfs_control *cred)
- {
--- 
-2.1.3
-
diff --git a/debian/patches/0006-libtrivfs-add-payload-aware-intrans-functions.patch b/debian/patches/0006-libtrivfs-add-payload-aware-intrans-functions.patch
deleted file mode 100644
index baf1cfc5..00000000
--- a/debian/patches/0006-libtrivfs-add-payload-aware-intrans-functions.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From a3f0d8a363f7c872757f99523c737918c369d522 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 11:04:38 +0100
-Subject: [PATCH hurd 06/28] libtrivfs: add payload-aware intrans functions
-
-* libtrivfs/mig-decls.h (trivfs_begin_using_protid_payload): New function.
-(trivfs_begin_using_control_payload): Likewise.
-* libtrivfs/mig-mutate.h: Add mutators.
----
- libtrivfs/mig-decls.h  | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
- libtrivfs/mig-mutate.h |  3 +++
- 2 files changed, 61 insertions(+)
-
-diff --git a/libtrivfs/mig-decls.h b/libtrivfs/mig-decls.h
-index 2baaee8..13a9eb7 100644
---- a/libtrivfs/mig-decls.h
-+++ b/libtrivfs/mig-decls.h
-@@ -61,6 +61,35 @@ trivfs_begin_using_protid (mach_port_t port)
-     return ports_lookup_port (0, port, trivfs_dynamic_protid_port_classes[0]);
- }
- 
-+static inline struct trivfs_protid * __attribute__ ((unused))
-+trivfs_begin_using_protid_payload (unsigned long payload)
-+{
-+  if (trivfs_protid_nportclasses + trivfs_num_dynamic_protid_port_classes > 1)
-+    {
-+      struct port_info *pi = ports_lookup_payload (NULL, payload, NULL);
-+      int i;
-+
-+      if (pi)
-+	{
-+	  for (i = 0; i < trivfs_protid_nportclasses; i++)
-+	    if (pi->class == trivfs_protid_portclasses[i])
-+	      return (struct trivfs_protid *) pi;
-+	  for (i = 0; i < trivfs_num_dynamic_protid_port_classes; i++)
-+	    if (pi->class == trivfs_dynamic_protid_port_classes[i])
-+	      return (struct trivfs_protid *) pi;
-+	  ports_port_deref (pi);
-+	}
-+
-+      return NULL;
-+    }
-+  else if (trivfs_protid_nportclasses == 1)
-+    return ports_lookup_payload (NULL, payload,
-+				 trivfs_protid_portclasses[0]);
-+  else
-+    return ports_lookup_payload (NULL, payload,
-+				 trivfs_dynamic_protid_port_classes[0]);
-+}
-+
- static inline void __attribute__ ((unused))
- trivfs_end_using_protid (struct trivfs_protid *cred)
- {
-@@ -95,6 +124,35 @@ trivfs_begin_using_control (mach_port_t port)
-     return ports_lookup_port (0, port, trivfs_dynamic_control_port_classes[0]);
- }
- 
-+static inline struct trivfs_control * __attribute__ ((unused))
-+trivfs_begin_using_control_payload (unsigned long payload)
-+{
-+  if (trivfs_cntl_nportclasses + trivfs_num_dynamic_control_port_classes > 1)
-+    {
-+      struct port_info *pi = ports_lookup_payload (NULL, payload, NULL);
-+      int i;
-+
-+      if (pi)
-+	{
-+	  for (i = 0; i < trivfs_cntl_nportclasses; i++)
-+	    if (pi->class == trivfs_cntl_portclasses[i])
-+	      return (struct trivfs_control *) pi;
-+	  for (i = 0; i < trivfs_num_dynamic_control_port_classes; i++)
-+	    if (pi->class == trivfs_dynamic_control_port_classes[i])
-+	      return (struct trivfs_control *) pi;
-+	  ports_port_deref (pi);
-+	}
-+
-+      return NULL;
-+    }
-+  else if (trivfs_cntl_nportclasses == 1)
-+    return ports_lookup_payload (NULL, payload,
-+				 trivfs_cntl_portclasses[0]);
-+  else
-+    return ports_lookup_payload (NULL, payload,
-+				 trivfs_dynamic_control_port_classes[0]);
-+}
-+
- static inline void __attribute__ ((unused))
- trivfs_end_using_control (struct trivfs_control *cred)
- {
-diff --git a/libtrivfs/mig-mutate.h b/libtrivfs/mig-mutate.h
-index cc15d38..dcbebf6 100644
---- a/libtrivfs/mig-mutate.h
-+++ b/libtrivfs/mig-mutate.h
-@@ -20,13 +20,16 @@
- #define REPLY_PORTS
- 
- #define FILE_INTRAN trivfs_protid_t trivfs_begin_using_protid (file_t)
-+#define FILE_INTRAN_PAYLOAD trivfs_protid_t trivfs_begin_using_protid_payload
- #define FILE_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t)
- #define FILE_IMPORTS import "libtrivfs/mig-decls.h";
- 
- #define IO_INTRAN trivfs_protid_t trivfs_begin_using_protid (io_t)
-+#define IO_INTRAN_PAYLOAD trivfs_protid_t trivfs_begin_using_protid_payload
- #define IO_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t)
- #define IO_IMPORTS import "libtrivfs/mig-decls.h";
- 
- #define FSYS_INTRAN trivfs_control_t trivfs_begin_using_control (fsys_t)
-+#define FSYS_INTRAN_PAYLOAD trivfs_control_t trivfs_begin_using_control_payload
- #define FSYS_DESTRUCTOR trivfs_end_using_control (trivfs_control_t)
- #define FSYS_IMPORTS import "libtrivfs/mig-decls.h";
--- 
-2.1.3
-
diff --git a/debian/patches/0007-libpager-add-a-payload-aware-intrans-function.patch b/debian/patches/0007-libpager-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index 64961849..00000000
--- a/debian/patches/0007-libpager-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1cafbbf8d116b131cb41f734d4feb65560ac5034 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Fri, 4 Apr 2014 14:19:59 +0200
-Subject: [PATCH hurd 07/28] libpager: add a payload-aware intrans function
-
-* libpager/mig-decls.h (begin_using_pager_payload): New function.
-* libpager/mig-mutate.h: Add mutators.
----
- libpager/mig-decls.h  | 6 ++++++
- libpager/mig-mutate.h | 3 +++
- 2 files changed, 9 insertions(+)
-
-diff --git a/libpager/mig-decls.h b/libpager/mig-decls.h
-index 0c7b402..7e6b64f 100644
---- a/libpager/mig-decls.h
-+++ b/libpager/mig-decls.h
-@@ -32,6 +32,12 @@ begin_using_pager (mach_port_t port)
-   return ports_lookup_port (0, port, _pager_class);
- }
- 
-+static inline struct pager * __attribute__ ((unused))
-+begin_using_pager_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (0, payload, _pager_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_pager (struct pager *p)
- {
-diff --git a/libpager/mig-mutate.h b/libpager/mig-mutate.h
-index 9e9065f..c4f30ce 100644
---- a/libpager/mig-mutate.h
-+++ b/libpager/mig-mutate.h
-@@ -18,11 +18,14 @@
-    along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- #define MEMORY_OBJECT_INTRAN pager_t begin_using_pager (memory_object_t)
-+#define MEMORY_OBJECT_INTRAN_PAYLOAD pager_t begin_using_pager_payload
- #define MEMORY_OBJECT_DESTRUCTOR end_using_pager (pager_t)
- #define MEMORY_OBJECT_IMPORTS import "mig-decls.h";
- 
- #define NOTIFY_INTRAN						\
-   port_info_t begin_using_port_info_port (mach_port_t)
-+#define NOTIFY_INTRAN_PAYLOAD					\
-+  port_info_t begin_using_port_info_payload
- #define NOTIFY_DESTRUCTOR					\
-   end_using_port_info (port_info_t)
- #define NOTIFY_IMPORTS						\
--- 
-2.1.3
-
diff --git a/debian/patches/0008-libcons-add-a-payload-aware-intrans-function.patch b/debian/patches/0008-libcons-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index 1480f324..00000000
--- a/debian/patches/0008-libcons-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e36f31c6aecdc4ac1653b18aa99c23c0bba62e37 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 14:12:25 +0100
-Subject: [PATCH hurd 08/28] libcons: add a payload-aware intrans function
-
-* libcons/mutations.h: Add mutator.
-* libcons/priv.h (begin_using_notify_payload): New function.
----
- libcons/mutations.h | 1 +
- libcons/priv.h      | 6 ++++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/libcons/mutations.h b/libcons/mutations.h
-index c895447..4751340 100644
---- a/libcons/mutations.h
-+++ b/libcons/mutations.h
-@@ -21,6 +21,7 @@
- /* Only CPP macro definitions should go in this file. */
- 
- #define FS_NOTIFY_INTRAN cons_notify_t begin_using_notify_port (fs_notify_t)
-+#define FS_NOTIFY_INTRAN_PAYLOAD cons_notify_t begin_using_notify_payload
- #define FS_NOTIFY_DESTRUCTOR end_using_notify_port (cons_notify_t)
- 
- #define FS_NOTIFY_IMPORTS import "priv.h";
-diff --git a/libcons/priv.h b/libcons/priv.h
-index 38971ff..6cdf3db 100644
---- a/libcons/priv.h
-+++ b/libcons/priv.h
-@@ -80,6 +80,12 @@ begin_using_notify_port (fs_notify_t port)
-   return ports_lookup_port (cons_port_bucket, port, cons_port_class);
- }
- 
-+static inline cons_notify_t
-+begin_using_notify_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (cons_port_bucket, payload, cons_port_class);
-+}
-+
- /* Called by MiG after server routines have been run; this balances
-    begin_using_notify_port, and is arranged for the fs_notify
-    interfaces by mutations.h. */
--- 
-2.1.3
-
diff --git a/debian/patches/0009-auth-add-a-payload-aware-intrans-function.patch b/debian/patches/0009-auth-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index 225f1264..00000000
--- a/debian/patches/0009-auth-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 74f2d9a3a4b74b8e4984348d34cb9c920fc86570 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 14:43:31 +0100
-Subject: [PATCH hurd 09/28] auth: add a payload-aware intrans function
-
-* auth/mig-mutate.h: Add mutator.
-* auth/mig-decls.h (auth_payload_to_handle): New function.
----
- auth/mig-decls.h  | 6 ++++++
- auth/mig-mutate.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/auth/mig-decls.h b/auth/mig-decls.h
-index 09c7c70..fa7b06d 100644
---- a/auth/mig-decls.h
-+++ b/auth/mig-decls.h
-@@ -32,6 +32,12 @@ auth_port_to_handle (mach_port_t auth)
-   return ports_lookup_port (auth_bucket, auth, authhandle_portclass);
- }
- 
-+static inline struct authhandle * __attribute__ ((unused))
-+auth_payload_to_handle (unsigned long payload)
-+{
-+  return ports_lookup_payload (auth_bucket, payload, authhandle_portclass);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_authhandle (struct authhandle *auth)
- {
-diff --git a/auth/mig-mutate.h b/auth/mig-mutate.h
-index ea40c70..5cc8914 100644
---- a/auth/mig-mutate.h
-+++ b/auth/mig-mutate.h
-@@ -20,5 +20,6 @@
- /* CPP definitions for MiG processing of auth.defs for auth server.  */
- 
- #define AUTH_INTRAN authhandle_t auth_port_to_handle (auth_t)
-+#define AUTH_INTRAN_PAYLOAD authhandle_t auth_payload_to_handle
- #define AUTH_DESTRUCTOR end_using_authhandle (authhandle_t)
- #define AUTH_IMPORTS import "mig-decls.h";
--- 
-2.1.3
-
diff --git a/debian/patches/0010-console-add-a-payload-aware-intrans-function.patch b/debian/patches/0010-console-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index bac472b6..00000000
--- a/debian/patches/0010-console-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 928ba7f02e91f2bc64a8ffa1bb7bcd8cc2fe4a56 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 10:40:56 +0100
-Subject: [PATCH hurd 10/28] console: add a payload-aware intrans function
-
-* console/priv.h (begin_using_protid_payload): New function.
-* console/mutations.h: Add mutators.
----
- console/mutations.h | 3 +++
- libnetfs/priv.h     | 6 ++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/console/mutations.h b/console/mutations.h
-index 4e1cc7e..87906cc 100644
---- a/console/mutations.h
-+++ b/console/mutations.h
-@@ -21,12 +21,15 @@
- /* Only CPP macro definitions should go in this file. */
- 
- #define IO_INTRAN protid_t begin_using_protid_port (io_t)
-+#define IO_INTRAN_PAYLOAD protid_t begin_using_protid_payload
- #define IO_DESTRUCTOR end_using_protid_port (protid_t)
- 
- #define TIOCTL_IMPORTS import "libnetfs/priv.h";
- 
- #define NOTIFY_INTRAN						\
-   port_info_t begin_using_port_info_port (mach_port_t)
-+#define NOTIFY_INTRAN_PAYLOAD					\
-+  port_info_t begin_using_port_info_payload
- #define NOTIFY_DESTRUCTOR					\
-   end_using_port_info (port_info_t)
- #define NOTIFY_IMPORTS						\
-diff --git a/libnetfs/priv.h b/libnetfs/priv.h
-index 36c8f53..3c5bcd4 100644
---- a/libnetfs/priv.h
-+++ b/libnetfs/priv.h
-@@ -31,6 +31,12 @@ begin_using_protid_port (file_t port)
-   return ports_lookup_port (netfs_port_bucket, port, netfs_protid_class);
- }
- 
-+static inline struct protid * __attribute__ ((unused))
-+begin_using_protid_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (netfs_port_bucket, payload, netfs_protid_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_protid_port (struct protid *cred)
- {
--- 
-2.1.3
-
diff --git a/debian/patches/0011-console-client-make-the-demuxer-payload-aware.patch b/debian/patches/0011-console-client-make-the-demuxer-payload-aware.patch
deleted file mode 100644
index 7e2aed27..00000000
--- a/debian/patches/0011-console-client-make-the-demuxer-payload-aware.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 445eb03674d068963456eb4eb1085c5f245b33f7 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Fri, 4 Apr 2014 16:53:25 +0200
-Subject: [PATCH hurd 11/28] console-client: make the demuxer payload-aware
-
-* console-client/trans.c (console_demuxer): make the demuxer payload-aware.
----
- console-client/trans.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/console-client/trans.c b/console-client/trans.c
-index 67cd149..224229e 100644
---- a/console-client/trans.c
-+++ b/console-client/trans.c
-@@ -63,8 +63,16 @@ console_demuxer (mach_msg_header_t *inp,
-   ret = netfs_demuxer (inp, outp);
-   if (ret)
-     return ret;
--  
--  user = ports_lookup_port (netfs_port_bucket, inop->msgh_local_port, netfs_protid_class);
-+
-+  if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
-+      MACH_MSG_TYPE_PROTECTED_PAYLOAD)
-+    user = ports_lookup_payload (netfs_port_bucket,
-+				 inop->msgh_protected_payload,
-+				 netfs_protid_class);
-+  else
-+    user = ports_lookup_port (netfs_port_bucket,
-+			      inop->msgh_local_port,
-+			      netfs_protid_class);
-   if (!user)
-     return ret;
-   
--- 
-2.1.3
-
diff --git a/debian/patches/0012-exec-add-payload-aware-intrans-functions.patch b/debian/patches/0012-exec-add-payload-aware-intrans-functions.patch
deleted file mode 100644
index b9aa41fd..00000000
--- a/debian/patches/0012-exec-add-payload-aware-intrans-functions.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 11bcfb23a9de36ad424d050a705dd8b37dbd5ff2 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 11:08:39 +0100
-Subject: [PATCH hurd 12/28] exec: add payload-aware intrans functions
-
-* exec/execmutations.h: Add mutators.
-* exec/mig-decls.h (begin_using_bootinfo_payload): New function.
----
- exec/execmutations.h | 3 +++
- exec/mig-decls.h     | 6 ++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/exec/execmutations.h b/exec/execmutations.h
-index 2acca7a..0b5b8bb 100644
---- a/exec/execmutations.h
-+++ b/exec/execmutations.h
-@@ -1,6 +1,7 @@
- /* CPP definitions for MiG processing of exec.defs for exec server.  */
- 
- #define FILE_INTRAN trivfs_protid_t trivfs_begin_using_protid (file_t)
-+#define FILE_INTRAN_PAYLOAD trivfs_protid_t trivfs_begin_using_protid_payload
- #define FILE_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t)
- 
- #define EXEC_IMPORTS					\
-@@ -9,6 +10,8 @@
- 
- #define EXEC_STARTUP_INTRAN                             \
-   bootinfo_t begin_using_bootinfo_port (exec_startup_t)
-+#define EXEC_STARTUP_INTRAN_PAYLOAD                     \
-+  bootinfo_t begin_using_bootinfo_payload
- #define EXEC_STARTUP_DESTRUCTOR                         \
-   end_using_bootinfo (bootinfo_t)
- #define EXEC_STARTUP_IMPORTS                            \
-diff --git a/exec/mig-decls.h b/exec/mig-decls.h
-index 0437414..cf3e17d 100644
---- a/exec/mig-decls.h
-+++ b/exec/mig-decls.h
-@@ -30,6 +30,12 @@ begin_using_bootinfo_port (mach_port_t port)
-     return ports_lookup_port (port_bucket, port, execboot_portclass);
- }
- 
-+static inline struct bootinfo * __attribute__ ((unused))
-+begin_using_bootinfo_payload (unsigned long payload)
-+{
-+    return ports_lookup_payload (port_bucket, payload, execboot_portclass);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_bootinfo (struct bootinfo *b)
- {
--- 
-2.1.3
-
diff --git a/debian/patches/0013-pfinet-add-payload-aware-intrans-functions.patch b/debian/patches/0013-pfinet-add-payload-aware-intrans-functions.patch
deleted file mode 100644
index 7cde5c1e..00000000
--- a/debian/patches/0013-pfinet-add-payload-aware-intrans-functions.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9b34b8da7e4f3a0378b864e649c0345b43ff2b63 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 11:10:20 +0100
-Subject: [PATCH hurd 13/28] pfinet: add payload-aware intrans functions
-
-* pfinet/mig-mutate.h: Add mutators.
-* pfinet/mig-decls.h (begin_using_socket_payload): New function.
-(begin_using_sockaddr_payload): Likewise.
----
- pfinet/mig-decls.h  | 12 ++++++++++++
- pfinet/mig-mutate.h |  4 ++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/pfinet/mig-decls.h b/pfinet/mig-decls.h
-index ec8fb23..67bcbfc 100644
---- a/pfinet/mig-decls.h
-+++ b/pfinet/mig-decls.h
-@@ -32,6 +32,12 @@ begin_using_socket_port (mach_port_t port)
-   return ports_lookup_port (pfinet_bucket, port, socketport_class);
- }
- 
-+static inline struct sock_user * __attribute__ ((unused))
-+begin_using_socket_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (pfinet_bucket, payload, socketport_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_socket_port (struct sock_user *user)
- {
-@@ -45,6 +51,12 @@ begin_using_sockaddr_port (mach_port_t port)
-   return ports_lookup_port (pfinet_bucket, port, addrport_class);
- }
- 
-+static inline struct sock_addr * __attribute__ ((unused))
-+begin_using_sockaddr_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (pfinet_bucket, payload, addrport_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_sockaddr_port (struct sock_addr *addr)
- {
-diff --git a/pfinet/mig-mutate.h b/pfinet/mig-mutate.h
-index 0a1eeb8..2bc385b 100644
---- a/pfinet/mig-mutate.h
-+++ b/pfinet/mig-mutate.h
-@@ -23,18 +23,22 @@
- #define IO_SELECT_REPLY_PORT
- 
- #define IO_INTRAN sock_user_t begin_using_socket_port (io_t)
-+#define IO_INTRAN_PAYLOAD sock_user_t begin_using_socket_payload
- #define IO_DESTRUCTOR end_using_socket_port (sock_user_t)
- #define IO_IMPORTS import "mig-decls.h";
- #define IIOCTL_IMPORTS import "mig-decls.h";
- 
- #define SOCKET_INTRAN sock_user_t begin_using_socket_port (socket_t)
-+#define SOCKET_INTRAN_PAYLOAD sock_user_t begin_using_socket_payload
- #define SOCKET_DESTRUCTOR end_using_socket_port (sock_user_t)
- #define SOCKET_IMPORTS				\
-   import "mig-decls.h";				\
-   import "../libtrivfs/mig-decls.h";		\
- 
- #define ADDRPORT_INTRAN sock_addr_t begin_using_sockaddr_port (addr_port_t)
-+#define ADDRPORT_INTRAN_PAYLOAD sock_addr_t begin_using_sockaddr_payload
- #define ADDRPORT_DESTRUCTOR end_using_sockaddr_port (sock_addr_t)
- 
- #define PF_INTRAN trivfs_protid_t trivfs_begin_using_protid (pf_t)
-+#define PF_INTRAN_PAYLOAD trivfs_protid_t trivfs_begin_using_protid_payload
- #define PF_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t)
--- 
-2.1.3
-
diff --git a/debian/patches/0014-pfinet-make-the-demuxers-payload-aware.patch b/debian/patches/0014-pfinet-make-the-demuxers-payload-aware.patch
deleted file mode 100644
index 2ec833f4..00000000
--- a/debian/patches/0014-pfinet-make-the-demuxers-payload-aware.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 09be8ecd3a467ab1772f9fd533212afaefd1e814 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sun, 13 Apr 2014 14:03:48 +0200
-Subject: [PATCH hurd 14/28] pfinet: make the demuxers payload-aware
-
-* pfinet/ethernet.c (ethernet_demuxer): Make the demuxer payload-aware.
-* pfinet/main.c (pfinet_demuxer): Likewise.
----
- pfinet/ethernet.c | 20 +++++++++++++++++++-
- pfinet/main.c     | 12 ++++++++++--
- 2 files changed, 29 insertions(+), 3 deletions(-)
-
-diff --git a/pfinet/ethernet.c b/pfinet/ethernet.c
-index 053fd1b..1678243 100644
---- a/pfinet/ethernet.c
-+++ b/pfinet/ethernet.c
-@@ -116,12 +116,30 @@ ethernet_demuxer (mach_msg_header_t *inp,
-   int datalen;
-   struct ether_device *edev;
-   struct device *dev = 0;
-+  mach_port_t local_port;
- 
-   if (inp->msgh_id != NET_RCV_MSG_ID)
-     return 0;
- 
-+  if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
-+      MACH_MSG_TYPE_PROTECTED_PAYLOAD)
-+    {
-+      struct port_info *pi = ports_lookup_payload (NULL,
-+						   inp->msgh_protected_payload,
-+						   NULL);
-+      if (pi)
-+	{
-+	  local_port = pi->port_right;
-+	  ports_port_deref (pi);
-+	}
-+      else
-+	local_port = MACH_PORT_NULL;
-+    }
-+  else
-+    local_port = inp->msgh_local_port;
-+
-   for (edev = ether_dev; edev; edev = edev->next)
--    if (inp->msgh_local_port == edev->readptname)
-+    if (local_port == edev->readptname)
-       dev = &edev->dev;
- 
-   if (! dev)
-diff --git a/pfinet/main.c b/pfinet/main.c
-index 0f1fbfc..8716fdb 100644
---- a/pfinet/main.c
-+++ b/pfinet/main.c
-@@ -86,8 +86,16 @@ pfinet_demuxer (mach_msg_header_t *inp,
- 
-   /* We have several classes in one bucket, which need to be demuxed
-      differently.  */
--  pi = ports_lookup_port(pfinet_bucket, inp->msgh_local_port, socketport_class);
--  
-+  if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
-+      MACH_MSG_TYPE_PROTECTED_PAYLOAD)
-+    pi = ports_lookup_payload (pfinet_bucket,
-+			       inp->msgh_protected_payload,
-+			       socketport_class);
-+  else
-+    pi = ports_lookup_port (pfinet_bucket,
-+			    inp->msgh_local_port,
-+			    socketport_class);
-+
-   if (pi)
-     {
-       ports_port_deref (pi);
--- 
-2.1.3
-
diff --git a/debian/patches/0015-pflocal-add-payload-aware-intrans-functions.patch b/debian/patches/0015-pflocal-add-payload-aware-intrans-functions.patch
deleted file mode 100644
index 69deb1a4..00000000
--- a/debian/patches/0015-pflocal-add-payload-aware-intrans-functions.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c1466449b07279e97488459cb05869b9168d681f Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 11:13:29 +0100
-Subject: [PATCH hurd 15/28] pflocal: add payload-aware intrans functions
-
-* pflocal/mig-mutate.h: Add mutators.
-* pflocal/mig-decls.c (begin_using_sock_user_payload): New function.
-(begin_using_addr_payload): Likewise.
----
- pflocal/mig-decls.h  | 12 ++++++++++++
- pflocal/mig-mutate.h |  3 +++
- 2 files changed, 15 insertions(+)
-
-diff --git a/pflocal/mig-decls.h b/pflocal/mig-decls.h
-index 983de9d..b1da797 100644
---- a/pflocal/mig-decls.h
-+++ b/pflocal/mig-decls.h
-@@ -36,6 +36,12 @@ begin_using_sock_user_port(mach_port_t port)
-   return (sock_user_t)ports_lookup_port (0, port, sock_user_port_class);
- }
- 
-+static inline sock_user_t __attribute__ ((unused))
-+begin_using_sock_user_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (NULL, payload, sock_user_port_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_sock_user_port (sock_user_t sock_user)
- {
-@@ -49,6 +55,12 @@ begin_using_addr_port(mach_port_t port)
-   return (addr_t)ports_lookup_port (0, port, addr_port_class);
- }
- 
-+static inline addr_t __attribute__ ((unused))
-+begin_using_addr_payload (unsigned long payload)
-+{
-+  return ports_lookup_port (NULL, payload, addr_port_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_addr_port (addr_t addr)
- {
-diff --git a/pflocal/mig-mutate.h b/pflocal/mig-mutate.h
-index b149473..238c806 100644
---- a/pflocal/mig-mutate.h
-+++ b/pflocal/mig-mutate.h
-@@ -21,13 +21,16 @@
- #define IO_SELECT_REPLY_PORT
- 
- #define IO_INTRAN sock_user_t begin_using_sock_user_port (io_t)
-+#define IO_INTRAN_PAYLOAD sock_user_t begin_using_sock_user_payload
- #define IO_DESTRUCTOR end_using_sock_user_port (sock_user_t)
- 
- #define IO_IMPORTS import "mig-decls.h";
- 
- #define SOCKET_INTRAN sock_user_t begin_using_sock_user_port (socket_t)
-+#define SOCKET_INTRAN_PAYLOAD sock_user_t begin_using_sock_user_payload
- #define SOCKET_DESTRUCTOR end_using_sock_user_port (sock_user_t)
- #define ADDRPORT_INTRAN addr_t begin_using_addr_port (addr_port_t)
-+#define ADDRPORT_INTRAN_PAYLOAD addr_t begin_using_addr_payload
- #define ADDRPORT_DESTRUCTOR end_using_addr_port (addr_t)
- 
- #define SOCKET_IMPORTS import "mig-decls.h";
--- 
-2.1.3
-
diff --git a/debian/patches/0016-proc-add-payload-aware-intrans-functions.patch b/debian/patches/0016-proc-add-payload-aware-intrans-functions.patch
deleted file mode 100644
index 055133be..00000000
--- a/debian/patches/0016-proc-add-payload-aware-intrans-functions.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 54d9dfbeefd2d427822cf74e8556044fb3626300 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 10:31:08 +0100
-Subject: [PATCH hurd 16/28] proc: add payload-aware intrans functions
-
-* proc/mig-decls.h (begin_using_proc_payload): New function.
-(begin_using_exc_payload): Likewise.
-* proc/mig-mutate.h: Add mutators.
-* proc/proc_exc.defs (exception_t): Add payload-aware in-translator
-function.
----
- proc/mig-decls.h   | 17 +++++++++++++++++
- proc/mig-mutate.h  |  4 ++++
- proc/proc_exc.defs |  1 +
- 3 files changed, 22 insertions(+)
-
-diff --git a/proc/mig-decls.h b/proc/mig-decls.h
-index 7d36a87..eb33ef3 100644
---- a/proc/mig-decls.h
-+++ b/proc/mig-decls.h
-@@ -35,6 +35,17 @@ begin_using_proc_port (mach_port_t port)
-   return (!p || p->p_dead) ? NULL : p;
- }
- 
-+static inline struct proc * __attribute__ ((unused))
-+begin_using_proc_payload (unsigned long payload)
-+{
-+  struct proc *p;
-+  p = ports_lookup_payload (proc_bucket, payload, proc_class);
-+  if (p && p->p_dead)
-+    ports_port_deref (p);
-+  return (!p || p->p_dead) ? 0 : p;
-+}
-+
-+
- static inline void __attribute__ ((unused))
- end_using_proc (struct proc *p)
- {
-@@ -50,6 +61,12 @@ begin_using_exc_port (mach_port_t port)
-   return ports_lookup_port (NULL, port, exc_class);
- }
- 
-+static inline exc_t __attribute__ ((unused))
-+begin_using_exc_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (NULL, payload, exc_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_exc (exc_t exc)
- {
-diff --git a/proc/mig-mutate.h b/proc/mig-mutate.h
-index ce9f88e..62dc2a5 100644
---- a/proc/mig-mutate.h
-+++ b/proc/mig-mutate.h
-@@ -20,6 +20,8 @@
- 
- #define PROCESS_INTRAN						\
-   pstruct_t begin_using_proc_port (process_t)
-+#define PROCESS_INTRAN_PAYLOAD					\
-+  pstruct_t begin_using_proc_payload
- #define PROCESS_DESTRUCTOR					\
-   end_using_proc (pstruct_t)
- #define PROCESS_IMPORTS						\
-@@ -27,6 +29,8 @@
- 
- #define NOTIFY_INTRAN						\
-   port_info_t begin_using_port_info_port (mach_port_t)
-+#define NOTIFY_INTRAN_PAYLOAD					\
-+  port_info_t begin_using_port_info_payload
- #define NOTIFY_DESTRUCTOR					\
-   end_using_port_info (port_info_t)
- #define NOTIFY_IMPORTS						\
-diff --git a/proc/proc_exc.defs b/proc/proc_exc.defs
-index c910824..9dc3626 100644
---- a/proc/proc_exc.defs
-+++ b/proc/proc_exc.defs
-@@ -38,6 +38,7 @@ import "mig-decls.h";
- type exception_t = mach_port_copy_send_t
- 	cusertype: mach_port_t
- 	intran: exc_t begin_using_exc_port (exception_t)
-+	intranpayload: exc_t begin_using_exc_payload
- 	destructor: end_using_exc (exc_t);
- 
- routine proc_exception_raise (
--- 
-2.1.3
-
diff --git a/debian/patches/0017-startup-disable-default-payload-to-port-mapping.patch b/debian/patches/0017-startup-disable-default-payload-to-port-mapping.patch
deleted file mode 100644
index d205a128..00000000
--- a/debian/patches/0017-startup-disable-default-payload-to-port-mapping.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b8ec92af4bb14115ad14bbfa14a3dbece34f1ff1 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 20:57:40 +0100
-Subject: [PATCH hurd 17/28] startup: disable default payload to port mapping
-
-startup does not use libports. Therefor, it is not necessary to use the
-default payload to port translation function.
-
-* startup/Makefile (MIGSFLAGS): Disable the default payload to port
-translation function.
----
- startup/Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/startup/Makefile b/startup/Makefile
-index 23d35cb..ee2ecdd5 100644
---- a/startup/Makefile
-+++ b/startup/Makefile
-@@ -25,6 +25,10 @@ OBJS = $(SRCS:.c=.o) \
- target = startup
- HURDLIBS = shouldbeinlibc
- 
-+# startup does not use libports.  Disable the default payload to port
-+# conversion.
-+MIGSFLAGS="-DHURD_DEFAULT_PAYLOAD_TO_PORT=1"
-+
- include ../Makeconf
- 
- mung_msg_S.h: msg_S.h
--- 
-2.1.3
-
diff --git a/debian/patches/0018-term-add-a-payload-aware-intrans-function.patch b/debian/patches/0018-term-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index 600770a2..00000000
--- a/debian/patches/0018-term-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 856c00ad058dec984e629a05d6f61a80cde14acc Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Mon, 14 Apr 2014 14:21:16 +0200
-Subject: [PATCH hurd 18/28] term: add a payload-aware intrans function
-
-* term/mig-mutate.h: Add mutator.
----
- term/Makefile     | 1 +
- term/mig-decls.h  | 6 ++++++
- term/mig-mutate.h | 3 +++
- 3 files changed, 10 insertions(+)
-
-diff --git a/term/Makefile b/term/Makefile
-index 5006c0d..1419d2a 100644
---- a/term/Makefile
-+++ b/term/Makefile
-@@ -33,5 +33,6 @@ include ../Makeconf
- 
- device_replyServer-CPPFLAGS = -DTypeCheck=0 -Wno-unused # XXX
- 
-+device_reply-MIGSFLAGS = -DMACH_PAYLOAD_TO_PORT=ports_payload_get_name
- tioctl-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
- term-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
-diff --git a/term/mig-decls.h b/term/mig-decls.h
-index c91b133..09b45c6 100644
---- a/term/mig-decls.h
-+++ b/term/mig-decls.h
-@@ -32,6 +32,12 @@ begin_using_ctty_port (mach_port_t port)
-   return ports_lookup_port (term_bucket, port, cttyid_class);
- }
- 
-+static inline struct port_info * __attribute__ ((unused))
-+begin_using_ctty_payload (unsigned long payload)
-+{
-+  return ports_lookup_payload (term_bucket, payload, cttyid_class);
-+}
-+
- static inline void __attribute__ ((unused))
- end_using_ctty (struct port_info *p)
- {
-diff --git a/term/mig-mutate.h b/term/mig-mutate.h
-index 1545719..af8877e 100644
---- a/term/mig-mutate.h
-+++ b/term/mig-mutate.h
-@@ -20,10 +20,13 @@
- /* Only CPP macro definitions should go in this file. */
- 
- #define IO_INTRAN trivfs_protid_t trivfs_begin_using_protid (io_t)
-+#define IO_INTRAN_PAYLOAD trivfs_protid_t trivfs_begin_using_protid_payload
- #define IO_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t)
- 
- #define CTTY_INTRAN					\
-   port_info_t begin_using_ctty_port (mach_port_t)
-+#define CTTY_INTRAN_PAYLOAD				\
-+  port_info_t begin_using_ctty_payload
- #define CTTY_DESTRUCTOR					\
-   end_using_ctty (port_info_t)
- 
--- 
-2.1.3
-
diff --git a/debian/patches/0019-trans-fakeroot-make-the-demuxer-payload-aware.patch b/debian/patches/0019-trans-fakeroot-make-the-demuxer-payload-aware.patch
deleted file mode 100644
index 52c1b7df..00000000
--- a/debian/patches/0019-trans-fakeroot-make-the-demuxer-payload-aware.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ee388ad55279fd8c0be5dfdb36961304c73512b7 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sun, 23 Nov 2014 19:24:49 +0100
-Subject: [PATCH hurd 19/28] trans/fakeroot: make the demuxer payload-aware
-
-* trans/fakeroot.c (netfs_demuxer): Make the demuxer payload-aware.
----
- trans/fakeroot.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/trans/fakeroot.c b/trans/fakeroot.c
-index df2de64..12173bd 100644
---- a/trans/fakeroot.c
-+++ b/trans/fakeroot.c
-@@ -964,9 +964,16 @@ netfs_demuxer (mach_msg_header_t *inp,
-     {
-       /* We didn't recognize the message ID, so pass the message through
- 	 unchanged to the underlying file.  */
--      struct protid *cred = ports_lookup_port (netfs_port_bucket,
--					       inp->msgh_local_port,
--					       netfs_protid_class);
-+      struct protid *cred;
-+      if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
-+	  MACH_MSG_TYPE_PROTECTED_PAYLOAD)
-+	cred = ports_lookup_payload (netfs_port_bucket,
-+				     inp->msgh_protected_payload,
-+				     netfs_protid_class);
-+      else
-+	cred = ports_lookup_port (netfs_port_bucket,
-+				  inp->msgh_local_port,
-+				  netfs_protid_class);
-       if (cred == 0)
- 	/* This must be an unknown message on our fsys control port.  */
- 	return 0;
-@@ -974,7 +981,9 @@ netfs_demuxer (mach_msg_header_t *inp,
- 	{
- 	  error_t err;
- 	  assert (MACH_MSGH_BITS_LOCAL (inp->msgh_bits)
--		  == MACH_MSG_TYPE_MOVE_SEND);
-+		  == MACH_MSG_TYPE_MOVE_SEND
-+		  || MACH_MSGH_BITS_LOCAL (inp->msgh_bits)
-+		  == MACH_MSG_TYPE_PROTECTED_PAYLOAD);
- 	  inp->msgh_bits = (inp->msgh_bits & MACH_MSGH_BITS_COMPLEX)
- 	    | MACH_MSGH_BITS (MACH_MSG_TYPE_COPY_SEND,
- 			      MACH_MSGH_BITS_REMOTE (inp->msgh_bits));
--- 
-2.1.3
-
diff --git a/debian/patches/0020-trans-ifsock-add-a-payload-aware-intrans-function.patch b/debian/patches/0020-trans-ifsock-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index 56603ddb..00000000
--- a/debian/patches/0020-trans-ifsock-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7b96b43cdd6809af47ef23b9e6c63168c0130aae Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sun, 13 Apr 2014 17:08:38 +0200
-Subject: [PATCH hurd 20/28] trans/ifsock: add a payload-aware intrans function
-
-* trans/Makefile (ifsock-MIGSFLAGS): Add mutator.
----
- trans/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/trans/Makefile b/trans/Makefile
-index 71e6424..eecaeeb 100644
---- a/trans/Makefile
-+++ b/trans/Makefile
-@@ -39,6 +39,7 @@ password-MIGSFLAGS=\
- 
- ifsock-MIGSFLAGS=\
-     "-DFILE_INTRAN=trivfs_protid_t trivfs_begin_using_protid (io_t)" \
-+    "-DFILE_INTRAN_PAYLOAD=trivfs_protid_t trivfs_begin_using_protid_payload" \
-     "-DFILE_DESTRUCTOR=trivfs_end_using_protid (trivfs_protid_t)" \
-     "-DIFSOCK_IMPORTS=import \"../libtrivfs/mig-decls.h\";"
- 
--- 
-2.1.3
-
diff --git a/debian/patches/0021-trans-password-add-a-payload-aware-intrans-function.patch b/debian/patches/0021-trans-password-add-a-payload-aware-intrans-function.patch
deleted file mode 100644
index 72f10f5c..00000000
--- a/debian/patches/0021-trans-password-add-a-payload-aware-intrans-function.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a30e0ced6a227705241586dfc118fb8a81f795ab Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 16:51:42 +0100
-Subject: [PATCH hurd 21/28] trans/password: add a payload-aware intrans
- function
-
-* trans/Makefile (password-MIGSFLAGS): Add mutator.
----
- trans/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/trans/Makefile b/trans/Makefile
-index eecaeeb..04fd276 100644
---- a/trans/Makefile
-+++ b/trans/Makefile
-@@ -34,6 +34,7 @@ LDLIBS += -lpthread
- password-LDLIBS = -lcrypt
- password-MIGSFLAGS=\
-     "-DIO_INTRAN=trivfs_protid_t trivfs_begin_using_protid (io_t)" \
-+    "-DIO_INTRAN_PAYLOAD=trivfs_protid_t trivfs_begin_using_protid_payload" \
-     "-DIO_DESTRUCTOR=trivfs_end_using_protid (trivfs_protid_t)" \
-     "-DPASSWORD_IMPORTS=import \"../libtrivfs/mig-decls.h\";"
- 
--- 
-2.1.3
-
diff --git a/debian/patches/0022-trans-streamio-make-the-translator-payload-aware.patch b/debian/patches/0022-trans-streamio-make-the-translator-payload-aware.patch
deleted file mode 100644
index f380b702..00000000
--- a/debian/patches/0022-trans-streamio-make-the-translator-payload-aware.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0b6e61e8a879fa696351831c9176826fa9eb6d91 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Fri, 21 Nov 2014 05:29:36 +0100
-Subject: [PATCH hurd 22/28] trans/streamio: make the translator payload-aware
-
-* trans/Makefile (device_reply-MIGSFLAGS): Define MACH_PAYLOAD_TO_PORT.
----
- trans/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/trans/Makefile b/trans/Makefile
-index 04fd276..b6edb97 100644
---- a/trans/Makefile
-+++ b/trans/Makefile
-@@ -44,6 +44,9 @@ ifsock-MIGSFLAGS=\
-     "-DFILE_DESTRUCTOR=trivfs_end_using_protid (trivfs_protid_t)" \
-     "-DIFSOCK_IMPORTS=import \"../libtrivfs/mig-decls.h\";"
- 
-+# device_replyServer is used by the streamio translator.
-+device_reply-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
-+
- include ../Makeconf
- 
- vpath elfcore.c $(top_srcdir)/exec
--- 
-2.1.3
-
diff --git a/debian/patches/0023-trans-symlink-disable-default-payload-to-port-mappin.patch b/debian/patches/0023-trans-symlink-disable-default-payload-to-port-mappin.patch
deleted file mode 100644
index 7d3688a8..00000000
--- a/debian/patches/0023-trans-symlink-disable-default-payload-to-port-mappin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 79e0ee0fab3b79b64c4bb1d15d30af67622b9631 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 21:00:48 +0100
-Subject: [PATCH hurd 23/28] trans/symlink: disable default payload to port
- mapping
-
-`fsysServer' is only used by the symlink translator which does not use
-libports.  Therefor, it is not necessary to use the default payload to
-port translation function.
-
-* trans/Makefile (fsys-MIGSFLAGS): Disable the default payload to port
-translation function.
----
- trans/Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/trans/Makefile b/trans/Makefile
-index b6edb97..ce1eae7 100644
---- a/trans/Makefile
-+++ b/trans/Makefile
-@@ -47,6 +47,10 @@ ifsock-MIGSFLAGS=\
- # device_replyServer is used by the streamio translator.
- device_reply-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
- 
-+# fsysServer is only used by the symlink translator which does not use
-+# libports.  Disable the default payload to port conversion.
-+fsys-MIGSFLAGS = "-DHURD_DEFAULT_PAYLOAD_TO_PORT=1"
-+
- include ../Makeconf
- 
- vpath elfcore.c $(top_srcdir)/exec
--- 
-2.1.3
-
diff --git a/debian/patches/0024-utils-rpctrace-make-trace_and_forward-payload-aware.patch b/debian/patches/0024-utils-rpctrace-make-trace_and_forward-payload-aware.patch
deleted file mode 100644
index ed0a4274..00000000
--- a/debian/patches/0024-utils-rpctrace-make-trace_and_forward-payload-aware.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 2f8b47d3c7d991f9f030dd688b2bffb2f228d48a Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 12:21:49 +0100
-Subject: [PATCH hurd 24/28] utils/rpctrace: make `trace_and_forward'
- payload-aware
-
-As the protected payloads were retrofitted into the Mach message
-format, the local port type is lost.
-
-* utils/rpctrace.c (is_notification): New function
-(trace_and_forward): Recover the original local port type.
----
- utils/rpctrace.c | 29 ++++++++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/utils/rpctrace.c b/utils/rpctrace.c
-index c954e51..62d3c87 100644
---- a/utils/rpctrace.c
-+++ b/utils/rpctrace.c
-@@ -1195,6 +1195,16 @@ wrap_new_task (mach_msg_header_t *inp, struct req_info *req)
-   ports_port_deref (task_wrapper1);
- }
- 
-+/* Returns true if the given message is a Mach notification.  */
-+static inline int
-+is_notification (const mach_msg_header_t *InHeadP)
-+{
-+  int msgh_id = InHeadP->msgh_id - 64;
-+  if ((msgh_id > 8) || (msgh_id < 0))
-+    return 0;
-+  return 1;
-+}
-+
- int
- trace_and_forward (mach_msg_header_t *inp, mach_msg_header_t *outp)
- {
-@@ -1219,7 +1229,24 @@ trace_and_forward (mach_msg_header_t *inp, mach_msg_header_t *outp)
-   /* Look up our record for the receiving port.  There is no need to check
-      the class, because our port bucket only ever contains one class of
-      ports (traced_class).  */
--  info = ports_lookup_port (traced_bucket, inp->msgh_local_port, 0);
-+
-+  if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) == MACH_MSG_TYPE_PROTECTED_PAYLOAD)
-+    {
-+      info = ports_lookup_payload (traced_bucket, inp->msgh_protected_payload,
-+				   NULL);
-+      if (info)
-+	{
-+	  /* Undo the protected payload optimization.  */
-+	  inp->msgh_bits = MACH_MSGH_BITS (
-+	    MACH_MSGH_BITS_REMOTE (inp->msgh_bits),
-+	    is_notification (inp)? MACH_MSG_TYPE_MOVE_SEND_ONCE: info->type)
-+	    | MACH_MSGH_BITS_OTHER (inp->msgh_bits);
-+	  inp->msgh_local_port = ports_payload_get_name (info);
-+	}
-+    }
-+  else
-+    info = ports_lookup_port (traced_bucket, inp->msgh_local_port, NULL);
-+
-   assert (info);
- 
-   /* A notification message from the kernel appears to have been sent
--- 
-2.1.3
-
diff --git a/debian/patches/0025-hurd-add-intranpayload-functions-to-all-hurd-types.patch b/debian/patches/0025-hurd-add-intranpayload-functions-to-all-hurd-types.patch
deleted file mode 100644
index 7ec5c0d9..00000000
--- a/debian/patches/0025-hurd-add-intranpayload-functions-to-all-hurd-types.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-From abf2968653b3faa82f623b99d20de64f69c8d5e6 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Thu, 28 Nov 2013 10:24:26 +0100
-Subject: [PATCH hurd 25/28] hurd: add intranpayload functions to all hurd
- types
-
-For each hurd type defined in hurd_types.h, add a intranpayload
-function.  If an X_INTRAN mutation is defined for a type, a
-corresponding X_INTRAN_PAYLOAD has to be defined.  If no X_INTRAN
-mutation is defined, use ports_payload_get_name as intranpayload
-function, turning the payload back into an port name.
-
-* hurd/hurd_types.defs: Add intranpayload functions.
-* hurd/term.defs: Likewise.
-* hurd/default_pager.defs: Include `hurd_types.defs' for
-`MACH_PAYLOAD_TO_PORT'.
----
- hurd/default_pager.defs |   1 +
- hurd/hurd_types.defs    | 120 +++++++++++++++++++++++++++++++++++++++++++++++-
- hurd/term.defs          |   3 ++
- 3 files changed, 123 insertions(+), 1 deletion(-)
-
-diff --git a/hurd/default_pager.defs b/hurd/default_pager.defs
-index 1a4290d..a97bff2 100644
---- a/hurd/default_pager.defs
-+++ b/hurd/default_pager.defs
-@@ -29,6 +29,7 @@
- 
- subsystem default_pager 2275;
- 
-+#include <hurd/hurd_types.defs>	/* For `MACH_PAYLOAD_TO_PORT'.  */
- #include <mach/std_types.defs>
- #include <mach/mach_types.defs>
- #include <mach/default_pager_types.defs>
-diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
-index 129a68c..57af6dc 100644
---- a/hurd/hurd_types.defs
-+++ b/hurd/hurd_types.defs
-@@ -18,13 +18,67 @@ along with the GNU Hurd; see the file COPYING.  If not, write to
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
- 
- 
-+/* The Hurd uses protected payloads to quickly look up the object
-+   receiving a message.  Looking up objects is optimized at the cost
-+   of having to translate payloads back to port names if the server
-+   function expect a port name rather than an object.
-+
-+   Support for this is implemented in libports.  Almost all of Hurd's
-+   servers use libports.  For servers using libports, the optimized
-+   lookup is completely transparent.
-+
-+   Servers not using libports are not using protected payloads
-+   automatically.  Define HURD_DEFAULT_PAYLOAD_TO_PORT to 1 (1 like
-+   the identity function) for programs not using libports to avoid
-+   injecting the default payload-to-port translation function which is
-+   in libports.  If you want to use protected payloads without
-+   libports, you can use HURD_DEFAULT_PAYLOAD_TO_PORT to inject a
-+   custom translation function.  */
-+
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+#if HURD_DEFAULT_PAYLOAD_TO_PORT
-+/* Any non-numeric value will fail this test.  If 1 (or any number) is
-+   given, do not inject the default translator function.  */
-+#undef HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
-+#else
-+   import <hurd/ports.h>;
-+#define HURD_DEFAULT_PAYLOAD_TO_PORT ports_payload_get_name
-+#endif
-+
-+/* Override the mach_port_t.  Use the default payload to port
-+   translation function to convert payloads back to port names for
-+   this type.  */
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+#define MACH_PAYLOAD_TO_PORT	HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
-+
- #include <mach/std_types.defs>
- #include <mach/mach_types.defs>
- #include <device/device_types.defs>
-+
-+/* The Hurd types.  You can inject translation functions for type X
-+   using the X_INTRAN, X_INTRAN_PAYLOAD, X_OUTTRAN, and X_DESTRUCTOR.
-+
-+   If you define X_INTRAN and your server is using libports, you also
-+   have to define X_INTRAN_PAYLOAD.
-+
-+   If you do not use libports, and do not want to use the protected
-+   payload mechanism, but you do want to use X_INTRAN, you must
-+   provide a X_INTRAN_PAYLOAD that either ignores the message by
-+   returning NULL, or indicates an error condition in some appropriate
-+   way.  If you do want to use the protected payload mechanism, make
-+   sure you also define an appropriate HURD_DEFAULT_PAYLOAD_TO_PORT
-+   translation function.  */
- 
- type file_t = mach_port_copy_send_t
- #ifdef FILE_INTRAN
- intran: FILE_INTRAN
-+intranpayload: FILE_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: file_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef FILE_OUTTRAN
- outtran: FILE_OUTTRAN
-@@ -37,6 +91,11 @@ destructor: FILE_DESTRUCTOR
- type fsys_t = mach_port_copy_send_t
- #ifdef FSYS_INTRAN
- intran: FSYS_INTRAN
-+intranpayload: FSYS_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: fsys_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef FSYS_OUTTRAN
- outtran: FSYS_OUTTRAN
-@@ -50,6 +109,11 @@ destructor: FSYS_DESTRUCTOR
- type io_t = mach_port_copy_send_t
- #ifdef IO_INTRAN
- intran: IO_INTRAN
-+intranpayload: IO_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: io_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef IO_OUTTRAN
- outtran: IO_OUTTRAN
-@@ -62,6 +126,11 @@ destructor: IO_DESTRUCTOR
- type process_t = mach_port_copy_send_t
- #ifdef PROCESS_INTRAN
- intran: PROCESS_INTRAN
-+intranpayload: PROCESS_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: process_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef PROCESS_OUTTRAN
- outtran: PROCESS_OUTTRAN
-@@ -74,6 +143,11 @@ destructor: PROCESS_DESTRUCTOR
- type auth_t = mach_port_copy_send_t
- #ifdef AUTH_INTRAN
- intran: AUTH_INTRAN
-+intranpayload: AUTH_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: auth_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef AUTH_OUTTRAN
- outtran: AUTH_OUTTRAN
-@@ -86,6 +160,11 @@ destructor: AUTH_DESTRUCTOR
- type socket_t = mach_port_copy_send_t
- #ifdef SOCKET_INTRAN
- intran: SOCKET_INTRAN
-+intranpayload: SOCKET_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: socket_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef SOCKET_OUTTRAN
- outtran: SOCKET_OUTTRAN
-@@ -99,6 +178,11 @@ destructor: SOCKET_DESTRUCTOR
- type pf_t = mach_port_copy_send_t
- #ifdef PF_INTRAN
- intran: PF_INTRAN
-+intranpayload: PF_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: pf_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef PF_OUTTRAN
- outtran: PF_OUTTRAN
-@@ -111,6 +195,11 @@ destructor: PF_DESTRUCTOR
- type addr_port_t = mach_port_copy_send_t
- #ifdef ADDRPORT_INTRAN
- intran: ADDRPORT_INTRAN
-+intranpayload: ADDRPORT_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: addr_port_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef ADDRPORT_OUTTRAN
- outtran: ADDRPORT_OUTTRAN
-@@ -123,6 +212,11 @@ destructor: ADDRPORT_DESTRUCTOR
- type term_t = mach_port_copy_send_t
- #ifdef TERM_INTRAN
- intran: TERM_INTRAN
-+intranpayload: TERM_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: term_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef TERM_OUTTRAN
- outtran: TERM_OUTTRAN
-@@ -135,6 +229,11 @@ destructor: TERM_DESTRUCTOR
- type startup_t = mach_port_copy_send_t
- #ifdef STARTUP_INTRAN
- intran: STARTUP_INTRAN
-+intranpayload: STARTUP_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: startup_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef STARTUP_OUTTRAN
- outtran: STARTUP_OUTTRAN
-@@ -147,6 +246,11 @@ destructor: STARTUP_DESTRUCTOR
- type fs_notify_t = mach_port_copy_send_t
- #ifdef FS_NOTIFY_INTRAN
- intran: FS_NOTIFY_INTRAN
-+intranpayload: FS_NOTIFY_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: fs_notify_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef FS_NOTIFY_OUTTRAN
- outtran: FS_NOTIFY_OUTTRAN
-@@ -159,6 +263,11 @@ destructor: FS_NOTIFY_DESTRUCTOR
- type exec_startup_t = mach_port_copy_send_t
- #ifdef EXEC_STARTUP_INTRAN
- intran: EXEC_STARTUP_INTRAN
-+intranpayload: EXEC_STARTUP_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: exec_startup_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef EXEC_STARTUP_OUTTRAN
- outtran: EXEC_STARTUP_OUTTRAN
-@@ -171,6 +280,11 @@ destructor: EXEC_STARTUP_DESTRUCTOR
- type interrupt_t = mach_port_copy_send_t
- #ifdef INTERRUPT_INTRAN
- intran: INTERRUPT_INTRAN
-+intranpayload: INTERRUPT_INTRAN_PAYLOAD
-+#else
-+#ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-+intranpayload: exec_startup_t HURD_DEFAULT_PAYLOAD_TO_PORT
-+#endif
- #endif
- #ifdef INTERRUPT_OUTTRAN
- outtran: INTERRUPT_OUTTRAN
-@@ -184,7 +298,11 @@ destructor: INTERRUPT_DESTRUCTOR
- type proccoll_t = mach_port_copy_send_t;
- 
- type sreply_port_t = MACH_MSG_TYPE_MAKE_SEND_ONCE | polymorphic
--	ctype: mach_port_t;
-+	ctype: mach_port_t
-+#ifdef	MACH_PAYLOAD_TO_PORT
-+intranpayload: mach_port_t MACH_PAYLOAD_TO_PORT
-+#endif	/* MACH_PAYLOAD_TO_PORT */
-+;
- 
- /* These macros are used in some .defs files so that every routine has a
-    server reply port argument #ifdef REPLY_PORTS.  */
-diff --git a/hurd/term.defs b/hurd/term.defs
-index 45d825d..29b94ef 100644
---- a/hurd/term.defs
-+++ b/hurd/term.defs
-@@ -33,6 +33,9 @@ type ctty_t = mach_port_copy_send_t
- #ifdef CTTY_INTRAN
- intran: CTTY_INTRAN
- #endif
-+#ifdef CTTY_INTRAN_PAYLOAD
-+intranpayload: CTTY_INTRAN_PAYLOAD
-+#endif
- #ifdef CTTY_OUTTRAN
- outtran: CTTY_OUTTRAN
- #endif
--- 
-2.1.3
-
diff --git a/debian/patches/0026-libports-use-protected-payloads-to-optimize-the-obje.patch b/debian/patches/0026-libports-use-protected-payloads-to-optimize-the-obje.patch
deleted file mode 100644
index cf70ee11..00000000
--- a/debian/patches/0026-libports-use-protected-payloads-to-optimize-the-obje.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From 17a4eebe9b0de469be71b931601dbde49f8fa9cd Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sat, 23 Nov 2013 16:12:55 +0100
-Subject: [PATCH hurd 26/28] libports: use protected payloads to optimize the
- object lookup
-
-* libports/create-internal.c (_ports_create_port_internal): Set the
-protected payload to the objects address.
-* libports/import-port.c (ports_import_port): Likewise.
-* libports/reallocate-from-external.c (ports_reallocate_from_external):
-Likewise.
-* libports/reallocate-port.c (ports_reallocate_port): Likewise.
-* libports/transfer-right.c (ports_transfer_right): Likewise.
-* libports/manage-multithread.c (ports_manage_port_operations_multithread):
-Use the protected payload as the objects address if provided.
-* libports/manage-one-thread.c (ports_manage_port_operations_one_thread):
-Likewise.
-* libports/destroy-right.c (ports_destroy_right): Defer the
-dereferencing of outstanding send rights to avoid a port_info
-use-after-free if a no-senders notification is dispatched.
-(struct deferred_dereference, gc_loop, start_gc, defer_dereferencing):
-Simple generational garbage collection of outstanding send rights.
----
- libports/complete-deallocate.c      |   2 +-
- libports/create-internal.c          |   6 +-
- libports/destroy-right.c            | 133 ++++++++++++++++++++++++++++++++++--
- libports/import-port.c              |   6 +-
- libports/manage-multithread.c       |  22 +++++-
- libports/manage-one-thread.c        |  22 +++++-
- libports/reallocate-from-external.c |   4 ++
- libports/reallocate-port.c          |   4 ++
- libports/transfer-right.c           |   3 +
- 9 files changed, 193 insertions(+), 9 deletions(-)
-
-diff --git a/libports/complete-deallocate.c b/libports/complete-deallocate.c
-index 0d852f5..6799dfd 100644
---- a/libports/complete-deallocate.c
-+++ b/libports/complete-deallocate.c
-@@ -27,7 +27,7 @@ _ports_complete_deallocate (struct port_info *pi)
- {
-   assert ((pi->flags & PORT_HAS_SENDRIGHTS) == 0);
- 
--  if (pi->port_right)
-+  if (MACH_PORT_VALID (pi->port_right))
-     {
-       struct references result;
- 
-diff --git a/libports/create-internal.c b/libports/create-internal.c
-index 2d85931..d79dc78 100644
---- a/libports/create-internal.c
-+++ b/libports/create-internal.c
-@@ -99,7 +99,11 @@ _ports_create_port_internal (struct port_class *class,
-   bucket->count++;
-   class->count++;
-   pthread_mutex_unlock (&_ports_lock);
--  
-+
-+  /* This is an optimization.  It may fail.  */
-+  mach_port_set_protected_payload (mach_task_self (), port,
-+				   (unsigned long) pi);
-+
-   if (install)
-     {
-       err = mach_port_move_member (mach_task_self (), pi->port_right,
-diff --git a/libports/destroy-right.c b/libports/destroy-right.c
-index 448b379..c229d77 100644
---- a/libports/destroy-right.c
-+++ b/libports/destroy-right.c
-@@ -1,5 +1,5 @@
- /*
--   Copyright (C) 1995, 1996, 1999 Free Software Foundation, Inc.
-+   Copyright (C) 1995, 1996, 1999, 2014 Free Software Foundation, Inc.
-    Written by Michael I. Bushnell.
- 
-    This file is part of the GNU Hurd.
-@@ -22,30 +22,155 @@
- #include <hurd/ihash.h>
- #include <assert.h>
- 
-+#include <pthread.h>
-+#include <error.h>
-+#include <time.h>
-+#include <unistd.h>
-+
-+/* To prevent protected payloads from becoming stale, we defer the
-+   derefercing of port_info objects.  Consumes PI.  */
-+static error_t defer_dereferencing (struct port_info *pi);
-+
- error_t
- ports_destroy_right (void *portstruct)
- {
-   struct port_info *pi = portstruct;
-   error_t err;
- 
-+  mach_port_clear_protected_payload (mach_task_self (),
-+				     pi->port_right);
-+
-+  pthread_mutex_lock (&_ports_lock);
-   if (pi->port_right != MACH_PORT_NULL)
-     {
-       pthread_rwlock_wrlock (&_ports_htable_lock);
-       hurd_ihash_locp_remove (&_ports_htable, pi->ports_htable_entry);
-       hurd_ihash_locp_remove (&pi->bucket->htable, pi->hentry);
-       pthread_rwlock_unlock (&_ports_htable_lock);
-+
-       err = mach_port_mod_refs (mach_task_self (), pi->port_right,
- 				MACH_PORT_RIGHT_RECEIVE, -1);
-       assert_perror (err);
- 
--      pi->port_right = MACH_PORT_NULL;
--
-       if (pi->flags & PORT_HAS_SENDRIGHTS)
- 	{
- 	  pi->flags &= ~PORT_HAS_SENDRIGHTS;
--	  ports_port_deref (pi);
-+
-+	  /* There are outstanding send rights, so we might get a
-+	     no-senders notification.  Attached to the notification
-+	     is a reference to the port_info object.  Of course we
-+	     destroyed the receive right these were send to above, but
-+	     the message could already have been send and dequeued.
-+
-+	     Previously, those messages would have carried an stale
-+	     name, which would have caused a hash table lookup
-+	     failure.  However, stale payloads results in port_info
-+	     use-after-free.  Therefore, we cannot release the
-+	     reference here, but defer that instead.  */
-+	  defer_dereferencing (pi);
- 	}
-+
-+      pi->port_right = MACH_PORT_DEAD;
-     }
-+  pthread_mutex_unlock (&_ports_lock);
-+
-+  return 0;
-+}
-+
-+/* Simple lock-less generational garbage collection.  */
-+
-+/* We maintain three lists of objects.	Producers add objects to the
-+   current generation G using defer_dereferencing.  G-1 holds old
-+   objects, G-2 holds garbage.	*/
-+static struct deferred_dereference
-+{
-+  struct deferred_dereference *next;
-+  struct port_info *pi;	/* We hold a reference for these objects.  */
-+} *generations[3];	/* Must be accessed using atomic
-+			   operations.	*/
-+
-+/* The current generation.  Must be accessed using atomic operations.  */
-+static int generation;
-+
-+/* The garbage collection thread.  Does not return.  */
-+static void *
-+gc_loop (void *arg)
-+{
-+  while (1)
-+    {
-+      int old, garbage;
-+      struct deferred_dereference *d;
-+
-+      sleep (5);
-+
-+      /* We are the only one updating generation, so this is safe.  */
-+      old = generation;
-+
-+      /* Update generation.  */
-+      __atomic_store_n (&generation, (old + 1) % 3, __ATOMIC_RELAXED);
-+
-+      /* This is the garbage generation.  As all writers are long
-+	 gone, we do not need to bother with atomic operations.	 */
-+      garbage = (old + 2) % 3;
-+      d = generations[garbage];
-+      generations[garbage] = NULL;
-+      while (d != NULL)
-+	{
-+	  struct deferred_dereference *next = d->next;
-+
-+	  /* Get rid of our reference.	*/
-+	  ports_port_deref (d->pi);
-+
-+	  free (d);
-+	  d = next;
-+	}
-+    }
-+
-+  assert (! "reached");
-+  return NULL;
-+}
-+
-+/* Start the gc thread.  */
-+static void
-+start_gc (void)
-+{
-+  error_t err;
-+  pthread_attr_t attr;
-+  pthread_t thread;
-+
-+  pthread_attr_init (&attr);
-+#define STACK_SIZE (64 * 1024)
-+  pthread_attr_setstacksize (&attr, STACK_SIZE);
-+#undef STACK_SIZE
-+
-+  err = pthread_create (&thread, &attr, gc_loop, NULL);
-+  assert_perror (err);
-+  err = pthread_detach (thread);
-+  assert_perror (err);
-+}
-+
-+/* Defer the derefercing of port_info objects.  Consumes PI.  */
-+static error_t
-+defer_dereferencing (struct port_info *pi)
-+{
-+  static pthread_once_t once = PTHREAD_ONCE_INIT;
-+  int g;
-+  struct deferred_dereference *d;
-+  pthread_once (&once, start_gc);
-+
-+  d = malloc (sizeof *d);
-+  if (d == NULL)
-+    return ENOMEM;
-+  d->pi = pi;
-+
-+ retry:
-+  /* Append to the current generation.	*/
-+  g = __atomic_load_n (&generation, __ATOMIC_RELAXED);
-+
-+  d->next = __atomic_load_n (&generations[g], __ATOMIC_RELAXED);
-+  if (! __atomic_compare_exchange_n (&generations[g], &d->next, d,
-+				     0, __ATOMIC_RELAXED, __ATOMIC_RELAXED))
-+    goto retry;
- 
-   return 0;
- }
-diff --git a/libports/import-port.c b/libports/import-port.c
-index c337c85..2c638e1 100644
---- a/libports/import-port.c
-+++ b/libports/import-port.c
-@@ -93,7 +93,11 @@ ports_import_port (struct port_class *class, struct port_bucket *bucket,
-   bucket->count++;
-   class->count++;
-   pthread_mutex_unlock (&_ports_lock);
--  
-+
-+  /* This is an optimization.  It may fail.  */
-+  mach_port_set_protected_payload (mach_task_self (), port,
-+				   (unsigned long) pi);
-+
-   mach_port_move_member (mach_task_self (), port, bucket->portset);
- 
-   if (stat.mps_srights)
-diff --git a/libports/manage-multithread.c b/libports/manage-multithread.c
-index 2067cba..90b3044 100644
---- a/libports/manage-multithread.c
-+++ b/libports/manage-multithread.c
-@@ -162,7 +162,27 @@ ports_manage_port_operations_multithread (struct port_bucket *bucket,
-       outp->RetCodeType = RetCodeType;
-       outp->RetCode = MIG_BAD_ID;
- 
--      pi = ports_lookup_port (bucket, inp->msgh_local_port, 0);
-+      if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
-+	  MACH_MSG_TYPE_PROTECTED_PAYLOAD)
-+	{
-+	  pi = (struct port_info *) inp->msgh_protected_payload;
-+	  if (pi && pi->bucket == bucket)
-+	    ports_port_ref (pi);
-+	  else
-+	    pi = NULL;
-+	}
-+      else
-+	{
-+	  pi = ports_lookup_port (bucket, inp->msgh_local_port, 0);
-+	  if (pi)
-+	    {
-+	      inp->msgh_bits = MACH_MSGH_BITS (
-+		MACH_MSGH_BITS_REMOTE (inp->msgh_bits),
-+		MACH_MSG_TYPE_PROTECTED_PAYLOAD);
-+	      inp->msgh_protected_payload = (unsigned long) pi;
-+	    }
-+	}
-+
-       if (pi)
- 	{
- 	  error_t err = ports_begin_rpc (pi, inp->msgh_id, &link);
-diff --git a/libports/manage-one-thread.c b/libports/manage-one-thread.c
-index cbd2df7..58c0f36 100644
---- a/libports/manage-one-thread.c
-+++ b/libports/manage-one-thread.c
-@@ -57,7 +57,27 @@ ports_manage_port_operations_one_thread (struct port_bucket *bucket,
-       outp->RetCodeType = RetCodeType;
-       outp->RetCode = MIG_BAD_ID;
- 
--      pi = ports_lookup_port (bucket, inp->msgh_local_port, 0);
-+      if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
-+	  MACH_MSG_TYPE_PROTECTED_PAYLOAD)
-+	{
-+	  pi = (struct port_info *) inp->msgh_protected_payload;
-+	  if (pi && pi->bucket == bucket)
-+	    ports_port_ref (pi);
-+	  else
-+	    pi = NULL;
-+	}
-+      else
-+	{
-+	  pi = ports_lookup_port (bucket, inp->msgh_local_port, 0);
-+	  if (pi)
-+	    {
-+	      inp->msgh_bits = MACH_MSGH_BITS (
-+		MACH_MSGH_BITS_REMOTE (inp->msgh_bits),
-+		MACH_MSG_TYPE_PROTECTED_PAYLOAD);
-+	      inp->msgh_protected_payload = (unsigned long) pi;
-+	    }
-+	}
-+
-       if (pi)
- 	{
- 	  err = ports_begin_rpc (pi, inp->msgh_id, &link);
-diff --git a/libports/reallocate-from-external.c b/libports/reallocate-from-external.c
-index 7205bd9..d0fae1a 100644
---- a/libports/reallocate-from-external.c
-+++ b/libports/reallocate-from-external.c
-@@ -71,6 +71,10 @@ ports_reallocate_from_external (void *portstruct, mach_port_t receive)
-   pthread_mutex_unlock (&_ports_lock);
-   assert_perror (err);
- 
-+  /* This is an optimization.  It may fail.  */
-+  mach_port_set_protected_payload (mach_task_self (), pi->port_right,
-+				   (unsigned long) pi);
-+
-   mach_port_move_member (mach_task_self (), receive, pi->bucket->portset);
-   
-   if (stat.mps_srights)
-diff --git a/libports/reallocate-port.c b/libports/reallocate-port.c
-index cc534eb..4e859a1 100644
---- a/libports/reallocate-port.c
-+++ b/libports/reallocate-port.c
-@@ -59,6 +59,10 @@ ports_reallocate_port (void *portstruct)
-   pthread_mutex_unlock (&_ports_lock);
-   assert_perror (err);
- 
-+  /* This is an optimization.  It may fail.  */
-+  mach_port_set_protected_payload (mach_task_self (), pi->port_right,
-+				   (unsigned long) pi);
-+
-   err = mach_port_move_member (mach_task_self (), pi->port_right, 
- 			       pi->bucket->portset);
-   assert_perror (err);
-diff --git a/libports/transfer-right.c b/libports/transfer-right.c
-index 776a8d2..64de7f7 100644
---- a/libports/transfer-right.c
-+++ b/libports/transfer-right.c
-@@ -91,6 +91,9 @@ ports_transfer_right (void *tostruct,
-       err = hurd_ihash_add (&topi->bucket->htable, port, topi);
-       pthread_rwlock_unlock (&_ports_htable_lock);
-       assert_perror (err);
-+      /* This is an optimization.  It may fail.  */
-+      mach_port_set_protected_payload (mach_task_self (), port,
-+				       (unsigned long) topi);
-       if (topi->bucket != frompi->bucket)
-         {
- 	  err = mach_port_move_member (mach_task_self (), port,
--- 
-2.1.3
-
diff --git a/debian/patches/0027-libports-Fix-build.patch b/debian/patches/0027-libports-Fix-build.patch
deleted file mode 100644
index 5f8332d3..00000000
--- a/debian/patches/0027-libports-Fix-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From da5f88d7fa960c4676ac479eaa67b14a58fc17ee Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Wed, 27 Nov 2013 11:22:29 +0100
-Subject: [PATCH hurd 27/28] libports: Fix build
-
----
- libports/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libports/Makefile b/libports/Makefile
-index f49cb9f..6e25cd7 100644
---- a/libports/Makefile
-+++ b/libports/Makefile
-@@ -42,7 +42,7 @@ installhdrs = ports.h
- 
- HURDLIBS= ihash
- LDLIBS += -lpthread
--OBJS = $(SRCS:.c=.o) notifyServer.o interruptServer.o
-+OBJS = $(SRCS:.c=.o) notifyServer.o interruptServer.o mach_portUser.o
- 
- MIGCOMSFLAGS = -prefix ports_
- MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
--- 
-2.1.3
-
diff --git a/debian/patches/0028-mach-defpager-fix-build.patch b/debian/patches/0028-mach-defpager-fix-build.patch
deleted file mode 100644
index 42ef3847..00000000
--- a/debian/patches/0028-mach-defpager-fix-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f33d9bf82670af8b70f157d87698319a6d793f8 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Fri, 14 Mar 2014 00:32:52 +0100
-Subject: [PATCH hurd 28/28] mach-defpager: fix build
-
----
- mach-defpager/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mach-defpager/Makefile b/mach-defpager/Makefile
-index 09debed..ed115bd 100644
---- a/mach-defpager/Makefile
-+++ b/mach-defpager/Makefile
-@@ -27,7 +27,7 @@ SRCS	:= default_pager.c kalloc.c wiring.c main.c setup.c
- OBJS 	:= $(SRCS:.c=.o) \
- 	   $(addsuffix Server.o,\
- 		       memory_object default_pager memory_object_default exc) \
--	   default_pager_replyUser.o
-+	   default_pager_replyUser.o mach_portUser.o
- 
- HURDLIBS:= ihash
- OTHERLIBS:= -lpthread
--- 
-2.1.3
-
diff --git a/debian/patches/series b/debian/patches/series
index d6f3ef2f..dca91cc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,35 +41,7 @@ xkb-compat.patch
 #trans-crash-add-verbose.patch
 
 #procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch
-#startup-avoid-broken-puts.patch
+startup-avoid-broken-puts.patch
 
 
 dde-protected-payloads.patch
-0001-libshouldbeinlibc-move-the-reference-counting-primit.patch
-0002-libports-add-ports_lookup_payload-and-ports_payload_.patch
-0003-libports-add-a-payload-aware-intrans-function.patch
-0004-libdiskfs-add-payload-aware-intrans-functions.patch
-0005-libnetfs-add-a-payload-aware-intrans-function.patch
-0006-libtrivfs-add-payload-aware-intrans-functions.patch
-0007-libpager-add-a-payload-aware-intrans-function.patch
-0008-libcons-add-a-payload-aware-intrans-function.patch
-0009-auth-add-a-payload-aware-intrans-function.patch
-0010-console-add-a-payload-aware-intrans-function.patch
-0011-console-client-make-the-demuxer-payload-aware.patch
-0012-exec-add-payload-aware-intrans-functions.patch
-0013-pfinet-add-payload-aware-intrans-functions.patch
-0014-pfinet-make-the-demuxers-payload-aware.patch
-0015-pflocal-add-payload-aware-intrans-functions.patch
-0016-proc-add-payload-aware-intrans-functions.patch
-0017-startup-disable-default-payload-to-port-mapping.patch
-0018-term-add-a-payload-aware-intrans-function.patch
-0019-trans-fakeroot-make-the-demuxer-payload-aware.patch
-0020-trans-ifsock-add-a-payload-aware-intrans-function.patch
-0021-trans-password-add-a-payload-aware-intrans-function.patch
-0022-trans-streamio-make-the-translator-payload-aware.patch
-0023-trans-symlink-disable-default-payload-to-port-mappin.patch
-0024-utils-rpctrace-make-trace_and_forward-payload-aware.patch
-0025-hurd-add-intranpayload-functions-to-all-hurd-types.patch
-0026-libports-use-protected-payloads-to-optimize-the-obje.patch
-0027-libports-Fix-build.patch
-0028-mach-defpager-fix-build.patch