[hurd] 03/03: Backport a couple upstream fixes

[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 38b488b6c1e1d51365866719e86b1b30ac20ac67
Author: Samuel Thibault <address@hidden>
Date:   Thu Jun 8 21:15:56 2017 +0000

    Backport a couple upstream fixes
    
      * backport git-26e774bab06eab72847a7ca052a90d5319ad658a to fix glibc 
build.
      * backport git-019f9923e879ff326b14b2de04c6939c07ccb55b to drop spurious
        ext2fs warnings in d-i.
---
 debian/changelog                                   |  7 +++-
 .../git-019f9923e879ff326b14b2de04c6939c07ccb55b   | 22 +++++++++++
 .../git-26e774bab06eab72847a7ca052a90d5319ad658a   | 44 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 4 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 098ed81..72c73bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-hurd (1:0.9.git20170507-1) UNRELEASED; urgency=medium
+hurd (1:0.9.git20170507-1) unstable; urgency=medium
 
   * New upstream snapshot.
+  * backport git-26e774bab06eab72847a7ca052a90d5319ad658a to fix glibc build.
+  * backport git-019f9923e879ff326b14b2de04c6939c07ccb55b to drop spurious
+    ext2fs warnings in d-i.
   * patches/exec_set_exe.patch: Avoid erroring out when proc does not support
     proc_set_exe.
 
- -- Samuel Thibault <address@hidden>  Sat, 11 Mar 2017 15:57:49 +0000
+ -- Samuel Thibault <address@hidden>  Fri, 09 Jun 2017 19:25:32 +0000
 
 hurd (1:0.9.git20170310-1) unstable; urgency=medium
 
diff --git a/debian/patches/git-019f9923e879ff326b14b2de04c6939c07ccb55b 
b/debian/patches/git-019f9923e879ff326b14b2de04c6939c07ccb55b
new file mode 100644
index 0000000..471c6e4
--- /dev/null
+++ b/debian/patches/git-019f9923e879ff326b14b2de04c6939c07ccb55b
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000..e1debfb
--- /dev/null
+++ b/debian/patches/git-26e774bab06eab72847a7ca052a90d5319ad658a
@@ -0,0 +1,44 @@
+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/series b/debian/patches/series
index 264e33a..dcb872c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,5 @@ netdde_log.patch
 libports-iterate-refcount.patch
 exec_filename_rpctrace.patch
 exec_set_exe.patch
+git-26e774bab06eab72847a7ca052a90d5319ad658a
+git-019f9923e879ff326b14b2de04c6939c07ccb55b

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