From owner-svn-ports-all@FreeBSD.ORG  Sat Jun 22 15:11:31 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5156C37C;
 Sat, 22 Jun 2013 15:11:31 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 43A8C10CC;
 Sat, 22 Jun 2013 15:11:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5MFBVwp072065;
 Sat, 22 Jun 2013 15:11:31 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5MFBU8S072063;
 Sat, 22 Jun 2013 15:11:30 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201306221511.r5MFBU8S072063@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 22 Jun 2013 15:11:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321578 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Jun 2013 15:11:31 -0000

Author: bdrewery
Date: Sat Jun 22 15:11:30 2013
New Revision: 321578
URL: http://svnweb.freebsd.org/changeset/ports/321578

Log:
  - In rc script, be consistent in reload and check for and generate keys
    if needed, as well as checking for port collision with base sshd.
  
  Reported by:	delphij

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/openssh.in

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Sat Jun 22 15:04:02 2013	(r321577)
+++ head/security/openssh-portable/Makefile	Sat Jun 22 15:11:30 2013	(r321578)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssh
 DISTVERSION=	6.2p2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	${MASTER_SITE_OPENBSD}

Modified: head/security/openssh-portable/files/openssh.in
==============================================================================
--- head/security/openssh-portable/files/openssh.in	Sat Jun 22 15:04:02 2013	(r321577)
+++ head/security/openssh-portable/files/openssh.in	Sat Jun 22 15:11:30 2013	(r321578)
@@ -27,7 +27,7 @@ load_rc_config ${name}
 command=%%PREFIX%%/sbin/sshd
 extra_commands="configtest reload keygen"
 start_precmd="${name}_checks"
-reload_precmd="${name}_configtest"
+reload_precmd="${name}_checks"
 restart_precmd="${name}_checks"
 configtest_cmd="${name}_configtest"
 keygen_cmd="${name}_keygen"