summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-04-02 13:15:42 +0100
committerColin Watson <cjwatson@debian.org>2017-04-02 13:16:38 +0100
commitb8fb08fe0c6ea8a3e75882ed80e95c882383940a (patch)
treeec20e58588892234c875faa28010394400e0b200 /debian/patches
parentfc1e884e1960930d31bf3a92c5d83a4b7630a4af (diff)
parent326d5114682d8ddbb64dead273d7738aea10e30a (diff)
Add missing header on Linux/s390
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/s390-missing-header.patch29
-rw-r--r--debian/patches/series1
2 files changed, 30 insertions, 0 deletions
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 @@
1From 326d5114682d8ddbb64dead273d7738aea10e30a Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Wed, 22 Mar 2017 12:43:02 +1100
4Subject: Missing header on Linux/s390
5
6Patch from Jakub Jelen
7
8Origin: https://anongit.mindrot.org/openssh.git/commit/?id=58b8cfa2a062b72139d7229ae8de567f55776f24
9Last-Update: 2017-04-02
10
11Patch-Name: s390-missing-header.patch
12---
13 sandbox-seccomp-filter.c | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
17index 3a1aedce..08dc3a8b 100644
18--- a/sandbox-seccomp-filter.c
19+++ b/sandbox-seccomp-filter.c
20@@ -50,6 +50,9 @@
21 #include <elf.h>
22
23 #include <asm/unistd.h>
24+#ifdef __s390__
25+#include <asm/zcrypt.h>
26+#endif
27
28 #include <errno.h>
29 #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
27regress-integrity-robust.patch 27regress-integrity-robust.patch
28no-dsa-host-key-by-default.patch 28no-dsa-host-key-by-default.patch
29restore-authorized_keys2.patch 29restore-authorized_keys2.patch
30s390-missing-header.patch