From owner-svn-ports-head@freebsd.org Thu Sep 24 21:54:41 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D0E3A089A1; Thu, 24 Sep 2015 21:54:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 553551FF6; Thu, 24 Sep 2015 21:54:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OLsfVf062218; Thu, 24 Sep 2015 21:54:41 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OLseUm062216; Thu, 24 Sep 2015 21:54:40 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201509242154.t8OLseUm062216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 24 Sep 2015 21:54:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397771 - in head/security/openssh-portable: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2015 21:54:41 -0000 Author: bdrewery Date: Thu Sep 24 21:54:40 2015 New Revision: 397771 URL: https://svnweb.freebsd.org/changeset/ports/397771 Log: Stop trying to create the RSA protocol 1 key from the rc.d file. It is no longer supported by default since 7.0. [1] I do plan to make this configurable based on PR 202169 [2] soon. PR: 202792 [1] PR: 202169 [2] Submitted by: chrysalis@chrysalisnet.org [1] Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/files/openssh.in Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Thu Sep 24 21:54:29 2015 (r397770) +++ head/security/openssh-portable/Makefile Thu Sep 24 21:54:40 2015 (r397771) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 7.1p1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable Modified: head/security/openssh-portable/files/openssh.in ============================================================================== --- head/security/openssh-portable/files/openssh.in Thu Sep 24 21:54:29 2015 (r397770) +++ head/security/openssh-portable/files/openssh.in Thu Sep 24 21:54:40 2015 (r397771) @@ -35,8 +35,7 @@ pidfile=${openssh_pidfile:="/var/run/ssh openssh_keygen() { - if [ -f %%ETCDIR%%/ssh_host_key -a \ - -f %%ETCDIR%%/ssh_host_dsa_key -a \ + if [ -f %%ETCDIR%%/ssh_host_dsa_key -a \ -f %%ETCDIR%%/ssh_host_rsa_key -a \ -f %%ETCDIR%%/ssh_host_ecdsa_key -a \ -f %%ETCDIR%%/ssh_host_ed25519_key ]; then @@ -49,15 +48,6 @@ openssh_keygen() [ -x %%PREFIX%%/bin/ssh-keygen ] || err 1 "%%PREFIX%%/bin/ssh-keygen does not exist." - if [ -f %%ETCDIR%%/ssh_host_key ]; then - echo "You already have an RSA host key" \ - "in %%ETCDIR%%/ssh_host_key" - echo "Skipping protocol version 1 RSA Key Generation" - else - %%PREFIX%%/bin/ssh-keygen -t rsa1 -b 1024 \ - -f %%ETCDIR%%/ssh_host_key -N '' - fi - if [ -f %%ETCDIR%%/ssh_host_dsa_key ]; then echo "You already have a DSA host key" \ "in %%ETCDIR%%/ssh_host_dsa_key"