From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 27 18:52:59 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C7DE1065675;
	Thu, 27 Sep 2012 18:52:59 +0000 (UTC)
	(envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E26D08FC08;
	Thu, 27 Sep 2012 18:52:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8RIqwSp076612;
	Thu, 27 Sep 2012 18:52:58 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RIqwMS076610;
	Thu, 27 Sep 2012 18:52:58 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201209271852.q8RIqwMS076610@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 27 Sep 2012 18:52:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304972 - head/ftp/vsftpd
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Sep 2012 18:52:59 -0000

Author: dinoex
Date: Thu Sep 27 18:52:58 2012
New Revision: 304972
URL: http://svn.freebsd.org/changeset/ports/304972

Log:
  - new option STACKPROTECTOR
  makes building easier on platforms that does not support this feature

Modified:
  head/ftp/vsftpd/Makefile

Modified: head/ftp/vsftpd/Makefile
==============================================================================
--- head/ftp/vsftpd/Makefile	Thu Sep 27 18:51:21 2012	(r304971)
+++ head/ftp/vsftpd/Makefile	Thu Sep 27 18:52:58 2012	(r304972)
@@ -26,10 +26,13 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelo
 		README README.security README.ssl REFS REWARD \
 		SIZE SPEED TODO TUNING
 
-OPTIONS_DEFINE=	VSFTPD_SSL PIDFILE
+OPTIONS_DEFINE=	VSFTPD_SSL PIDFILE STACKPROTECTOR
+OPTIONS_DEFAULT?=	STACKPROTECTOR
+NO_OPTIONS_SORT=yes
 
 VSFTPD_SSL_DESC=Include support for SSL
 PIDFILE_DESC=	Unofficial support for pidfile
+STACKPROTECTOR_DESC=	Build with stack-protector
 
 .include <bsd.port.pre.mk>
 
@@ -44,13 +47,17 @@ LDFLAGS+=	-L${OPENSSLLIB}
 EXTRA_PATCHES+=	${FILESDIR}/pidfile.patch
 .endif
 
-VSFTPD_OPTIMIZED=	${CFLAGS:M-O}
+VSFTPD_OPTIMIZED=	${CFLAGS:M-O*}
 .if defined(CFLAGS) && !empty(VSFTPD_OPTIMIZED)
-VSFTPD_NO_OPTIMIZED=	-e "s| -O2 ||"
+VSFTPD_NO_OPTIMIZED=	-e "s|-O2 ||"
 .endif
 
+.if ${PORT_OPTIONS:MSTACKPROTECTOR}
 # BROKEN on FreeBSD with undefined reference to `__stack_chk_fail_local'
-LDFLAGS+=	 -lssp_nonshared
+VSFTPD_LIBS=	-lssp_nonshared
+.else
+VSFTPD_NO_SSP=	-e "s|-fstack-protector --param=ssp-buffer-size=4 ||"
+.endif
 
 do-configure:
 .if !defined(WITHOUT_SSL) && ${PORT_OPTIONS:MVSFTPD_SSL}
@@ -68,11 +75,11 @@ do-configure:
 		${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
 	${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \
 		${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c
-	${REINPLACE_CMD} ${VSFTPD_NO_OPTIMIZED} \
-		-e "s|^CC 	=	gcc|CC	= ${CC}|" \
-		-e "s|^CFLAGS	=|CFLAGS	= ${CFLAGS}|" \
-		-e "s|$$(INSTALL) -m 755=|$${INSTALL_PROGRAM}|" \
-		-e "s|	-Wl,-s|	${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
+	${REINPLACE_CMD} ${VSFTPD_NO_OPTIMIZED} ${VSFTPD_NO_SSP} \
+		-e "s|^CC 	=	gcc|CC	=	${CC}|" \
+		-e "s|^CFLAGS	=	|CFLAGS	=	${CFLAGS} |" \
+		-e "s|^LDFLAGS	=	|LDFLAGS	=	${LDFLAGS} |" \
+		-e "s|	-Wl,-s|	${VSFTPD_LIBS}|" \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
 	@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \