Add missing header on Linux/s390

5 files changed, 41 insertions, 2 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 81a664a6f..f27785e11 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-ec338656a3d6b21bb87f3b6367b232d297f601e5
-ec338656a3d6b21bb87f3b6367b232d297f601e5
+326d5114682d8ddbb64dead273d7738aea10e30a
+326d5114682d8ddbb64dead273d7738aea10e30a
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 openssh_7.5p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 75faa362f..08f586ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:7.5p1-2) UNRELEASED; urgency=medium
+
+  * Add missing header on Linux/s390.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 02 Apr 2017 13:15:56 +0100
+
 openssh (1:7.5p1-1) experimental; urgency=medium
 
   * New upstream release (https://www.openssh.com/txt/release-7.5):
diff --git a/debian/patches/s390-missing-header.patch b/debian/patches/s390-missing-header.patch
new file mode 100644
index 000000000..d83ad3075
--- /dev/null
+++ b/debian/patches/s390-missing-header.patch
@@ -0,0 +1,29 @@
+From 326d5114682d8ddbb64dead273d7738aea10e30a Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Wed, 22 Mar 2017 12:43:02 +1100
+Subject: Missing header on Linux/s390
+
+Patch from Jakub Jelen
+
+Origin: https://anongit.mindrot.org/openssh.git/commit/?id=58b8cfa2a062b72139d7229ae8de567f55776f24
+Last-Update: 2017-04-02
+
+Patch-Name: s390-missing-header.patch
+---
+ sandbox-seccomp-filter.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index 3a1aedce..08dc3a8b 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -50,6 +50,9 @@
+ #include <elf.h>
+ 
+ #include <asm/unistd.h>
++#ifdef __s390__
++#include <asm/zcrypt.h>
++#endif
+ 
+ #include <errno.h>
+ #include <signal.h>
diff --git a/debian/patches/series b/debian/patches/series
index 52a8f50b1..16d970527 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ debian-config.patch
 regress-integrity-robust.patch
 no-dsa-host-key-by-default.patch
 restore-authorized_keys2.patch
+s390-missing-header.patch
diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index 3a1aedce7..08dc3a8b2 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -50,6 +50,9 @@
 #include <elf.h>
 
 #include <asm/unistd.h>
+#ifdef __s390__
+#include <asm/zcrypt.h>
+#endif
 
 #include <errno.h>
 #include <signal.h>