[hurd] 01/02: New upstream snapshot

[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 6c154073750f35e2d6a7e953b68df38396f3b4fc
Author: Samuel Thibault <address@hidden>
Date:   Tue Nov 3 22:10:14 2015 +0000

    New upstream snapshot
---
 NEWS                   |  6 +++---
 configure.ac           |  2 +-
 hurd/hurd_types.defs   |  2 +-
 pflocal/io.c           |  1 -
 trans/fakeroot.c       |  7 +------
 trans/proxy-defpager.c | 14 ++++++++++----
 trans/streamio.c       | 15 +++++++++++----
 7 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/NEWS b/NEWS
index 6e034d9..413f249 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Version 0.7 (2015-10-XX)
+Version 0.7 (2015-10-31)
 
 The node cache in ext2fs has been improved, generalized, and moved to
 libdiskfs.  It is now also used by isofs and fatfs.
@@ -15,7 +15,7 @@ translators, libdiskfs, and libpager has been identified and 
fixed.
 
 The code has been updated to work with newer versions of the compiler
 and libc, and numerous bugs have been fixed throughout the code.
-
+
 Version 0.6 (2015-04-10)
 
 Numerous cleanups and stylistic fixes of the code base.  Several
@@ -39,7 +39,7 @@ The init server has been split into the startup server 
(handling early
 system bootstrap and shutdown), and a SysV-style init program (aptly
 named `init').
 
-The procfs and random translators have been merged.
+The procfs and random translators have been merged into this repository.
 
 Version 0.5 (2013-09-27)
 
diff --git a/configure.ac b/configure.ac
index b03057b..124eb07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.54)                        dnl Minimum Autoconf version required.
-AC_INIT([GNU Hurd], [0.6], address@hidden)
+AC_INIT([GNU Hurd], [0.7], address@hidden)
 AC_CONFIG_SRCDIR([hurd/hurd_types.h])  dnl File to look for in srcdir.
 
 AC_PREFIX_DEFAULT()            dnl Default to empty prefix, not /usr/local.
diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
index 5fa59f3..1837500 100644
--- a/hurd/hurd_types.defs
+++ b/hurd/hurd_types.defs
@@ -285,7 +285,7 @@ intran: INTERRUPT_INTRAN
 intranpayload: INTERRUPT_INTRAN_PAYLOAD
 #else
 #ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
-intranpayload: exec_startup_t HURD_DEFAULT_PAYLOAD_TO_PORT
+intranpayload: interrupt_t HURD_DEFAULT_PAYLOAD_TO_PORT
 #endif
 #endif
 #ifdef INTERRUPT_OUTTRAN
diff --git a/pflocal/io.c b/pflocal/io.c
index 38d6c1d..c562274 100644
--- a/pflocal/io.c
+++ b/pflocal/io.c
@@ -37,7 +37,6 @@
 #include "sserver.h"
 
 #include "io_S.h"
-#include "interrupt_S.h"
 
 /* Read data from an IO object.  If offset if -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index 6962810..84b4efc 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -780,12 +780,7 @@ netfs_attempt_write (struct iouser *cred, struct node *np,
 error_t
 netfs_report_access (struct iouser *cred, struct node *np, int *types)
 {
-  struct netnode *nn = netfs_node_netnode (np);
-  if (!(nn->faked & FAKE_MODE))
-    return file_check_access (nn->file, types);
-  else
-    *types = O_RDWR|O_EXEC;
-  return 0;
+  return file_check_access (netfs_node_netnode (np)->file, types);
 }
 
 error_t
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 662f269..4fdeb35 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -236,10 +236,16 @@ int
 proxy_defpager_demuxer (mach_msg_header_t *inp,
                        mach_msg_header_t *outp)
 {
-  extern int default_pager_server (mach_msg_header_t *, mach_msg_header_t *);
-
-  return default_pager_server (inp, outp)
-    || trivfs_demuxer (inp, outp);
+  mig_routine_t routine;
+  if ((routine = default_pager_server_routine (inp)) ||
+      (routine = NULL, trivfs_demuxer (inp, outp)))
+    {
+      if (routine)
+        (*routine) (inp, outp);
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
 int
diff --git a/trans/streamio.c b/trans/streamio.c
index 54627b7..507250b 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -36,6 +36,7 @@
 
 #include "libtrivfs/trivfs_fs_S.h"
 #include "libtrivfs/trivfs_io_S.h"
+#include "device_reply_S.h"
 
 /* The global lock */
 pthread_mutex_t global_lock;
@@ -273,10 +274,16 @@ static const struct argp argp = { options, parse_opt, 
args_doc, doc };
 int
 demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
 {
-  extern int device_reply_server (mach_msg_header_t *, mach_msg_header_t *);
-
-  return (trivfs_demuxer (inp, outp)
-         || device_reply_server (inp, outp));
+  mig_routine_t routine;
+  if ((routine = NULL, trivfs_demuxer (inp, outp)) ||
+      (routine = device_reply_server_routine (inp)))
+    {
+      if (routine)
+        (*routine) (inp, outp);
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
 int

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