From owner-svn-ports-all@FreeBSD.ORG Mon Jan 5 16:13:21 2015 Return-Path: Delivered-To: svn-ports-all@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 E89D680; Mon, 5 Jan 2015 16:13:20 +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 C938828C5; Mon, 5 Jan 2015 16:13:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t05GDKgm097585; Mon, 5 Jan 2015 16:13:20 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t05GDKog097584; Mon, 5 Jan 2015 16:13:20 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201501051613.t05GDKog097584@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 5 Jan 2015 16:13:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376306 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 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, 05 Jan 2015 16:13:21 -0000 Author: bdrewery Date: Mon Jan 5 16:13:19 2015 New Revision: 376306 URL: https://svnweb.freebsd.org/changeset/ports/376306 QAT: https://qat.redports.org/buildarchive/r376306/ Log: Mark OVERWRITE_BASE as IGNORE. Keep it as an option as otherwise the user won't be notified that their configuration is wrong and it will just install to PREFIX instead, which would be surprising. Modified: head/security/openssh-portable/Makefile Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Mon Jan 5 16:13:13 2015 (r376305) +++ head/security/openssh-portable/Makefile Mon Jan 5 16:13:19 2015 (r376306) @@ -46,7 +46,7 @@ HPN_DESC= HPN-SSH patch LDNS_DESC= SSHFP/LDNS support X509_DESC= x509 certificate patch SCTP_DESC= SCTP support -OVERWRITE_BASE_DESC= OpenSSH overwrite base +OVERWRITE_BASE_DESC= EOL, No longer supported. HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) HEIMDAL_BASE_DESC= Heimdal Kerberos (base) MIT_DESC= MIT Kerberos (security/krb5) @@ -160,10 +160,6 @@ IGNORE= PAM must be installed in base IGNORE= required /usr/include/tcpd.h missing .endif -.if defined(OPENSSH_OVERWRITE_BASE) -PORT_OPTIONS+= OVERWRITE_BASE -.endif - .if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL} || ${PORT_OPTIONS:MHEIMDAL_BASE} . if ${PORT_OPTIONS:MHEIMDAL_BASE} CONFIGURE_LIBS+= -lgssapi_krb5 @@ -187,10 +183,8 @@ CONFIGURE_ARGS+= --with-ssl-dir=${OPENSS EMPTYDIR= /var/empty -.if ${PORT_OPTIONS:MOVERWRITE_BASE} -# XXX: Mark this BROKEN rather than remove the option to force people to notice for POLA. -DEPRECATED= Overwrite-base option/port/pkg will be removed. There is no real need for foot-shooting. -EXPIRATION_DATE= 2015-01-01 +.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 @@ -224,10 +218,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/pathnames.h ${WRKSRC}/sshd_config.5 \ ${WRKSRC}/ssh_config.5 -.if !${PORT_OPTIONS:MOVERWRITE_BASE} @${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|' \ -e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8 -.endif @${REINPLACE_CMD} -E -e 's|SSH_VERSION|TMP_SSH_VERSION|' \ -e 's|.*SSH_RELEASE.*||' ${WRKSRC}/version.h @${ECHO_CMD} '#define FREEBSD_PORT_VERSION " FreeBSD-${PKGNAME}"' >> \ @@ -241,12 +233,6 @@ post-patch: ${WRKSRC}/version.h .endif -pre-install: -# Workaround not running mtree BSD.root.dist on / since PREFIX=/usr -.if ${PORT_OPTIONS:MOVERWRITE_BASE} - ${MKDIR} ${STAGEDIR}/etc/rc.d -.endif - post-install: ${MV} ${STAGEDIR}${ETCSSH}/ssh_config ${STAGEDIR}${ETCSSH}/ssh_config.sample ${MV} ${STAGEDIR}${ETCSSH}/sshd_config ${STAGEDIR}${ETCSSH}/sshd_config.sample