* New upstream release:

  - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
    paths.
  - Include a language tag when sending a protocol 2 disconnection
    message.
  - Make logging of certificates used for user authentication more clear
    and consistent between CAs specified using TrustedUserCAKeys and
    authorized_keys.

1 files changed, 2 insertions, 2 deletions

diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch
index 5c1b83415..e39239fbd 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -1918,7 +1918,7 @@ Index: b/key.c
 ===================================================================
 --- a/key.c
 +++ b/key.c
-@@ -969,6 +969,8 @@
+@@ -982,6 +982,8 @@
                 return KEY_RSA_CERT;
         } else if (strcmp(name, "ssh-dss-cert-v00@openssh.com") == 0) {
                 return KEY_DSA_CERT;
@@ -2387,7 +2387,7 @@ Index: b/servconf.c
  #endif
         { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
-@@ -925,10 +942,22 @@
+@@ -924,10 +941,22 @@
                 intptr = &options->gss_authentication;
                 goto parse_flag;