svn commit: r304961 - head/security/sudo
Wesley Shields
wxs at FreeBSD.org
Thu Sep 27 13:44:02 UTC 2012
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>
More information about the svn-ports-head
mailing list