openssh: update to 6.9p1.

This commit is contained in:
Juan RP 2015-07-01 07:43:09 +02:00
parent affdb8a6bd
commit 67dd57f63c
2 changed files with 3 additions and 21 deletions

View File

@ -1,17 +0,0 @@
https://bugs.gentoo.org/544078
https://bugzilla.mindrot.org/show_bug.cgi?id=2369
do not try to generate rsa1 keys when ssh1 support is disabled
--- ssh-keygen.c
+++ ssh-keygen.c
@@ -948,7 +948,9 @@ do_gen_all_hostkeys(struct passwd *pw)
char *key_type_display;
char *path;
} key_types[] = {
+#ifdef WITH_SSH1
{ "rsa1", "RSA1", _PATH_HOST_KEY_FILE },
+#endif
{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE },
{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE },
#ifdef OPENSSL_HAS_ECC

View File

@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=6.8p1
revision=5
version=6.9p1
revision=1
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@ -14,14 +14,13 @@ hostmakedepends="automake libtool perl"
makedepends="zlib-devel pam-devel libedit-devel
$(vopt_if ssl libressl-devel) $(vopt_if ldns libldns-devel)"
short_desc="The OpenSSH implementation of SSH protocol"
replaces="openssh-server>=0"
conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
make_dirs="/var/chroot/ssh 0755 root root"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.openssh.org"
license="BSD"
distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
checksum=3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e
checksum=6e074df538f357d440be6cf93dc581a21f22d39e236f217fcd8eacbb6c896cfe
# Package build options
build_options="openssh_identitypersist ldns ssl"