diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | lowercase.patch | 32 |
3 files changed, 10 insertions, 50 deletions
@@ -1,6 +1,6 @@ pkgbase = openssh-selinux pkgdesc = Free version of the SSH connectivity tools with SELinux support - pkgver = 6.5p1 + pkgver = 6.6p1 pkgrel = 1 url = http://www.openssh.org/portable.html install = install @@ -16,24 +16,22 @@ pkgbase = openssh-selinux depends = libselinux optdepends = xorg-xauth: X11 forwarding optdepends = x11-ssh-askpass: input passphrase in X - provides = openssh=6.5p1-1 - provides = selinux-openssh=6.5p1-1 + provides = openssh=6.6p1-1 + provides = selinux-openssh=6.6p1-1 conflicts = openssh conflicts = selinux-openssh backup = etc/ssh/ssh_config backup = etc/ssh/sshd_config backup = etc/pam.d/sshd - source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz - source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz.asc - source = lowercase.patch + source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz + source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz.asc source = sshdgenkeys.service source = sshd@.service source = sshd.service source = sshd.socket source = sshd.pam - sha1sums = 3363a72b4fee91b29cf2024ff633c17f6cd2f86d + sha1sums = b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e sha1sums = SKIP - sha1sums = 3163a71cbaeac39d0783ad4c501fd0630d6c0c22 sha1sums = cc1ceec606c98c7407e7ac21ade23aed81e31405 sha1sums = 6a0ff3305692cf83aca96e10f3bb51e1c26fccda sha1sums = ec49c6beba923e201505f5669cea48cad29014db @@ -6,7 +6,7 @@ # Contributor: Nicky726 <Nicky726@gmail.com> pkgname=openssh-selinux -pkgver=6.5p1 +pkgver=6.6p1 pkgrel=1 pkgdesc='Free version of the SSH connectivity tools with SELinux support' url='http://www.openssh.org/portable.html' @@ -17,17 +17,16 @@ depends=('krb5' 'openssl' 'libedit' 'ldns' 'libselinux') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}") -provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}") +provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" + "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}") groups=('selinux') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux}-${pkgver}.tar.gz"{,.asc} - 'lowercase.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' 'sshd.pam') -sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP' - '3163a71cbaeac39d0783ad4c501fd0630d6c0c22' +sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP' 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' @@ -38,11 +37,6 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') install=install -prepare() { - cd "${srcdir}/${pkgname/-selinux}-${pkgver}" - patch -p1 -i ../lowercase.patch -} - build() { cd "${srcdir}/${pkgname/-selinux}-${pkgver}" diff --git a/lowercase.patch b/lowercase.patch deleted file mode 100644 index 50b9e6e7d359..000000000000 --- a/lowercase.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001 -From: Damien Miller <djm@mindrot.org> -Date: Tue, 04 Feb 2014 00:26:04 +0000 -Subject: - 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@ ---- -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 |