openssh: update to 7.0p1.
This commit is contained in:
parent
05bafac68f
commit
feff01b8f0
2 changed files with 4 additions and 38 deletions
|
@ -1,34 +0,0 @@
|
||||||
--- auth2-chall.c 2015/01/19 20:07:45 1.42
|
|
||||||
+++ auth2-chall.c 2015/07/18 07:57:14 1.43
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */
|
|
||||||
+/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2001 Markus Friedl. All rights reserved.
|
|
||||||
* Copyright (c) 2001 Per Allansson. All rights reserved.
|
|
||||||
@@ -57,6 +57,7 @@
|
|
||||||
void *ctxt;
|
|
||||||
KbdintDevice *device;
|
|
||||||
u_int nreq;
|
|
||||||
+ u_int devices_done;
|
|
||||||
};
|
|
||||||
|
|
||||||
static KbdintAuthctxt *
|
|
||||||
@@ -123,11 +124,15 @@
|
|
||||||
if (len == 0)
|
|
||||||
break;
|
|
||||||
for (i = 0; devices[i]; i++) {
|
|
||||||
- if (!auth2_method_allowed(authctxt,
|
|
||||||
+ if ((kbdintctxt->devices_done & (1 << i)) != 0 ||
|
|
||||||
+ !auth2_method_allowed(authctxt,
|
|
||||||
"keyboard-interactive", devices[i]->name))
|
|
||||||
continue;
|
|
||||||
- if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0)
|
|
||||||
+ if (strncmp(kbdintctxt->devices, devices[i]->name,
|
|
||||||
+ len) == 0) {
|
|
||||||
kbdintctxt->device = devices[i];
|
|
||||||
+ kbdintctxt->devices_done |= 1 << i;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
t = kbdintctxt->devices;
|
|
||||||
kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL;
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'openssh'
|
# Template file for 'openssh'
|
||||||
pkgname=openssh
|
pkgname=openssh
|
||||||
version=6.9p1
|
version=7.0p1
|
||||||
revision=4
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--sbindir=/usr/bin --datadir=/usr/share/openssh
|
configure_args="--sbindir=/usr/bin --datadir=/usr/share/openssh
|
||||||
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
|
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
|
||||||
|
@ -19,8 +19,8 @@ make_dirs="/var/chroot/ssh 0755 root root"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
homepage="http://www.openssh.org"
|
homepage="http://www.openssh.org"
|
||||||
license="BSD"
|
license="BSD"
|
||||||
distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
|
distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
|
||||||
checksum=6e074df538f357d440be6cf93dc581a21f22d39e236f217fcd8eacbb6c896cfe
|
checksum=fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5
|
||||||
|
|
||||||
# Package build options
|
# Package build options
|
||||||
build_options="openssh_identitypersist ldns ssl"
|
build_options="openssh_identitypersist ldns ssl"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue