diff options
author | Colin Watson <cjwatson@debian.org> | 2017-04-02 13:19:46 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-04-02 13:20:03 +0100 |
commit | 524f638f9ac661d468c8c9bb26bd3a0231b31793 (patch) | |
tree | 9fccfb4ea608738502a0782e045c45489164fb79 /debian/patches/x32-syntax-error.patch | |
parent | b8fb08fe0c6ea8a3e75882ed80e95c882383940a (diff) | |
parent | 93563703c3acd94883e89baa7fcbf666318e2704 (diff) |
Fix syntax error on Linux/X32
Diffstat (limited to 'debian/patches/x32-syntax-error.patch')
-rw-r--r-- | debian/patches/x32-syntax-error.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 @@ | |||
1 | From 93563703c3acd94883e89baa7fcbf666318e2704 Mon Sep 17 00:00:00 2001 | ||
2 | From: Damien Miller <djm@mindrot.org> | ||
3 | Date: Tue, 21 Mar 2017 08:47:55 +1100 | ||
4 | Subject: Fix syntax error on Linux/X32 | ||
5 | |||
6 | Patch from Mike Frysinger | ||
7 | |||
8 | Origin: https://anongit.mindrot.org/openssh.git/commit/?id=6b853c6f8ba5eecc50f3b57af8e63f8184eb0fa6 | ||
9 | Last-Update: 2017-04-02 | ||
10 | |||
11 | Patch-Name: x32-syntax-error.patch | ||
12 | --- | ||
13 | sandbox-seccomp-filter.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c | ||
17 | index 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 */ | ||