[arch-commits] Commit in openssh/trunk (PKGBUILD lowercase.patch)

[Gaetan Bisson]

    Date: Sunday, March 16, 2014 @ 03:42:45
  Author: bisson
Revision: 207970

upstream update

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/lowercase.patch

-----------------+
 PKGBUILD        |   13 +++----------
 lowercase.patch |   32 --------------------------------
 2 files changed, 3 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-16 02:22:39 UTC (rev 207969)
+++ PKGBUILD	2014-03-16 02:42:45 UTC (rev 207970)
@@ -4,8 +4,8 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=openssh
-pkgver=6.5p1
-pkgrel=2
+pkgver=6.6p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -15,14 +15,12 @@
 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'
         'sshd at .service'
         'sshd.service'
         'sshd.socket'
         'sshd.pam')
-sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
-          '3163a71cbaeac39d0783ad4c501fd0630d6c0c22'
+sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP'
           'cc1ceec606c98c7407e7ac21ade23aed81e31405'
           '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
           'ec49c6beba923e201505f5669cea48cad29014db'
@@ -33,11 +31,6 @@
 
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../lowercase.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: lowercase.patch
===================================================================
--- lowercase.patch	2014-03-16 02:22:39 UTC (rev 207969)
+++ lowercase.patch	2014-03-16 02:42:45 UTC (rev 207970)
@@ -1,32 +0,0 @@
-From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm at mindrot.org>
-Date: Tue, 04 Feb 2014 00:26:04 +0000
-Subject:    - djm at 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@
----
-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