3 files changed, 33 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 5d72cfc34..c5022e85a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ openssh (1:6.0p1-1) UNRELEASED; urgency=low
     - Add a new privilege separation sandbox implementation for Linux's new
       seccomp sandbox, automatically enabled on platforms that support it.
       (Note: privilege separation sandboxing is still experimental.)
+  * Fix a bashism in configure's seccomp_filter check.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 21 Apr 2012 10:57:23 +0100
 
diff --git a/debian/patches/configure-bashism.patch b/debian/patches/configure-bashism.patch
new file mode 100644
index 000000000..09f878376
--- /dev/null
+++ b/debian/patches/configure-bashism.patch
@@ -0,0 +1,31 @@
+Description: Fix a bashism in configure
+Author: Colin Watson <cjwatson@debian.org>
+Forwarded: https://bugzilla.mindrot.org/show_bug.cgi?id=2010
+Last-Update: 2012-05-18
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -11918,7 +11918,7 @@
+ 
+ elif test "x$sandbox_arg" = "xseccomp_filter" || \
+      ( test -z "$sandbox_arg" && \
+-       test "x$have_seccomp_filter" == "x1" && \
++       test "x$have_seccomp_filter" = "x1" && \
+        test "x$ac_cv_header_linux_audit_h" = "xyes" && \
+        test "x$have_seccomp_audit_arch" = "x1" && \
+        test "x$have_linux_no_new_privs" = "x1" && \
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -2615,7 +2615,7 @@
+        AC_DEFINE([SANDBOX_DARWIN], [1], [Sandbox using Darwin sandbox_init(3)])
+ elif test "x$sandbox_arg" = "xseccomp_filter" || \
+      ( test -z "$sandbox_arg" && \
+-       test "x$have_seccomp_filter" == "x1" && \
++       test "x$have_seccomp_filter" = "x1" && \
+        test "x$ac_cv_header_linux_audit_h" = "xyes" && \
+        test "x$have_seccomp_audit_arch" = "x1" && \
+        test "x$have_linux_no_new_privs" = "x1" && \
diff --git a/debian/patches/series b/debian/patches/series
index 2c3fdb668..772dadb61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,6 +38,7 @@ doc-hash-tab-completion.patch
 # Miscellaneous bug fixes
 auth-log-verbosity.patch
 cross-pkg-config.patch
+configure-bashism.patch
 
 # Debian-specific configuration
 gnome-ssh-askpass2-icon.patch