[hurd] 01/01: fix firmlinks in /proc/mounts

[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 ffe4208138b25a0130da0385ea017741b65b449d
Author: Samuel Thibault <address@hidden>
Date:   Tue Jan 16 21:49:21 2018 +0000

    fix firmlinks in /proc/mounts
    
    debian/patches/git-proc_mounts_firmlink.patch: Cherry-pick
---
 debian/changelog                              |  7 +++++
 debian/patches/git-proc_mounts_firmlink.patch | 37 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ce0aa4f..eaa3c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hurd (1:0.9.git20180108-3) UNRELEASED; urgency=medium
+
+  * debian/patches/git-proc_mounts_firmlink.patch: Cherry-pick fix for
+    firmlinks in /proc/mounts.
+
+ -- Samuel Thibault <address@hidden>  Tue, 16 Jan 2018 21:48:39 +0000
+
 hurd (1:0.9.git20180108-2) unstable; urgency=medium
 
   * debian/patches/git-fix-sync: Cherry-pick fix sync at shutdown.
diff --git a/debian/patches/git-proc_mounts_firmlink.patch 
b/debian/patches/git-proc_mounts_firmlink.patch
new file mode 100644
index 0000000..aeb73b1
--- /dev/null
+++ b/debian/patches/git-proc_mounts_firmlink.patch
@@ -0,0 +1,37 @@
+commit 0e3ae6f8f4a4d2a4419e43c09b1e3169e44c7389
+Author: Samuel Thibault <address@hidden>
+Date:   Tue Jan 16 22:44:57 2018 +0100
+
+    Fix firmlinks showing up in /proc/mounts
+    
+    mtab checks for fsys_get_options.
+    
+    * trans/firmlink.c: Include <argz.h>.
+    (trivfs_append_args): New function.
+
+diff --git a/trans/firmlink.c b/trans/firmlink.c
+index ca094ecf..1c656a6f 100644
+--- a/trans/firmlink.c
++++ b/trans/firmlink.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <argp.h>
++#include <argz.h>
+ #include <error.h>
+ #include <sys/mman.h>
+ 
+@@ -287,6 +288,13 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
+   return trivfs_S_io_select (cred, reply, reply_type, type);
+ }
+ 
++error_t
++trivfs_append_args (struct trivfs_control *fsys,
++                  char **argz, size_t *argz_len)
++{
++  return argz_add (argz, argz_len, "");
++}
++
+ error_t trivfs_get_source (char *source, size_t source_len)
+ {
+   strncpy (source, target, source_len - 1);
diff --git a/debian/patches/series b/debian/patches/series
index 37a238a..a6ec18d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ using_std.patch
 netdde_log.patch
 libports-iterate-refcount.patch
 git-fix-sync
+git-proc_mounts_firmlink.patch

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