[hurd] 03/07: refresh patches

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository hurd.

commit 76db71d875c0dadd99f12980609c825a09ca3575
Author: Samuel Thibault <address@hidden>
Date:   Sun Sep 10 23:14:18 2017 +0000

    refresh patches
---
 debian/patches/crash-logging.patch                 |  4 +-
 debian/patches/exec_filename_fix.patch             |  4 +-
 debian/patches/exec_filename_fs.patch              | 44 +++++++++++-----------
 debian/patches/exec_set_exe.patch                  | 16 ++++----
 debian/patches/external.patch                      | 40 ++++++++++++--------
 .../git-019f9923e879ff326b14b2de04c6939c07ccb55b   | 22 -----------
 .../git-26e774bab06eab72847a7ca052a90d5319ad658a   | 44 ----------------------
 debian/patches/makedev.diff                        |  4 +-
 debian/patches/newRPC.patch                        | 18 +++++----
 debian/patches/posix-sigcodes.patch                |  2 +-
 debian/patches/series                              |  4 +-
 debian/patches/tmp_exec_startup.patch              | 10 ++---
 12 files changed, 77 insertions(+), 135 deletions(-)

diff --git a/debian/patches/crash-logging.patch 
b/debian/patches/crash-logging.patch
index 9f82a89..be18145 100644
--- a/debian/patches/crash-logging.patch
+++ b/debian/patches/crash-logging.patch
@@ -77,7 +77,7 @@ Index: hurd-debian/trans/crash.c
 +
 +      free (old);
 +      err = mach_port_deallocate (mach_task_self (), threads[i]);
-+      assert_perror (err);
++      assert_perror_backtrace (err);
 +    }
 +#else
 +  *pcs = strdup ("architecture not supported");
@@ -111,7 +111,7 @@ Index: hurd-debian/trans/crash.c
 +      how_msg = "writing core file";
 +      break;
 +    default:
-+      assert (! "reached");
++      assert_backtrace (! "reached");
 +    }
 +
 +  err = proc_task2pid (procserver, task, &pid);
diff --git a/debian/patches/exec_filename_fix.patch 
b/debian/patches/exec_filename_fix.patch
index 71836d9..8ebb8f2 100644
--- a/debian/patches/exec_filename_fix.patch
+++ b/debian/patches/exec_filename_fix.patch
@@ -57,7 +57,7 @@ Fix this by skipping the identity test if file_name_exec is 
provided.
 -            if (memchr (argv, '\0', argvlen) == NULL)
 -              {
 -                name = alloca (argvlen + 1);
--                bcopy (argv, name, argvlen);
+-                memcpy (name, argv, argvlen);
 -                name[argvlen] = '\0';
 -              }
 -            else
@@ -93,7 +93,7 @@ Fix this by skipping the identity test if file_name_exec is 
provided.
 -                    mach_port_deallocate (mach_task_self (), fsid);
 -                    mach_port_deallocate (mach_task_self (), id);
 +                    name = alloca (argvlen + 1);
-+                    bcopy (argv, name, argvlen);
++                    memcpy (name, argv, argvlen);
 +                    name[argvlen] = '\0';
                    }
 -                if (!error && id == fileid)
diff --git a/debian/patches/exec_filename_fs.patch 
b/debian/patches/exec_filename_fs.patch
index ed22dde..84607c7 100644
--- a/debian/patches/exec_filename_fs.patch
+++ b/debian/patches/exec_filename_fs.patch
@@ -28,7 +28,7 @@ Index: hurd-debian/TODO
 ===================================================================
 --- hurd-debian.orig/TODO
 +++ hurd-debian/TODO
-@@ -133,7 +133,7 @@ See `tasks', the exported task list.
+@@ -131,7 +131,7 @@ See `tasks', the exported task list.
  
  ** libtrivfs
  *** Allow for read/write/exec to be passed down.
@@ -41,7 +41,7 @@ Index: hurd-debian/doc/hurd.texi
 ===================================================================
 --- hurd-debian.orig/doc/hurd.texi
 +++ hurd-debian/doc/hurd.texi
-@@ -2737,10 +2737,10 @@ write the file.
+@@ -2736,10 +2736,10 @@ write the file.
  @node Program Execution
  @subsection Program Execution
  
@@ -55,7 +55,7 @@ Index: hurd-debian/doc/hurd.texi
  ports are necessary for setuid execution, and then invoke the standard
  execserver found on @file{/servers/exec}.
  
