5 files changed, 33 insertions, 3 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index f27785e11..bd533dda5 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-326d5114682d8ddbb64dead273d7738aea10e30a
-326d5114682d8ddbb64dead273d7738aea10e30a
+93563703c3acd94883e89baa7fcbf666318e2704
+93563703c3acd94883e89baa7fcbf666318e2704
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 openssh_7.5p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 08f586ab1..3ace044cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openssh (1:7.5p1-2) UNRELEASED; urgency=medium
 
   * Add missing header on Linux/s390.
+  * Fix syntax error on Linux/X32.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 02 Apr 2017 13:15:56 +0100
 
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
 no-dsa-host-key-by-default.patch
 restore-authorized_keys2.patch
 s390-missing-header.patch
+x32-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 @@
+From 93563703c3acd94883e89baa7fcbf666318e2704 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Tue, 21 Mar 2017 08:47:55 +1100
+Subject: Fix syntax error on Linux/X32
+
+Patch from Mike Frysinger
+
+Origin: https://anongit.mindrot.org/openssh.git/commit/?id=6b853c6f8ba5eecc50f3b57af8e63f8184eb0fa6
+Last-Update: 2017-04-02
+
+Patch-Name: x32-syntax-error.patch
+---
+ sandbox-seccomp-filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index 08dc3a8b..2831e9d1 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -238,7 +238,7 @@ static const struct sock_filter preauth_insns[] = {
+         * x86-64 syscall under some circumstances, e.g.
+         * https://bugs.debian.org/849923
+         */
+-       SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT);
++       SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
+ #endif
+ 
+        /* Default deny */
diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index 08dc3a8b2..2831e9d10 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -238,7 +238,7 @@ static const struct sock_filter preauth_insns[] = {
          * x86-64 syscall under some circumstances, e.g.
          * https://bugs.debian.org/849923
          */
-        SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT);
+        SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
 #endif
 
         /* Default deny */