Merge 6.5p1.

* New upstream release (http://www.openssh.com/txt/release-6.5,
  LP: #1275068):
  - ssh(1): Add support for client-side hostname canonicalisation using a
    set of DNS suffixes and rules in ssh_config(5).  This allows
    unqualified names to be canonicalised to fully-qualified domain names
    to eliminate ambiguity when looking up keys in known_hosts or checking
    host certificate names (closes: #115286).

1 files changed, 9 insertions, 9 deletions

diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index 3c5af97c3..5d24b22b8 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From b65a0ded7a8cfe7d351e28266d7851216d679e05 Mon Sep 17 00:00:00 2001
+From ee8d8b97cc2c6081df3af453a228992b87309ec4 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:18 +0000
 Subject: Various Debian-specific configuration changes
@@ -34,10 +34,10 @@ Patch-Name: debian-config.patch
  5 files changed, 53 insertions(+), 3 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index c741934..e1e82c5 100644
+index 273552d..6ac8bea 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1292,7 +1292,7 @@ fill_default_options(Options * options)
+@@ -1618,7 +1618,7 @@ fill_default_options(Options * options)
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
@@ -47,7 +47,7 @@ index c741934..e1e82c5 100644
                 options->forward_x11_timeout = 1200;
         if (options->exit_on_forward_failure == -1)
 diff --git a/ssh_config b/ssh_config
-index 3234321..064b593 100644
+index 228e5ab..c9386aa 100644
 --- a/ssh_config
 +++ b/ssh_config
 @@ -17,9 +17,10 @@
@@ -71,7 +71,7 @@ index 3234321..064b593 100644
 +    GSSAPIAuthentication yes
 +    GSSAPIDelegateCredentials no
 diff --git a/ssh_config.5 b/ssh_config.5
-index 7b05e5f..01e7b6f 100644
+index 85f306c..cc91a5c 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
@@ -97,7 +97,7 @@ index 7b05e5f..01e7b6f 100644
  The configuration file has the following format:
  .Pp
  Empty lines and lines starting with
-@@ -501,7 +517,8 @@ token used for the session will be set to expire after 20 minutes.
+@@ -648,7 +664,8 @@ token used for the session will be set to expire after 20 minutes.
  Remote clients will be refused access after this time.
  .Pp
  The default is
@@ -108,10 +108,10 @@ index 7b05e5f..01e7b6f 100644
  See the X11 SECURITY extension specification for full details on
  the restrictions imposed on untrusted clients.
 diff --git a/sshd_config b/sshd_config
-index 9450141..9cfe28d 100644
+index d9b8594..4db32f5 100644
 --- a/sshd_config
 +++ b/sshd_config
-@@ -40,6 +40,7 @@
+@@ -41,6 +41,7 @@
  # Authentication:
  
  #LoginGraceTime 2m
@@ -120,7 +120,7 @@ index 9450141..9cfe28d 100644
  #StrictModes yes
  #MaxAuthTries 6
 diff --git a/sshd_config.5 b/sshd_config.5
-index 04b5f1a..ca4cb19 100644
+index 9fa6086..e7ac846 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -57,6 +57,33 @@ Arguments may optionally be enclosed in double quotes