sync with upstream packaging

4 files changed, 17 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 1ef118c8..5c7eaf09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hurd (1:0.7.git20160114-2) UNRELEASED; urgency=medium
+
+  * control: Drop perl build-dep, it is already build-essential.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 15 Jan 2016 19:45:32 +0100
+
 hurd (1:0.7.git20160114-1) unstable; urgency=medium
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index 2cac06dc..f81f7805 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: mig (>= 1.4-3~) <!stage1 !stage2 !stage3>, gnumach-dev (>= 1.4+gi
  libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1 !stage2 !stage3>,
  debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), dh-exec (>= 0.17), autoconf, dh-autoreconf,
  libparted-dev <!stage1 !stage2 !stage3>, libpciaccess-dev <!stage1 !stage2 !stage3>, libx11-dev <!stage1 !stage2 !stage3>, x11proto-core-dev <!stage1 !stage2 !stage3>, pkg-config <!stage1 !stage2 !stage3>,
- xkb-data <!stage1 !stage2 !stage3>, gawk, flex, bison, autotools-dev, perl, libdaemon-dev <!stage1 !stage2 !stage3>, libpcap0.8-dev <!stage1 !stage2 !stage3>,
+ xkb-data <!stage1 !stage2 !stage3>, gawk, flex, bison, autotools-dev, libdaemon-dev <!stage1 !stage2 !stage3>, libpcap0.8-dev <!stage1 !stage2 !stage3>,
  zlib1g-dev <!stage1 !stage2 !stage3>, libbz2-dev <!stage1 !stage2 !stage3>, uuid-dev <!stage1 !stage2 !stage3>, libblkid-dev <!stage1 !stage2 !stage3>
 Uploaders: Michael Banck <mbanck@debian.org>, 
  Samuel Thibault <sthibault@debian.org>
diff --git a/debian/local/runsystem b/debian/local/runsystem
index ddb45270..4911907c 100755
--- a/debian/local/runsystem
+++ b/debian/local/runsystem
@@ -5,10 +5,8 @@ export PATH
 
 umask 022
 
-# Create a minimal subset of device and server nodes
-/usr/lib/hurd/setup-translators -m -k -p
-
-/hurd/mach-defpager
+mkdir -p /servers/socket
+settrans -c /servers/socket/1 /hurd/pflocal
 
 mem=`vmstat-hurd --size -k`
 if [ "$mem" -lt 240000 ]
@@ -21,6 +19,11 @@ then
 	done
 fi
 
+# Create a minimal subset of device and server nodes
+/usr/lib/hurd/setup-translators -m -k -p
+
+/hurd/mach-defpager
+
 # Get all kernel parameters that can be exported as environment variables
 envvars="$(echo $* | tr ' ' '\012' | egrep '^[-_/[:alnum:]]+=.*$')"
 
diff --git a/debian/local/setup-translators b/debian/local/setup-translators
index ebebf5dc..071e241e 100755
--- a/debian/local/setup-translators
+++ b/debian/local/setup-translators
@@ -159,7 +159,9 @@ fi
 st kbd '/hurd/symlink cons/kbd' kbd
 st mouse '/hurd/symlink cons/mouse' mouse
 [ -d shm ] && ! [ -L shm ] && rmdir shm
-st shm '/hurd/symlink /run/shm' shm
+
+# TODO put back to /run/shm when tmpfs open/mmap/close/unlink/dereference crash is fixed
+st shm '/hurd/symlink /tmp' shm
 
 echo .