From owner-svn-ports-head@FreeBSD.ORG Fri Mar 20 02:43:45 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E4DC1C3D; Fri, 20 Mar 2015 02:43:44 +0000 (UTC) Received: from svn.freebsd.org (svn.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 CEC15FE5; Fri, 20 Mar 2015 02:43:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2K2hih6039070; Fri, 20 Mar 2015 02:43:44 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2K2hiiO039068; Fri, 20 Mar 2015 02:43:44 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201503200243.t2K2hiiO039068@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 20 Mar 2015 02:43:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381709 - head/security/openssh-portable 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.18-1 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: Fri, 20 Mar 2015 02:43:45 -0000 Author: bdrewery Date: Fri Mar 20 02:43:43 2015 New Revision: 381709 URL: https://svnweb.freebsd.org/changeset/ports/381709 QAT: https://qat.redports.org/buildarchive/r381709/ Log: Remove remnants of OVERWRITE_BASE which was removed in r376306 Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/pkg-plist Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Fri Mar 20 02:34:13 2015 (r381708) +++ head/security/openssh-portable/Makefile Fri Mar 20 02:43:43 2015 (r381709) @@ -54,7 +54,6 @@ AES_THREADED_DESC= Threaded AES-CTR NONECIPHER_DESC= NONE Cipher support OPTIONS_SUB= yes -PLIST_SUB+= MANPREFIX=${MANPREFIX} TCP_WRAPPERS_EXTRA_PATCHES=${FILESDIR}/extra-patch-tcpwrappers @@ -189,24 +188,13 @@ EMPTYDIR= /var/empty .if ${PORT_OPTIONS:MOVERWRITE_BASE} || defined(OPENSSH_OVERWRITE_BASE) IGNORE= Overwrite base option is no longer supported. -WITH_OPENSSL_BASE= yes -CONFIGURE_ARGS+= --localstatedir=/var -PREFIX= /usr -NO_MTREE= yes -ETCSSH= /etc/ssh -USE_RCORDER= openssh -PLIST_SUB+= NOTBASE="@comment " -.else -ETCSSH= ${PREFIX}/etc/ssh -USE_RC_SUBR= openssh -PLIST_SUB+= NOTBASE="" .endif +USE_RC_SUBR= openssh PLIST_SUB+= BASEPREFIX="${PREFIX}" # After all -SUB_LIST+= ETCSSH="${ETCSSH}" -CONFIGURE_ARGS+= --sysconfdir=${ETCSSH} --with-privsep-path=${EMPTYDIR} +CONFIGURE_ARGS+= --sysconfdir=${ETCDIR} --with-privsep-path=${EMPTYDIR} .if !empty(CONFIGURE_LIBS) CONFIGURE_ARGS+= --with-libs='${CONFIGURE_LIBS}' .endif @@ -238,8 +226,10 @@ post-patch: .endif post-install: - ${MV} ${STAGEDIR}${ETCSSH}/ssh_config ${STAGEDIR}${ETCSSH}/ssh_config.sample - ${MV} ${STAGEDIR}${ETCSSH}/sshd_config ${STAGEDIR}${ETCSSH}/sshd_config.sample + ${MV} ${STAGEDIR}${ETCDIR}/ssh_config \ + ${STAGEDIR}${ETCDIR}//ssh_config.sample + ${MV} ${STAGEDIR}${ETCDIR}/sshd_config \ + ${STAGEDIR}${ETCDIR}/sshd_config.sample .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/HPN-README ${STAGEDIR}${DOCSDIR} Modified: head/security/openssh-portable/pkg-plist ============================================================================== --- head/security/openssh-portable/pkg-plist Fri Mar 20 02:34:13 2015 (r381708) +++ head/security/openssh-portable/pkg-plist Fri Mar 20 02:43:43 2015 (r381709) @@ -7,21 +7,17 @@ bin/ssh-add bin/ssh-agent bin/ssh-keygen bin/ssh-keyscan -%%NOTBASE%%@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 -%%NOTBASE%%@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 -%%OVERWRITE_BASE%%@cwd / -%%NOTBASE%%etc/ssh/moduli +@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 -%%OVERWRITE_BASE%%@cwd %%BASEPREFIX%% -%%NOTBASE%%%%X509%%@dirrmtry etc/ssh/ca -%%NOTBASE%%@dirrmtry etc/ssh +%%X509%%@dir etc/ssh/ca @exec if [ -f %D/etc/ssh_host_ecdsa_key ] && grep -q DSA %D/etc/ssh_host_ecdsa_key; then echo; echo "\!/ Warning \!/"; echo; echo "Your %D/etc/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/etc/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 libexec/ssh-keysign libexec/ssh-pkcs11-helper -@cwd %%MANPREFIX%% man/man1/sftp.1.gz man/man1/ssh-add.1.gz man/man1/ssh-agent.1.gz