* New upstream release (http://www.openssh.org/txt/release-6.0).

  - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
    (closes: #643312, #650512).
  - 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.)

1 files changed, 4 insertions, 4 deletions

diff --git a/debian/patches/cross-pkg-config.patch b/debian/patches/cross-pkg-config.patch
index 87818cd95..c25d2a6e5 100644
--- a/debian/patches/cross-pkg-config.patch
+++ b/debian/patches/cross-pkg-config.patch
@@ -8,7 +8,7 @@ Index: b/configure
 ===================================================================
 --- a/configure
 +++ b/configure
-@@ -8739,8 +8739,9 @@
+@@ -9194,8 +9194,9 @@
  if test "${with_libedit+set}" = set; then :
    withval=$with_libedit;  if test "x$withval" != "xno" ; then
                 if test "x$withval" = "xyes" ; then
@@ -20,7 +20,7 @@ Index: b/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_path_PKGCONFIG+:} false; then :
-@@ -8766,7 +8767,6 @@
+@@ -9221,7 +9222,6 @@
    done
  IFS=$as_save_IFS
  
@@ -28,7 +28,7 @@ Index: b/configure
    ;;
  esac
  fi
-@@ -8780,6 +8780,63 @@
+@@ -9235,6 +9235,63 @@
  fi
  
  
@@ -96,7 +96,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1349,7 +1349,7 @@
+@@ -1434,7 +1434,7 @@
         [  --with-libedit[[=PATH]]   Enable libedit support for sftp],
         [ if test "x$withval" != "xno" ; then
                 if test "x$withval" = "xyes" ; then