From owner-svn-ports-all@FreeBSD.ORG  Thu Sep 27 13:44:02 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 83DD6106564A;
	Thu, 27 Sep 2012 13:44:02 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E6DC8FC0A;
	Thu, 27 Sep 2012 13:44:02 +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 q8RDi2HO027767;
	Thu, 27 Sep 2012 13:44:02 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RDi2Jr027765;
	Thu, 27 Sep 2012 13:44:02 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201209271344.q8RDi2Jr027765@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Thu, 27 Sep 2012 13:44:02 +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: r304961 - head/security/sudo
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Thu, 27 Sep 2012 13:44:02 -0000

Author: wxs
Date: Thu Sep 27 13:44:01 2012
New Revision: 304961
URL: http://svn.freebsd.org/changeset/ports/304961

Log:
  Fix the temporary workaround by passing the appropriate flag in
  LDFLAGS. Since I want to ensure those who built it on i386 with this
  workaround will rebuild it now that it is fixed bump PORTREVISION.

Modified:
  head/security/sudo/Makefile

Modified: head/security/sudo/Makefile
==============================================================================
--- head/security/sudo/Makefile	Thu Sep 27 13:41:54 2012	(r304960)
+++ head/security/sudo/Makefile	Thu Sep 27 13:44:01 2012	(r304961)
@@ -7,6 +7,7 @@
 
 PORTNAME=	sudo
 DISTVERSION=	1.8.6p3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SUDO}
 
@@ -21,6 +22,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lgcc
+LDFLAGS+=	-lssp_nonshared
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-ignore-dot \
@@ -99,14 +101,6 @@ CONFIGURE_ARGS+=--with-bsm-audit
 CONFIGURE_ARGS+=--with-opie
 .endif
 
-.include <bsd.port.pre.mk>
-
-# Temporary workaround until I can figure out why the build fails on i386.
-# You can add --stack-protector to LDFLAGS but that doesn't work with clang.
-.if ${ARCH} == "i386"
-CONFIGURE_ARGS+=	--disable-hardening
-.endif
-
 MAN5+=		sudoers.5
 MAN8=		sudo.8 visudo.8 sudoreplay.8 sudo_plugin.8
 MLINKS=		sudo.8 sudoedit.8
@@ -134,4 +128,4 @@ post-install:
 	fi
 	${TOUCH} ${PREFIX}/etc/sudoers.d/.keep-me
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>