From d96c092a00c77d8f736b04670ad45d7410a9f408 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 3 Jun 2017 17:12:26 +0200 Subject: [PATCH] Revert "The earlier commit ea119211b21 removed 'dsa' as one of the ssh_host_*_key" The author (@pprindeville) of the original commit noted that the wrong commit was picked, see https://github.com/openwrt/packages/commit/325b7d2cd2d6e9d4903c6e7628c7c9ae0ddab564#commitcomment-22387528 "Err... looks like the wrong fix got committed. I was hoping that this commit d902e5d would have gone in instead." This reverts commit 325b7d2cd2d6e9d4903c6e7628c7c9ae0ddab564. Signed-off-by: Daniel Golle --- net/openssh/Makefile | 2 +- .../patches/900-remove-dsa-key-file-patch.patch | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 net/openssh/patches/900-remove-dsa-key-file-patch.patch diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 202c4383e..f193f6e06 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=7.5p1 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/net/openssh/patches/900-remove-dsa-key-file-patch.patch b/net/openssh/patches/900-remove-dsa-key-file-patch.patch deleted file mode 100644 index 602deda1b..000000000 --- a/net/openssh/patches/900-remove-dsa-key-file-patch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/servconf.c 2017-03-19 20:39:27.000000000 -0600 -+++ b/servconf.c 2017-06-01 19:12:51.338645002 -0600 -@@ -201,8 +201,10 @@ - /* fill default hostkeys for protocols */ - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_RSA_KEY_FILE; -+#if 0 - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_DSA_KEY_FILE; -+#endif - #ifdef OPENSSL_HAS_ECC - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_ECDSA_KEY_FILE;