From owner-svn-ports-all@freebsd.org Mon Jul 27 17:09:33 2015 Return-Path: Delivered-To: svn-ports-all@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 E8C0E9AC619; Mon, 27 Jul 2015 17:09:32 +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 CD209FCF; Mon, 27 Jul 2015 17:09:32 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6RH9WOq061678; Mon, 27 Jul 2015 17:09:32 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6RH9WWc061676; Mon, 27 Jul 2015 17:09:32 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201507271709.t6RH9WWc061676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 27 Jul 2015 17:09:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392993 - head/security/openssh-portable-devel 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 17:09:33 -0000 Author: bdrewery Date: Mon Jul 27 17:09:31 2015 New Revision: 392993 URL: https://svnweb.freebsd.org/changeset/ports/392993 Log: Bring over ETCDIR and libedit updates from main port Modified: head/security/openssh-portable-devel/Makefile head/security/openssh-portable-devel/pkg-plist Modified: head/security/openssh-portable-devel/Makefile ============================================================================== --- head/security/openssh-portable-devel/Makefile Mon Jul 27 17:06:39 2015 (r392992) +++ head/security/openssh-portable-devel/Makefile Mon Jul 27 17:09:31 2015 (r392993) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 20150624 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= http://www.mindrot.org/openssh_snap/ \ OPENBSD/OpenSSH/portable @@ -79,8 +79,11 @@ PAM_CONFIGURE_WITH= pam TCP_WRAPPERS_CONFIGURE_WITH= tcp-wrappers LIBEDIT_CONFIGURE_WITH= libedit +LIBEDIT_USES= libedit BSM_CONFIGURE_ON= --with-audit=bsm +ETCDIR?= ${PREFIX}/etc/ssh + .include PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex @@ -179,7 +182,6 @@ IGNORE= Overwrite base option is no long .endif USE_RC_SUBR= openssh -ETCDIR= ${PREFIX}/etc/ssh # After all CONFIGURE_ARGS+= --sysconfdir=${ETCDIR} --with-privsep-path=${EMPTYDIR} Modified: head/security/openssh-portable-devel/pkg-plist ============================================================================== --- head/security/openssh-portable-devel/pkg-plist Mon Jul 27 17:06:39 2015 (r392992) +++ head/security/openssh-portable-devel/pkg-plist Mon Jul 27 17:09:31 2015 (r392993) @@ -7,12 +7,10 @@ bin/ssh-add bin/ssh-agent bin/ssh-keygen bin/ssh-keyscan -@exec if [ -f %D/etc/ssh_config -a ! -f %D/etc/ssh/ssh_config ]; then ln %D/etc/ssh_config %D/etc/ssh/ssh_config ; fi -@exec if [ -f %D/etc/sshd_config -a ! -f %D/etc/ssh/sshd_config ]; then ln %D/etc/sshd_config %D/etc/ssh/sshd_config ; fi -etc/ssh/moduli -@sample etc/ssh/ssh_config.sample -@sample etc/ssh/sshd_config.sample -%%X509%%@dir etc/ssh/ca +%%ETCDIR%%/moduli +@sample %%ETCDIR%%/ssh_config.sample +@sample %%ETCDIR%%/sshd_config.sample +%%X509%%@dir %%ETCDIR%%/ca @exec if [ -f %D/%%ETCDIR%%/ssh_host_ecdsa_key ] && grep -q DSA %D/%%ETCDIR%%/ssh_host_ecdsa_key; then echo; echo "\!/ Warning \!/"; echo; echo "Your %D/%%ETCDIR%%/ssh_host_ecdsa_key is not a valid ECDSA key. It is incorrectly"; echo "a DSA key due to a bug fixed in 2012 in the security/openssh-portable port."; echo; echo "Regenerate a proper one with: rm -f %D/%%ETCDIR%%/ssh_host_ecdsa_key*; service openssh restart"; echo; echo "Clients should not see any key change warning since the ECDSA was not valid and was not actually"; echo "used by the server."; echo; echo "\!/ Warning \!/"; fi sbin/sshd libexec/sftp-server