refresh_debian/patches/exec_filename_fs.patch

1 files changed, 139 insertions, 179 deletions

diff --git a/debian/patches/exec_filename_fs.patch b/debian/patches/exec_filename_fs.patch
index 51f5aaa4..d80779c9 100644
--- a/debian/patches/exec_filename_fs.patch
+++ b/debian/patches/exec_filename_fs.patch
@@ -24,11 +24,9 @@ Change comments and documentation.
  utils/login.c                     |   23 +++++++---
  13 files changed, 350 insertions(+), 92 deletions(-)
 
-Index: hurd-debian/TODO
-===================================================================
---- hurd-debian.orig/TODO	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/TODO	2013-06-19 23:32:37.000000000 +0000
-@@ -136,7 +136,7 @@
+--- a/TODO
++++ b/TODO
+@@ -135,7 +135,7 @@ See `tasks', the exported task list.
  
  ** libtrivfs
  *** Allow for read/write/exec to be passed down.
@@ -37,11 +35,9 @@ Index: hurd-debian/TODO
  *** Provide for the visible owner, etc., to be held in command-line args
      instead of the underlying node, when it's important. !!
  
-Index: hurd-debian/doc/hurd.texi
-===================================================================
---- hurd-debian.orig/doc/hurd.texi	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/doc/hurd.texi	2013-06-19 23:32:37.000000000 +0000
-@@ -2738,10 +2738,10 @@
+--- a/doc/hurd.texi
++++ b/doc/hurd.texi
+@@ -2737,10 +2737,10 @@ write the file.
  @node Program Execution
  @subsection Program Execution
  
@@ -55,7 +51,7 @@ Index: hurd-debian/doc/hurd.texi
  ports are necessary for setuid execution, and then invoke the standard
  execserver found on @file{/servers/exec}.
  
-@@ -2753,13 +2753,13 @@
+@@ -2752,13 +2752,13 @@ The file must be opened for execution; i
  be returned.  In addition, at least one of the execute bits must be on.  A
  failure of this check should result in @code{EACCES}---not
  @code{ENOEXEC}.  It is not proper for the fileserver ever to respond to
@@ -73,7 +69,7 @@ Index: hurd-debian/doc/hurd.texi
  it is not acceptable to return an error; in such a case the server
  should simply silently fail to implement the setuid/setgid semantics.
  
-@@ -2774,7 +2774,7 @@
+@@ -2773,7 +2773,7 @@ will not share any file pointers with th
  opened with @code{O_READ}.  Finally, all the information (mutated
  appropriately for setuid/setgid) should be sent to the execserver with
  @code{exec_exec_file_name}.  Whatever error code @code{exec_exec_file_name}
@@ -82,11 +78,9 @@ Index: hurd-debian/doc/hurd.texi
  
  @node File Locking
  @subsection File Locking
-Index: hurd-debian/exec/hashexec.c
-===================================================================
---- hurd-debian.orig/exec/hashexec.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/exec/hashexec.c	2013-06-19 23:32:37.000000000 +0000
-@@ -24,6 +24,9 @@
+--- a/exec/hashexec.c
++++ b/exec/hashexec.c
+@@ -24,6 +24,9 @@ the Free Software Foundation, 675 Mass A
  #include <unistd.h>
  #include <envz.h>
  #include <sys/param.h>
@@ -96,7 +90,7 @@ Index: hurd-debian/exec/hashexec.c
  
  /* This is called to check E for a #! interpreter specification.  E has
     already been prepared (successfully) and checked (unsuccessfully).  If
-@@ -421,16 +424,32 @@
+@@ -421,16 +424,32 @@ check_hashbang (struct execdata *e,
      /* We cannot open the interpreter file to execute it.  Lose!  */
      return;
  
@@ -138,10 +132,8 @@ Index: hurd-debian/exec/hashexec.c
    mach_port_deallocate (mach_task_self (), interp_file);
    munmap (new_argv, new_argvlen);
  
-Index: hurd-debian/hurd/fs.defs
-===================================================================
---- hurd-debian.orig/hurd/fs.defs	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/hurd/fs.defs	2013-06-19 23:32:37.000000000 +0000
+--- a/hurd/fs.defs
++++ b/hurd/fs.defs
 @@ -1,5 +1,6 @@
  /* Definitions for the filesystem interface.
 -   Copyright (C) 1994,95,96,97,98,99,2002 Free Software Foundation, Inc.
@@ -150,7 +142,7 @@ Index: hurd-debian/hurd/fs.defs
  
  This file is part of the GNU Hurd.
  
-@@ -35,7 +36,8 @@
+@@ -35,7 +36,8 @@ INTR_INTERFACE
  /* Overlay a task with a file.  Necessary initialization, including
     authentication changes associated with set[ug]id execution must be
     handled by the filesystem.  Filesystems normally implement this by
@@ -160,7 +152,7 @@ Index: hurd-debian/hurd/fs.defs
  routine file_exec (
  	exec_file: file_t;
  	RPT
-@@ -129,8 +131,8 @@
+@@ -129,8 +131,8 @@ routine file_lock_stat (
     (regardless of the current open modes for this port).  ALLOWED is a
     bitwise OR of O_READ, O_WRITE, and O_EXEC.  This is not necessarily the
     same as what an open or exec would allow; O_EXEC is set for root even if
@@ -171,10 +163,8 @@ Index: hurd-debian/hurd/fs.defs
     written directly.  */
  routine file_check_access (
  	file: file_t;
-Index: hurd-debian/hurd/hurd_types.h
-===================================================================
---- hurd-debian.orig/hurd/hurd_types.h	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/hurd/hurd_types.h	2013-06-19 23:32:37.000000000 +0000
+--- a/hurd/hurd_types.h
++++ b/hurd/hurd_types.h
 @@ -1,5 +1,6 @@
  /* C declarations for Hurd server interfaces
 -   Copyright (C) 1993,94,95,96,98,99,2001,02 Free Software Foundation, Inc.
@@ -183,7 +173,7 @@ Index: hurd-debian/hurd/hurd_types.h
  
  This file is part of the GNU Hurd.
  
-@@ -78,7 +79,7 @@
+@@ -78,7 +79,7 @@ typedef struct timespec timespec_t;
  /* Many such parameters and flags are also defined in various libc
     headers. */
  
@@ -192,7 +182,7 @@ Index: hurd-debian/hurd/hurd_types.h
  #define EXEC_NEWTASK	0x00000001 /* Create new task; kill old one.  */
  #define EXEC_SECURE	0x00000002 /* Use secure values of portarray, etc. */
  #define EXEC_DEFAULTS	0x00000004 /* Use defaults for unspecified ports.  */
-@@ -344,7 +345,7 @@
+@@ -344,7 +345,7 @@ typedef int *procinfo_t;
  #define FSTYPE_MEMFS   0x00000019 /* In-core filesystem */
  #define FSTYPE_ISO9660 0x0000001a /* ISO9660 */
  
@@ -201,7 +191,7 @@ Index: hurd-debian/hurd/hurd_types.h
  enum
    {
      INIT_PORT_CWDIR,
-@@ -358,7 +359,7 @@
+@@ -358,7 +359,7 @@ enum
      INIT_PORT_MAX
    };
  
@@ -210,10 +200,8 @@ Index: hurd-debian/hurd/hurd_types.h
  enum
    {
      INIT_UMASK,
-Index: hurd-debian/init/init.c
-===================================================================
---- hurd-debian.orig/init/init.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/init/init.c	2013-06-19 23:32:37.000000000 +0000
+--- a/init/init.c
++++ b/init/init.c
 @@ -1,7 +1,7 @@
  /* Start and maintain hurd core servers and system run state
  
@@ -233,7 +221,7 @@ Index: hurd-debian/init/init.c
  #include <hurd/fsys.h>
  #include <device/device.h>
  #include <stdio.h>
-@@ -375,13 +378,28 @@
+@@ -376,13 +379,28 @@ run (const char *server, mach_port_t *po
  	      printf ("Pausing for %s\n", prog);
  	      getchar ();
  	    }
@@ -269,7 +257,7 @@ Index: hurd-debian/init/init.c
  	  if (!err)
  	    break;
  
-@@ -468,14 +486,27 @@
+@@ -469,14 +487,27 @@ run_for_real (char *filename, char *args
      ++progname;
    else
      progname = filename;
@@ -305,7 +293,7 @@ Index: hurd-debian/init/init.c
    mach_port_deallocate (mach_task_self (), default_ports[INIT_PORT_PROC]);
    mach_port_deallocate (mach_task_self (), task);
    if (ctty != MACH_PORT_NULL)
-@@ -1059,13 +1090,26 @@
+@@ -1068,13 +1099,26 @@ start_child (const char *prog, char **pr
        getchar ();
      }
  
@@ -339,11 +327,9 @@ Index: hurd-debian/init/init.c
    proc_mark_important (default_ports[INIT_PORT_PROC]);
    mach_port_deallocate (mach_task_self (), default_ports[INIT_PORT_PROC]);
    mach_port_deallocate (mach_task_self (), file);
-Index: hurd-debian/libdiskfs/boot-start.c
-===================================================================
---- hurd-debian.orig/libdiskfs/boot-start.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libdiskfs/boot-start.c	2013-06-19 23:32:37.000000000 +0000
-@@ -207,7 +207,7 @@
+--- a/libdiskfs/boot-start.c
++++ b/libdiskfs/boot-start.c
+@@ -208,7 +208,7 @@ diskfs_start_bootstrap ()
        diskfs_exec_ctl = MACH_PORT_NULL;	/* Not used after this.  */
      }
  
@@ -352,10 +338,8 @@ Index: hurd-debian/libdiskfs/boot-start.c
    _hurd_port_set (&_diskfs_exec_portcell, diskfs_exec);
  
    if (_diskfs_boot_command)
-Index: hurd-debian/libdiskfs/file-exec.c
-===================================================================
---- hurd-debian.orig/libdiskfs/file-exec.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libdiskfs/file-exec.c	2013-06-19 23:32:37.000000000 +0000
+--- a/libdiskfs/file-exec.c
++++ b/libdiskfs/file-exec.c
 @@ -1,5 +1,6 @@
 -/* File execution (file_exec RPC) for diskfs servers, using exec server.
 -   Copyright (C) 1993,94,95,96,97,98,2000,02 Free Software Foundation, Inc.
@@ -365,7 +349,7 @@ Index: hurd-debian/libdiskfs/file-exec.c
  
  This file is part of the GNU Hurd.
  
-@@ -21,10 +22,14 @@
+@@ -21,10 +22,14 @@ the Free Software Foundation, 675 Mass A
  
  #include "priv.h"
  #include "fs_S.h"
@@ -380,7 +364,7 @@ Index: hurd-debian/libdiskfs/file-exec.c
  #include <string.h>
  #include <idvec.h>
  
-@@ -47,6 +52,39 @@
+@@ -47,6 +52,39 @@ diskfs_S_file_exec (struct protid *cred,
  		    mach_port_t *destroynames,
  		    size_t destroynameslen)
  {
@@ -420,7 +404,7 @@ Index: hurd-debian/libdiskfs/file-exec.c
    struct node *np;
    uid_t uid;
    gid_t gid;
-@@ -136,9 +174,9 @@
+@@ -136,9 +174,9 @@ diskfs_S_file_exec (struct protid *cred,
  
    if (! err)
      /* Make a new peropen for the exec server to access the file, since any
@@ -433,7 +417,7 @@ Index: hurd-debian/libdiskfs/file-exec.c
         authentication credentials.)  The new peropen's openmodes must have
         O_READ even if the caller had only O_EXEC privilege, so the exec
         server can read the executable file.  We also include O_EXEC so that
-@@ -159,14 +197,31 @@
+@@ -159,14 +197,31 @@ diskfs_S_file_exec (struct protid *cred,
        do
  	{
  	  right = ports_get_send_right (newpi);
@@ -473,10 +457,8 @@ Index: hurd-debian/libdiskfs/file-exec.c
  	  mach_port_deallocate (mach_task_self (), right);
  	  if (err == MACH_SEND_INVALID_DEST)
  	    {
-Index: hurd-debian/libfshelp/start-translator-long.c
-===================================================================
---- hurd-debian.orig/libfshelp/start-translator-long.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libfshelp/start-translator-long.c	2013-06-19 23:32:37.000000000 +0000
+--- a/libfshelp/start-translator-long.c
++++ b/libfshelp/start-translator-long.c
 @@ -1,5 +1,6 @@
  /*
 -   Copyright (C) 1995,96,99,2000,02, 04 Free Software Foundation, Inc.
@@ -495,7 +477,7 @@ Index: hurd-debian/libfshelp/start-translator-long.c
  
  
  /* The data passed in the various messages we're interested in.  */
-@@ -272,12 +276,22 @@
+@@ -272,12 +276,22 @@ fshelp_start_translator_long (fshelp_ope
    saveport = ports[INIT_PORT_BOOTSTRAP];
    ports[INIT_PORT_BOOTSTRAP] = bootstrap;
  
@@ -523,10 +505,8 @@ Index: hurd-debian/libfshelp/start-translator-long.c
    ports_moved = 1;
  
    if (ports_type == MACH_MSG_TYPE_COPY_SEND)
-Index: hurd-debian/libnetfs/file-exec.c
-===================================================================
---- hurd-debian.orig/libnetfs/file-exec.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libnetfs/file-exec.c	2013-06-19 23:32:37.000000000 +0000
+--- a/libnetfs/file-exec.c
++++ b/libnetfs/file-exec.c
 @@ -1,5 +1,6 @@
  /*
 -   Copyright (C) 1996,97,2000,01,02 Free Software Foundation, Inc.
@@ -550,7 +530,7 @@ Index: hurd-debian/libnetfs/file-exec.c
  #include <string.h>
  #include <idvec.h>
  
-@@ -49,6 +54,39 @@
+@@ -49,6 +54,39 @@ netfs_S_file_exec (struct protid *cred,
  		   mach_port_t *destroynames,
  		   size_t destroynameslen)
  {
@@ -590,7 +570,7 @@ Index: hurd-debian/libnetfs/file-exec.c
    struct node *np;
    error_t err;
    uid_t uid;
-@@ -133,14 +171,31 @@
+@@ -133,14 +171,31 @@ netfs_S_file_exec (struct protid *cred,
  	  if (newpi)
  	    {
  	      right = ports_get_send_right (newpi);
@@ -630,10 +610,8 @@ Index: hurd-debian/libnetfs/file-exec.c
  	      mach_port_deallocate (mach_task_self (), right);
  	      ports_port_deref (newpi);
  	    }
-Index: hurd-debian/libtrivfs/file-exec.c
-===================================================================
---- hurd-debian.orig/libtrivfs/file-exec.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libtrivfs/file-exec.c	2013-06-19 23:32:37.000000000 +0000
+--- a/libtrivfs/file-exec.c
++++ b/libtrivfs/file-exec.c
 @@ -1,5 +1,5 @@
  /*
 -   Copyright (C) 1994,2002 Free Software Foundation, Inc.
@@ -641,7 +619,7 @@ Index: hurd-debian/libtrivfs/file-exec.c
  
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
-@@ -40,3 +40,28 @@
+@@ -40,3 +40,28 @@ trivfs_S_file_exec (trivfs_protid_t exec
  {
    return EOPNOTSUPP;
  }
@@ -670,10 +648,8 @@ Index: hurd-debian/libtrivfs/file-exec.c
 +{
 +  return EOPNOTSUPP;
 +}
-Index: hurd-debian/trans/fakeroot.c
-===================================================================
---- hurd-debian.orig/trans/fakeroot.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/trans/fakeroot.c	2013-06-19 23:32:37.000000000 +0000
+--- a/trans/fakeroot.c
++++ b/trans/fakeroot.c
 @@ -1,5 +1,5 @@
  /* fakeroot -- a translator for faking actions that aren't really permitted
 -   Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc.
@@ -691,7 +667,7 @@ Index: hurd-debian/trans/fakeroot.c
  
  #include <version.h>
  
-@@ -705,6 +708,39 @@
+@@ -707,6 +710,39 @@ netfs_S_file_exec (struct protid *user,
                     mach_port_t *destroynames,
                     size_t destroynameslen)
  {
@@ -731,7 +707,7 @@ Index: hurd-debian/trans/fakeroot.c
    error_t err;
    file_t file;
  
-@@ -721,13 +757,29 @@
+@@ -723,13 +759,29 @@ netfs_S_file_exec (struct protid *user,
  
    if (!err)
      {
@@ -766,25 +742,24 @@ Index: hurd-debian/trans/fakeroot.c
        mach_port_deallocate (mach_task_self (), file);
      }
  
-@@ -835,12 +887,14 @@
- 	       mach_msg_header_t *outp)
+@@ -859,6 +911,7 @@ netfs_demuxer (mach_msg_header_t *inp,
  {
-   int netfs_fs_server (mach_msg_header_t *, mach_msg_header_t *);
-+  int netfs_fs_experimental_server (mach_msg_header_t *, mach_msg_header_t *);
-   int netfs_io_server (mach_msg_header_t *, mach_msg_header_t *);
-   int netfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *);
-   int netfs_ifsock_server (mach_msg_header_t *, mach_msg_header_t *);
- 
-   if (netfs_io_server (inp, outp)
-       || netfs_fs_server (inp, outp)
-+      || netfs_fs_experimental_server (inp, outp)
-       || ports_notify_server (inp, outp)
-       || netfs_fsys_server (inp, outp)
+   mig_routine_t netfs_io_server_routine (mach_msg_header_t *);
+   mig_routine_t netfs_fs_server_routine (mach_msg_header_t *);
++  mig_routine_t netfs_fs_experimental_server_routine (mach_msg_header_t *);
+   mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
+   mig_routine_t netfs_fsys_server_routine (mach_msg_header_t *);
+   mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
+@@ -866,6 +919,7 @@ netfs_demuxer (mach_msg_header_t *inp,
+   mig_routine_t routine;
+   if ((routine = netfs_io_server_routine (inp)) ||
+       (routine = netfs_fs_server_routine (inp)) ||
++      (routine = netfs_fs_experimental_server_routine (inp)) ||
+       (routine = ports_notify_server_routine (inp)) ||
+       (routine = netfs_fsys_server_routine (inp)) ||
        /* XXX we should intercept interrupt_operation and do
-Index: hurd-debian/utils/login.c
-===================================================================
---- hurd-debian.orig/utils/login.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/utils/login.c	2013-06-19 23:32:37.000000000 +0000
+--- a/utils/login.c
++++ b/utils/login.c
 @@ -1,6 +1,7 @@
  /* Hurdish login
  
@@ -804,7 +779,7 @@ Index: hurd-debian/utils/login.c
  #include <ugids.h>
  
  const char *argp_program_version = STANDARD_HURD_VERSION (login);
-@@ -882,12 +886,22 @@
+@@ -882,12 +886,22 @@ main(int argc, char *argv[])
  	}
      }
  
@@ -833,10 +808,8 @@ Index: hurd-debian/utils/login.c
    if (err)
      error(5, err, "%s", shell);
  
-Index: hurd-debian/hurd/fs_experimental.defs
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ hurd-debian/hurd/fs_experimental.defs	2013-06-19 23:32:37.000000000 +0000
+--- /dev/null
++++ b/hurd/fs_experimental.defs
 @@ -0,0 +1,51 @@
 +/* Definitions for the filesystem interface.
 +   Copyright (C) 1994,95,96,97,98,99,2002 Free Software Foundation, Inc.
@@ -889,11 +862,9 @@ Index: hurd-debian/hurd/fs_experimental.defs
 +	intarray: intarray_t SCP;
 +	deallocnames: mach_port_name_array_t SCP;
 +	destroynames: mach_port_name_array_t SCP);
-Index: hurd-debian/libdiskfs/Makefile
-===================================================================
---- hurd-debian.orig/libdiskfs/Makefile	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libdiskfs/Makefile	2013-06-19 23:32:37.000000000 +0000
-@@ -55,7 +55,7 @@
+--- a/libdiskfs/Makefile
++++ b/libdiskfs/Makefile
+@@ -56,7 +56,7 @@ OTHERSRCS = conch-fetch.c conch-set.c di
  SRCS = $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(IFSOCKSRCS)
  installhdrs = diskfs.h diskfs-pager.h
  
@@ -902,7 +873,7 @@ Index: hurd-debian/libdiskfs/Makefile
  	fsys_replyUser.o fs_notifyUser.o ifsockServer.o \
  	startup_notifyServer.o
  OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
-@@ -65,6 +65,7 @@
+@@ -66,6 +66,7 @@ LDLIBS += -lpthread
  
  fsys-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h -DREPLY_PORTS
  fs-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h
@@ -910,31 +881,27 @@ Index: hurd-debian/libdiskfs/Makefile
  io-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h
  ifsock-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h
  MIGCOMSFLAGS = -prefix diskfs_
-Index: hurd-debian/libdiskfs/demuxer.c
-===================================================================
---- hurd-debian.orig/libdiskfs/demuxer.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libdiskfs/demuxer.c	2013-06-19 23:32:37.000000000 +0000
-@@ -22,6 +22,7 @@
- 		mach_msg_header_t *outp)
- {
-   int diskfs_fs_server (mach_msg_header_t *, mach_msg_header_t *);
-+  int diskfs_fs_experimental_server (mach_msg_header_t *, mach_msg_header_t *);
-   int diskfs_io_server (mach_msg_header_t *, mach_msg_header_t *);
-   int diskfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *);
-   int diskfs_exec_startup_server (mach_msg_header_t *, mach_msg_header_t *);
-@@ -31,6 +32,7 @@
-   
-   return (diskfs_io_server (inp, outp)
- 	  || diskfs_fs_server (inp, outp)
-+	  || diskfs_fs_experimental_server (inp, outp)
- 	  || ports_notify_server (inp, outp)
- 	  || diskfs_fsys_server (inp, outp)
- 	  || diskfs_exec_startup_server (inp, outp)
-Index: hurd-debian/libnetfs/Makefile
-===================================================================
---- hurd-debian.orig/libnetfs/Makefile	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libnetfs/Makefile	2013-06-19 23:32:37.000000000 +0000
-@@ -58,12 +58,13 @@
+--- a/libdiskfs/demuxer.c
++++ b/libdiskfs/demuxer.c
+@@ -19,6 +19,7 @@
+ 
+ #include "io_S.h"
+ #include "fs_S.h"
++#include "fs_experimental_S.h"
+ #include "../libports/notify_S.h"
+ #include "fsys_S.h"
+ #include "../libports/interrupt_S.h"
+@@ -33,6 +34,7 @@ diskfs_demuxer (mach_msg_header_t *inp,
+   mig_routine_t routine;
+   if ((routine = diskfs_io_server_routine (inp)) ||
+       (routine = diskfs_fs_server_routine (inp)) ||
++      (routine = diskfs_fs_experimental_server_routine (inp)) ||
+       (routine = ports_notify_server_routine (inp)) ||
+       (routine = diskfs_fsys_server_routine (inp)) ||
+       (routine = ports_interrupt_server_routine (inp)) ||
+--- a/libnetfs/Makefile
++++ b/libnetfs/Makefile
+@@ -59,12 +59,13 @@ SRCS= $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $
  
  installhdrs=netfs.h
  
@@ -949,30 +916,27 @@ Index: hurd-debian/libnetfs/Makefile
  io-MIGSFLAGS = -imacros $(srcdir)/mutations.h
  ifsock-MIGSFLAGS = -imacros $(srcdir)/mutations.h
  MIGCOMSFLAGS = -prefix netfs_
-Index: hurd-debian/libnetfs/demuxer.c
-===================================================================
---- hurd-debian.orig/libnetfs/demuxer.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libnetfs/demuxer.c	2013-06-19 23:32:37.000000000 +0000
-@@ -25,12 +25,14 @@
- 	       mach_msg_header_t *outp)
- {
-   int netfs_fs_server (mach_msg_header_t *, mach_msg_header_t *);
-+  int netfs_fs_experimental_server (mach_msg_header_t *, mach_msg_header_t *);
-   int netfs_io_server (mach_msg_header_t *, mach_msg_header_t *);
-   int netfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *);
-   int netfs_ifsock_server (mach_msg_header_t *, mach_msg_header_t *);
- 
-   return (netfs_io_server (inp, outp)
-           || netfs_fs_server (inp, outp)
-+          || netfs_fs_experimental_server (inp, outp)
-           || ports_notify_server (inp, outp)
-           || netfs_fsys_server (inp, outp)
-           || ports_interrupt_server (inp, outp)
-Index: hurd-debian/libtrivfs/Makefile
-===================================================================
---- hurd-debian.orig/libtrivfs/Makefile	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libtrivfs/Makefile	2013-06-19 23:32:37.000000000 +0000
-@@ -43,7 +43,7 @@
+--- a/libnetfs/demuxer.c
++++ b/libnetfs/demuxer.c
+@@ -22,6 +22,7 @@
+ 
+ #include "io_S.h"
+ #include "fs_S.h"
++#include "fs_experimental_S.h"
+ #include "../libports/notify_S.h"
+ #include "fsys_S.h"
+ #include "../libports/interrupt_S.h"
+@@ -34,6 +35,7 @@ netfs_demuxer (mach_msg_header_t *inp,
+   mig_routine_t routine;
+   if ((routine = netfs_io_server_routine (inp)) ||
+       (routine = netfs_fs_server_routine (inp)) ||
++      (routine = netfs_fs_experimental_server_routine (inp)) ||
+       (routine = ports_notify_server_routine (inp)) ||
+       (routine = netfs_fsys_server_routine (inp)) ||
+       (routine = ports_interrupt_server_routine (inp)) ||
+--- a/libtrivfs/Makefile
++++ b/libtrivfs/Makefile
+@@ -44,7 +44,7 @@ OTHERSRCS=demuxer.c protid-clean.c proti
  
  SRCS=$(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(OTHERSRCS)
  
@@ -981,7 +945,7 @@ Index: hurd-debian/libtrivfs/Makefile
  
  libname = libtrivfs
  HURDLIBS = fshelp iohelp ports shouldbeinlibc
-@@ -53,7 +53,7 @@
+@@ -54,7 +54,7 @@ MIGCOMSFLAGS = -prefix trivfs_
  installhdrs := trivfs.h
  mig-sheader-prefix = trivfs_
  ifndef no_deps
@@ -990,29 +954,27 @@ Index: hurd-debian/libtrivfs/Makefile
  endif
  
  include ../Makeconf
-Index: hurd-debian/libtrivfs/demuxer.c
-===================================================================
---- hurd-debian.orig/libtrivfs/demuxer.c	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libtrivfs/demuxer.c	2013-06-19 23:32:37.000000000 +0000
-@@ -26,11 +26,13 @@
- 		mach_msg_header_t *outp)
- {
-   int trivfs_fs_server (mach_msg_header_t *, mach_msg_header_t *);
-+  int trivfs_fs_experimental_server (mach_msg_header_t *, mach_msg_header_t *);
-   int trivfs_io_server (mach_msg_header_t *, mach_msg_header_t *);
-   int trivfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *);
-   
-   return (trivfs_io_server (inp, outp)
- 	  || trivfs_fs_server (inp, outp)
-+	  || trivfs_fs_experimental_server (inp, outp)
- 	  || ports_notify_server (inp, outp)
- 	  || trivfs_fsys_server (inp, outp)
- 	  || ports_interrupt_server (inp, outp));
-Index: hurd-debian/configure.ac
-===================================================================
---- hurd-debian.orig/configure.ac	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/configure.ac	2013-06-19 23:32:37.000000000 +0000
-@@ -162,7 +162,7 @@
+--- a/libtrivfs/demuxer.c
++++ b/libtrivfs/demuxer.c
+@@ -23,6 +23,7 @@ the Free Software Foundation, 675 Mass A
+ 
+ #include "trivfs_io_S.h"
+ #include "trivfs_fs_S.h"
++#include "trivfs_fs_experimental_S.h"
+ #include "../libports/notify_S.h"
+ #include "trivfs_fsys_S.h"
+ #include "../libports/interrupt_S.h"
+@@ -34,6 +35,7 @@ trivfs_demuxer (mach_msg_header_t *inp,
+   mig_routine_t routine;
+   if ((routine = trivfs_io_server_routine (inp)) ||
+       (routine = trivfs_fs_server_routine (inp)) ||
++      (routine = trivfs_fs_experimental_server_routine (inp)) ||
+       (routine = ports_notify_server_routine (inp)) ||
+       (routine = trivfs_fsys_server_routine (inp)) ||
+       (routine = ports_interrupt_server_routine (inp)))
+--- a/configure.ac
++++ b/configure.ac
+@@ -161,7 +161,7 @@ fi
  AC_SUBST(VERSIONING)
  
  # Check if libc contains getgrouplist and/or uselocale.
@@ -1021,11 +983,9 @@ Index: hurd-debian/configure.ac
  
  
  # From glibc HEAD, 2007-11-07.
-Index: hurd-debian/libtrivfs/trivfs.h
-===================================================================
---- hurd-debian.orig/libtrivfs/trivfs.h	2013-06-19 23:32:37.000000000 +0000
-+++ hurd-debian/libtrivfs/trivfs.h	2013-06-19 23:32:37.000000000 +0000
-@@ -293,6 +293,7 @@
+--- a/libtrivfs/trivfs.h
++++ b/libtrivfs/trivfs.h
+@@ -299,6 +299,7 @@ extern size_t trivfs_num_dynamic_port_bu
  /* These are the MiG-generated headers that declare prototypes
     for the server functions.  */
  #include <hurd/trivfs_fs_S.h>