-@@ -2752,13 +2752,13 @@ The file must be opened for execution; i
+@@ -2751,13 +2751,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 +73,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.
  
-@@ -2773,7 +2773,7 @@ will not share any file pointers with th
+@@ -2772,7 +2772,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}
@@ -86,7 +86,7 @@ Index: hurd-debian/exec/hashexec.c
 ===================================================================
 --- hurd-debian.orig/exec/hashexec.c
 +++ hurd-debian/exec/hashexec.c
-@@ -24,6 +24,9 @@ the Free Software Foundation, 675 Mass A
+@@ -24,6 +24,9 @@
  #include <unistd.h>
  #include <envz.h>
  #include <sys/param.h>
@@ -96,7 +96,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 @@ check_hashbang (struct execdata *e,
+@@ -423,16 +426,32 @@ check_hashbang (struct execdata *e,
      /* We cannot open the interpreter file to execute it.  Lose!  */
      return;
  
@@ -192,7 +192,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.  */
-@@ -347,7 +348,7 @@ typedef int *procinfo_t;
+@@ -350,7 +351,7 @@ typedef int *procinfo_t;
  #define FSTYPE_MEMFS   0x00000019 /* In-core filesystem */
  #define FSTYPE_ISO9660 0x0000001a /* ISO9660 */
  
@@ -201,7 +201,7 @@ Index: hurd-debian/hurd/hurd_types.h
  enum
    {
      INIT_PORT_CWDIR,
-@@ -361,7 +362,7 @@ enum
+@@ -364,7 +365,7 @@ enum
      INIT_PORT_MAX
    };
  
@@ -233,7 +233,7 @@ Index: hurd-debian/startup/startup.c
  #include <hurd/fsys.h>
  #include <device/device.h>
  #include <stdio.h>
-@@ -376,13 +379,28 @@ run (const char *server, mach_port_t *po
+@@ -402,13 +405,28 @@ run (const char *server, mach_port_t *po
              fprintf (stderr, "Pausing for %s\n", prog);
              getchar ();
            }
@@ -269,7 +269,7 @@ Index: hurd-debian/startup/startup.c
          if (!err)
            break;
  
-@@ -469,14 +487,27 @@ run_for_real (char *filename, char *args
+@@ -538,14 +556,27 @@ run_for_real (char *filename, char *args
      ++progname;
    else
      progname = filename;
@@ -305,7 +305,7 @@ Index: hurd-debian/startup/startup.c
    mach_port_deallocate (mach_task_self (), default_ports[INIT_PORT_PROC]);
    mach_port_deallocate (mach_task_self (), task);
    if (ctty != MACH_PORT_NULL)
-@@ -1035,13 +1066,26 @@ start_child (const char *prog, char **pr
+@@ -1244,13 +1275,26 @@ start_child (const char *prog, char **pr
        getchar ();
      }
  
@@ -343,7 +343,7 @@ Index: hurd-debian/libdiskfs/boot-start.c
 ===================================================================
 --- hurd-debian.orig/libdiskfs/boot-start.c
 +++ hurd-debian/libdiskfs/boot-start.c
-@@ -209,7 +209,7 @@ diskfs_start_bootstrap ()
+@@ -214,7 +214,7 @@ diskfs_start_bootstrap ()
        diskfs_exec_ctl = MACH_PORT_NULL;       /* Not used after this.  */
      }
  
@@ -365,7 +365,7 @@ Index: hurd-debian/libdiskfs/file-exec.c
  
     This file is part of the GNU Hurd.
  
-@@ -21,10 +22,14 @@ the Free Software Foundation, 675 Mass A
+@@ -21,10 +22,14 @@
  
  #include "priv.h"
  #include "fs_S.h"
@@ -485,9 +485,9 @@ Index: hurd-debian/libfshelp/start-translator-long.c
     Written by Miles Bader and Michael I. Bushnell.
  
     This file is part of the GNU Hurd.
-@@ -27,6 +28,9 @@
+@@ -28,6 +29,9 @@
  #include <string.h>
- #include <assert.h>
+ #include <assert-backtrace.h>
  #include "fshelp.h"
 +#ifdef HAVE_FILE_EXEC_FILE_NAME
 +#include <hurd/fs_experimental.h>
@@ -495,7 +495,7 @@ Index: hurd-debian/libfshelp/start-translator-long.c
  
  
  /* The data passed in the various messages we're interested in.  */
-@@ -272,12 +276,22 @@ fshelp_start_translator_long (fshelp_ope
+@@ -273,12 +277,22 @@ fshelp_start_translator_long (fshelp_ope
    saveport = ports[INIT_PORT_BOOTSTRAP];
    ports[INIT_PORT_BOOTSTRAP] = bootstrap;
  
@@ -689,7 +689,7 @@ Index: hurd-debian/trans/fakeroot.c
  #include "libnetfs/io_S.h"
  #include "libnetfs/fsys_S.h"
  #include "libports/notify_S.h"
-@@ -785,23 +789,24 @@ netfs_file_get_storage_info (struct ious
+@@ -882,23 +886,24 @@ netfs_file_get_storage_info (struct ious
  }
  
  kern_return_t
@@ -731,7 +731,7 @@ Index: hurd-debian/trans/fakeroot.c
  {
    error_t err;
    file_t file;
-@@ -820,14 +825,30 @@ netfs_S_file_exec (struct protid *user,
+@@ -917,14 +922,30 @@ netfs_S_file_exec (struct protid *user,
  
    if (!err)
      {
@@ -768,7 +768,7 @@ Index: hurd-debian/trans/fakeroot.c
        mach_port_deallocate (mach_task_self (), file);
      }
  
-@@ -843,6 +864,38 @@ netfs_S_file_exec (struct protid *user,
+@@ -940,6 +961,38 @@ netfs_S_file_exec (struct protid *user,
    return err;
  }
  
@@ -807,7 +807,7 @@ Index: hurd-debian/trans/fakeroot.c
  error_t
  netfs_S_io_map (struct protid *user,
                mach_port_t *rdobj, mach_msg_type_name_t *rdobjtype,
-@@ -959,6 +1012,7 @@ netfs_demuxer (mach_msg_header_t *inp,
+@@ -1056,6 +1109,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)) ||
@@ -1007,7 +1007,7 @@ Index: hurd-debian/libtrivfs/Makefile
 ===================================================================
 --- hurd-debian.orig/libtrivfs/Makefile
 +++ hurd-debian/libtrivfs/Makefile
-@@ -44,7 +44,7 @@ OTHERSRCS=demuxer.c protid-clean.c proti
+@@ -43,7 +43,7 @@ OTHERSRCS=demuxer.c protid-clean.c proti
  
  SRCS=$(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(OTHERSRCS)
  
@@ -1020,7 +1020,7 @@ Index: hurd-debian/libtrivfs/demuxer.c
 ===================================================================
 --- hurd-debian.orig/libtrivfs/demuxer.c
 +++ hurd-debian/libtrivfs/demuxer.c
-@@ -23,6 +23,7 @@ the Free Software Foundation, 675 Mass A
+@@ -23,6 +23,7 @@
  
  #include "trivfs_io_S.h"
  #include "trivfs_fs_S.h"
diff --git a/debian/patches/exec_set_exe.patch 
b/debian/patches/exec_set_exe.patch
index e01dd10..8462221 100644
--- a/debian/patches/exec_set_exe.patch
+++ b/debian/patches/exec_set_exe.patch
@@ -338,17 +338,17 @@ Index: hurd-debian/startup/startup.c
 --- hurd-debian.orig/startup/startup.c
 +++ hurd-debian/startup/startup.c
 @@ -763,6 +763,7 @@ launch_core_servers (void)
-   assert_perror (err);
+   assert_perror_backtrace (err);
    err = proc_mark_exec (procserver);
-   assert_perror (err);
+   assert_perror_backtrace (err);
 +  proc_set_exe (procserver, "/hurd/startup");
  
    /* Declare that the filesystem and auth are our children. */
    err = proc_child (procserver, fstask);
 @@ -776,6 +777,7 @@ launch_core_servers (void)
-   assert_perror (err);
+   assert_perror_backtrace (err);
    err = proc_mark_exec (authproc);
-   assert_perror (err);
+   assert_perror_backtrace (err);
 +  proc_set_exe (authproc, "/hurd/auth");
  
    err = install_as_translator ();
@@ -362,21 +362,21 @@ Index: hurd-debian/startup/startup.c
      }
  
 @@ -831,6 +834,7 @@ launch_core_servers (void)
-   assert_perror (err);
+   assert_perror_backtrace (err);
    err = proc_mark_exec (fsproc);
-   assert_perror (err);
+   assert_perror_backtrace (err);
 +  proc_set_exe (fsproc, "fs");
  
    fprintf (stderr, ".\n");
  
 @@ -974,6 +978,8 @@ frob_kernel_process (void)
    err = record_essential_task ("kernel", task);
-   assert_perror (err);
+   assert_perror_backtrace (err);
  
 +  proc_set_exe (proc, "kernel");
 +
    err = task_get_bootstrap_port (task, &kbs);
-   assert_perror (err);
+   assert_perror_backtrace (err);
    if (kbs == MACH_PORT_NULL)
 @@ -1385,6 +1391,7 @@ S_startup_essential_task (mach_port_t se
            mach_port_t execproc;
diff --git a/debian/patches/external.patch b/debian/patches/external.patch
index db9de94..8975e0a 100644
--- a/debian/patches/external.patch
+++ b/debian/patches/external.patch
@@ -1,12 +1,13 @@
 Include DDE in the build
 
---- a/Makefile
-+++ b/Makefile
-@@ -28,6 +28,14 @@ include ./Makeconf
-             libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \
+Index: hurd-debian/Makefile
+===================================================================
+--- hurd-debian.orig/Makefile
++++ hurd-debian/Makefile
+@@ -32,6 +32,14 @@ lib-subdirs = libshouldbeinlibc libihash
              libhurd-slab \
              libbpf \
-+
+ 
 +ifneq ($(LIBPCIACCESS),no)
 +lib-subdirs += libmachdev libddekit
 +endif
@@ -14,12 +15,15 @@ Include DDE in the build
 +ifeq ($(HAVE_PCAP),yes)
 +lib-subdirs += eth-filter
 +endif
- 
++
  # Hurd programs
  prog-subdirs = auth proc exec term \
---- a/Makeconf
-+++ b/Makeconf
-@@ -576,7 +576,7 @@ vpath %.defs $(top_srcdir)/hurd
+              ext2fs isofs tmpfs fatfs \
+Index: hurd-debian/Makeconf
+===================================================================
+--- hurd-debian.orig/Makeconf
++++ hurd-debian/Makeconf
+@@ -575,7 +575,7 @@ vpath %.defs $(top_srcdir)/hurd
  # These we want to find in the libc include directory...
  mach_defs_names = bootstrap exc mach mach4 \
        mach_host mach_port mach_timer_reply memory_object \
@@ -28,8 +32,10 @@ Include DDE in the build
        gnumach \
        task_notify \
  
---- a/configure.ac
-+++ b/configure.ac
+Index: hurd-debian/configure.ac
+===================================================================
+--- hurd-debian.orig/configure.ac
++++ hurd-debian/configure.ac
 @@ -245,6 +245,13 @@ AC_SUBST(boot_store_types)dnl
  AC_MSG_CHECKING(boot store types)
  AC_MSG_RESULT($boot_store_types)
@@ -44,11 +50,13 @@ Include DDE in the build
  # Check for ncursesw, which is needed for the console-curses client.
  hurd_LIB_NCURSESW
  
---- a/config.make.in
-+++ b/config.make.in
-@@ -98,6 +98,12 @@ libblkid_LIBS = @libblkid_LIBS@
- # Whether Sun RPC support is available.
- HAVE_SUN_RPC = @HAVE_SUN_RPC@
+Index: hurd-debian/config.make.in
+===================================================================
+--- hurd-debian.orig/config.make.in
++++ hurd-debian/config.make.in
+@@ -99,6 +99,12 @@ HAVE_SUN_RPC = @HAVE_SUN_RPC@
+ # Whether we found libgcrypt.
+ HAVE_LIBGCRYPT = @HAVE_LIBGCRYPT@
  
 +# Whether pcap support is available.
 +HAVE_PCAP = @HAVE_PCAP@
diff --git a/debian/patches/git-019f9923e879ff326b14b2de04c6939c07ccb55b 
b/debian/patches/git-019f9923e879ff326b14b2de04c6939c07ccb55b
deleted file mode 100644
index 471c6e4..0000000
--- a/debian/patches/git-019f9923e879ff326b14b2de04c6939c07ccb55b
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 019f9923e879ff326b14b2de04c6939c07ccb55b
-Author: Samuel Thibault <address@hidden>
-Date:   Fri Jun 9 22:08:23 2017 +0200
-
-    ext2fs: Reduce verbosity of missing xattr support on the FS
-    
-    * ext2fs/xattr.c (ext2_free_xattr_block): Only warn about missing ext2fs
-    support in debugging mode.
-
-diff --git a/ext2fs/xattr.c b/ext2fs/xattr.c
-index c7037176..45969195 100644
---- a/ext2fs/xattr.c
-+++ b/ext2fs/xattr.c
-@@ -429,7 +429,7 @@ ext2_free_xattr_block (struct node *np)
- 
-   if (!EXT2_HAS_COMPAT_FEATURE (sblock, EXT2_FEATURE_COMPAT_EXT_ATTR))
-     {
--      ext2_warning ("Filesystem has no support for extended attributes.");
-+      ext2_debug ("Filesystem has no support for extended attributes.");
-       return EOPNOTSUPP;
-     }
- 
diff --git a/debian/patches/git-26e774bab06eab72847a7ca052a90d5319ad658a 
b/debian/patches/git-26e774bab06eab72847a7ca052a90d5319ad658a
deleted file mode 100644
index e1debfb..0000000
--- a/debian/patches/git-26e774bab06eab72847a7ca052a90d5319ad658a
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 26e774bab06eab72847a7ca052a90d5319ad658a
-Author: Justus Winter <address@hidden>
-Date:   Mon Jun 5 16:29:58 2017 +0200
-
-    hurd: Fix the use of polymorphic types.
-    
-    Fixes baf7e5c8ce176aead15c2559952d8bdf0da41ffd.
-    
-    * hurd/process.defs (proc_getmsgport): Make 'msgport' parameter
-    polymorphic only on the sender side.
-    (proc_task2proc): Likewise for 'proc'.
-    (proc_pid2proc): Likewise.
-
-diff --git a/hurd/process.defs b/hurd/process.defs
-index df70eb9a..d724e20d 100644
---- a/hurd/process.defs
-+++ b/hurd/process.defs
-@@ -156,7 +156,7 @@ routine proc_getmsgport (
-       process: process_t;
-       sreplyport reply_port: sreply_port_t;
-       pid: pid_t;
--      out msgport: mach_port_poly_t);
-+      out msgport: mach_port_send_t);
- 
- /* Wait for a child process to exit.  If pid is zero, it waits for any
-    child in the same pgrp as the parent.  If pid is -1, it waits for
-@@ -246,7 +246,7 @@ routine proc_task2pid (
- routine proc_task2proc (
-       process: process_t;
-       task: task_t;
--      out proc: mach_port_poly_t);
-+      out proc: mach_port_send_t);
- 
- routine proc_proc2task (
-       process: process_t;
-@@ -255,7 +255,7 @@ routine proc_proc2task (
- routine proc_pid2proc (
-       process: process_t;
-       pid: pid_t;
--      out proc: mach_port_poly_t);
-+      out proc: mach_port_send_t);
- 
- routine proc_getprocinfo (
-       process: process_t;
diff --git a/debian/patches/makedev.diff b/debian/patches/makedev.diff
index e4f7371..73ab6c9 100644
--- a/debian/patches/makedev.diff
+++ b/debian/patches/makedev.diff
@@ -10,8 +10,8 @@ there.
        ;;
  
        std)
--      mkdev console tty urandom null zero full fd time mem klog shm
-+      mkdev console tty urandom null zero full fd time mem klog
+-      mkdev console tty random urandom null zero full fd time mem klog shm
++      mkdev console tty random urandom null zero full fd time mem klog
        ;;
        console|com[0-9])
        st $I root 600 /hurd/term ${DEVDIR}/$I device $I;;
diff --git a/debian/patches/newRPC.patch b/debian/patches/newRPC.patch
index 85f00ce..3287688 100644
--- a/debian/patches/newRPC.patch
+++ b/debian/patches/newRPC.patch
@@ -4,10 +4,10 @@ Just a build fix.
 
 To be removed with glibc 2.24-9
 
-diff --git a/mach-defpager/Makefile b/mach-defpager/Makefile
-index 3b8ce58e0..3cb506a27 100644
---- a/mach-defpager/Makefile
-+++ b/mach-defpager/Makefile
+Index: hurd-debian/mach-defpager/Makefile
+===================================================================
+--- hurd-debian.orig/mach-defpager/Makefile
++++ hurd-debian/mach-defpager/Makefile
 @@ -23,11 +23,13 @@ dir        := mach-defpager
  makemode:= server
  target        := mach-defpager
@@ -21,7 +21,7 @@ index 3b8ce58e0..3cb506a27 100644
 -         default_pager_replyUser.o
 +         default_pager_replyUser.o $(MIGSTUBS)
  
- HURDLIBS:= ihash
+ HURDLIBS:= ihash shouldbeinlibc
  LDLIBS:= -lpthread
 Index: hurd-debian/exec/Makefile
 ===================================================================
@@ -49,9 +49,11 @@ Index: hurd-debian/libps/Makefile
  
  msg-MIGUFLAGS = -D'MSG_IMPORTS=waittime 1000;' -DUSERPREFIX=ps_
  term-MIGUFLAGS = -D'TERM_IMPORTS=waittime 1000;' -DUSERPREFIX=ps_
---- hurd-debian/startup/Makefile.original      2017-01-19 00:30:36.000000000 
+0000
-+++ hurd-debian/startup/Makefile       2017-01-19 00:30:37.000000000 +0000
-@@ -21,7 +21,7 @@
+Index: hurd-debian/startup/Makefile
+===================================================================
+--- hurd-debian.orig/startup/Makefile
++++ hurd-debian/startup/Makefile
+@@ -21,7 +21,7 @@ makemode := server
  SRCS = startup.c
  OBJS = $(SRCS:.c=.o) \
         startupServer.o notifyServer.o startup_replyUser.o msgServer.o \
diff --git a/debian/patches/posix-sigcodes.patch 
b/debian/patches/posix-sigcodes.patch
index f44d1fb..514798b 100644
--- a/debian/patches/posix-sigcodes.patch
+++ b/debian/patches/posix-sigcodes.patch
@@ -81,7 +81,7 @@ index de3a9b1..ee8e578 100644
      case MACH_SEND_INVALID_NOTIFY:
      case MACH_SEND_NO_NOTIFY:
      case MACH_SEND_NOTIFY_IN_PROGRESS:
-       assert_perror (err);
+       assert_perror_backtrace (err);
        break;
  
      default:                  /* Other errors are safe to ignore.  */
diff --git a/debian/patches/series b/debian/patches/series
index dcb872c..b62336f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,7 @@ stat_round.patch
 external.patch
 console_ignore_bdf_err.patch
 posix-sigcodes.patch
-random-default-fast.patch
+#random-default-fast.patch
 libexec.patch
 run.patch
 exec_filename_exec.patch
@@ -29,5 +29,3 @@ netdde_log.patch
 libports-iterate-refcount.patch
 exec_filename_rpctrace.patch
 exec_set_exe.patch
-git-26e774bab06eab72847a7ca052a90d5319ad658a
-git-019f9923e879ff326b14b2de04c6939c07ccb55b
diff --git a/debian/patches/tmp_exec_startup.patch 
b/debian/patches/tmp_exec_startup.patch
index a67383f..45d191a 100644
--- a/debian/patches/tmp_exec_startup.patch
+++ b/debian/patches/tmp_exec_startup.patch
@@ -10,8 +10,8 @@ Index: hurd-debian/libdiskfs/boot-start.c
 --- hurd-debian.orig/libdiskfs/boot-start.c
 +++ hurd-debian/libdiskfs/boot-start.c
 @@ -130,8 +130,13 @@ diskfs_start_bootstrap ()
-       assert (_hurd_ports);
-       assert (_hurd_ports[INIT_PORT_CRDIR].port != MACH_PORT_NULL);
+       assert_backtrace (_hurd_ports);
+       assert_backtrace (_hurd_ports[INIT_PORT_CRDIR].port != MACH_PORT_NULL);
        diskfs_exec = file_name_lookup (_SERVERS_EXEC, 0, 0);
 -      if (diskfs_exec == MACH_PORT_NULL)
 -      error (1, errno, "%s", _SERVERS_EXEC);
@@ -51,6 +51,6 @@ Index: hurd-debian/libdiskfs/boot-start.c
 +    /* Try /tmp/exec as well, in case we're installing.  */
 +    err = dir_lookup (rootport, "/tmp/exec", flags|O_NOTRANS|O_CREAT, 0,
 +                    &retry, pathbuf, real);
-   assert_perror (err);
-   assert (retry == FS_RETRY_NORMAL);
-   assert (pathbuf[0] == '\0');
+   assert_perror_backtrace (err);
+   assert_backtrace (retry == FS_RETRY_NORMAL);
+   assert_backtrace (pathbuf[0] == '\0');

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