Date: Wednesday, February 5, 2014 @ 06:19:21 Author: bisson Revision: 205447
fix FS#38791 Added: openssh/trunk/lowercase.patch Modified: openssh/trunk/PKGBUILD -----------------+ PKGBUILD | 9 ++++++++- lowercase.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-02-05 00:01:59 UTC (rev 205446) +++ PKGBUILD 2014-02-05 05:19:21 UTC (rev 205447) @@ -5,7 +5,7 @@ pkgname=openssh pkgver=6.5p1 -pkgrel=1 +pkgrel=2 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -15,6 +15,7 @@ optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'lowercase.patch' 'sshdgenkeys.service' '[email protected]' 'sshd.service' @@ -21,6 +22,7 @@ 'sshd.socket' 'sshd.pam') sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP' + '3163a71cbaeac39d0783ad4c501fd0630d6c0c22' 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' @@ -31,6 +33,11 @@ install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../lowercase.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" Added: lowercase.patch =================================================================== --- lowercase.patch (rev 0) +++ lowercase.patch 2014-02-05 05:19:21 UTC (rev 205447) @@ -0,0 +1,32 @@ +From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001 +From: Damien Miller <[email protected]> +Date: Tue, 04 Feb 2014 00:26:04 +0000 +Subject: - [email protected] 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@ +--- +diff --git a/ssh.c b/ssh.c +index ec95733..add760c 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); + /* +-- +cgit v0.9.2
