From 67dd57f63cdd7042ecd8db3e6ccef85e8ca74384 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Wed, 1 Jul 2015 07:43:09 +0200
Subject: [PATCH] openssh: update to 6.9p1.

---
 .../openssh-6.8_p1-ssh-keygen-no-ssh1.patch     | 17 -----------------
 srcpkgs/openssh/template                        |  7 +++----
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/openssh/patches/openssh-6.8_p1-ssh-keygen-no-ssh1.patch

diff --git a/srcpkgs/openssh/patches/openssh-6.8_p1-ssh-keygen-no-ssh1.patch b/srcpkgs/openssh/patches/openssh-6.8_p1-ssh-keygen-no-ssh1.patch
deleted file mode 100644
index f715f5c12ef..00000000000
--- a/srcpkgs/openssh/patches/openssh-6.8_p1-ssh-keygen-no-ssh1.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index a686350f45f..9a1cddaa48b 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -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"