5 files changed, 47 insertions, 3 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 11c6ec01c..3455d7da0 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-ee8d8b97cc2c6081df3af453a228992b87309ec4
-ee8d8b97cc2c6081df3af453a228992b87309ec4
+c662cd7269217e67b4c47ed4afdbe0ca8d355fd4
+c662cd7269217e67b4c47ed4afdbe0ca8d355fd4
 9a975a9faed7c4f334e8c8490db3e77e102f2b21
 9a975a9faed7c4f334e8c8490db3e77e102f2b21
 openssh_6.5p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 9e821ff25..ba32acdc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:6.5p1-2) UNRELEASED; urgency=medium
 
   * Only enable ssh.service for systemd, not both ssh.service and
     ssh.socket.  Thanks to Michael Biebl for spotting this.
+  * Backport upstream patch to unbreak case-sensitive matching of ssh_config
+    (closes: #738619).
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 11 Feb 2014 10:41:26 +0000
 
diff --git a/debian/patches/fix-case-sensitive-matching.patch b/debian/patches/fix-case-sensitive-matching.patch
new file mode 100644
index 000000000..b6213962d
--- /dev/null
+++ b/debian/patches/fix-case-sensitive-matching.patch
@@ -0,0 +1,41 @@
+From c662cd7269217e67b4c47ed4afdbe0ca8d355fd4 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Tue, 4 Feb 2014 11:26:04 +1100
+Subject: Unbreak case-sensitive matching of ssh_config
+
+   - djm@cvs.openbsd.org 2014/02/04 00:24:29
+     [ssh.c]
+     delay lowercasing of hostname until right before hostname
+     canonicalisation to unbreak case-sensitive matching of ssh_config;
+     reported by Ike Devolder; ok markus@
+
+Origin: backport, https://anongit.mindrot.org/openssh.git/commit/?id=d56b44d2dfa093883a5c4e91be3f72d99946b170
+Bug-Debian: http://bugs.debian.org/738619
+Forwarded: not-needed
+Last-Update: 2014-02-11
+
+Patch-Name: fix-case-sensitive-matching.patch
+---
+ ssh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssh.c b/ssh.c
+index 0cea713..5d5d4de 100644
+--- a/ssh.c
++++ b/ssh.c
+@@ -780,7 +780,6 @@ main(int ac, char **av)
+        if (!host)
+                usage();
+ 
+-       lowercase(host);
+        host_arg = xstrdup(host);
+ 
+        OpenSSL_add_all_algorithms();
+@@ -914,6 +913,7 @@ main(int ac, char **av)
+        }
+ 
+        /* If canonicalization requested then try to apply it */
++       lowercase(host);
+        if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
+                addrs = resolve_canonicalize(&host, options.port);
+        /*
diff --git a/debian/patches/series b/debian/patches/series
index 5d21e57d1..f571f76a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ no-openssl-version-check.patch
 gnome-ssh-askpass2-icon.patch
 sigstop.patch
 debian-config.patch
+fix-case-sensitive-matching.patch
diff --git a/ssh.c b/ssh.c
index 0cea713ec..5d5d4de4d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -780,7 +780,6 @@ main(int ac, char **av)
         if (!host)
                 usage();
 
-        lowercase(host);
         host_arg = xstrdup(host);
 
         OpenSSL_add_all_algorithms();
@@ -914,6 +913,7 @@ main(int ac, char **av)
         }
 
         /* If canonicalization requested then try to apply it */
+        lowercase(host);
         if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
                 addrs = resolve_canonicalize(&host, options.port);
         /*