summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/x32-syntax-error.patch28
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 16d970527..981b5cf25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ regress-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 30s390-missing-header.patch
31x32-syntax-error.patch
diff --git a/debian/patches/x32-syntax-error.patch b/debian/patches/x32-syntax-error.patch
new file mode 100644
index 000000000..e78003fed
--- /dev/null
+++ b/debian/patches/x32-syntax-error.patch
@@ -0,0 +1,28 @@
1From 93563703c3acd94883e89baa7fcbf666318e2704 Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Tue, 21 Mar 2017 08:47:55 +1100
4Subject: Fix syntax error on Linux/X32
5
6Patch from Mike Frysinger
7
8Origin: https://anongit.mindrot.org/openssh.git/commit/?id=6b853c6f8ba5eecc50f3b57af8e63f8184eb0fa6
9Last-Update: 2017-04-02
10
11Patch-Name: x32-syntax-error.patch
12---
13 sandbox-seccomp-filter.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
17index 08dc3a8b..2831e9d1 100644
18--- a/sandbox-seccomp-filter.c
19+++ b/sandbox-seccomp-filter.c
20@@ -238,7 +238,7 @@ static const struct sock_filter preauth_insns[] = {
21 * x86-64 syscall under some circumstances, e.g.
22 * https://bugs.debian.org/849923
23 */
24- SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT);
25+ SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
26 #endif
27
28 /* Default deny */