From 9e8cdb26b1cd83065f9abe84869f09c3569b77c3 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 6 Oct 2015 00:30:30 +0000
Subject: [PATCH] The performance hit for -fstack-protector-all is worth it
 here. ok gilles

---
 usr.sbin/smtpd/makemap/Makefile      | 3 ++-
 usr.sbin/smtpd/smtpctl/Makefile      | 3 ++-
 usr.sbin/smtpd/smtpd/Makefile        | 4 +++-
 usr.sbin/smtpd/table-ldap/Makefile   | 3 ++-
 usr.sbin/smtpd/table-passwd/Makefile | 3 ++-
 usr.sbin/smtpd/table-sqlite/Makefile | 3 ++-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/smtpd/makemap/Makefile b/usr.sbin/smtpd/makemap/Makefile
index bd89f4dc951..ca051f8ea57 100644
--- a/usr.sbin/smtpd/makemap/Makefile
+++ b/usr.sbin/smtpd/makemap/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2014/04/01 23:14:25 fgsch Exp $
+#	$OpenBSD: Makefile,v 1.25 2015/10/06 00:30:30 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -10,6 +10,7 @@ BINMODE?=555
 BINDIR=	/usr/libexec/smtpd
 MAN=	aliases.5 forward.5 makemap.8 newaliases.8
 
+CFLAGS+=   -fstack-protector-all
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
diff --git a/usr.sbin/smtpd/smtpctl/Makefile b/usr.sbin/smtpd/smtpctl/Makefile
index 8f675be9963..d83abc1cae8 100644
--- a/usr.sbin/smtpd/smtpctl/Makefile
+++ b/usr.sbin/smtpd/smtpctl/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 2014/09/29 20:56:47 jmc Exp $
+#	$OpenBSD: Makefile,v 1.38 2015/10/06 00:30:32 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -11,6 +11,7 @@ BINDIR=	/usr/sbin
 MAN=	smtpctl.8
 MLINKS=	smtpctl.8 mailq.8
 
+CFLAGS+=   -fstack-protector-all
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile
index 5defaf6039b..b74b7f2c0cd 100644
--- a/usr.sbin/smtpd/smtpd/Makefile
+++ b/usr.sbin/smtpd/smtpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.78 2015/01/22 09:26:05 reyk Exp $
+#	$OpenBSD: Makefile,v 1.79 2015/10/06 00:30:32 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -42,6 +42,8 @@ BINDIR=		/usr/sbin
 
 LDADD+=		-levent -lutil -lssl -lcrypto -lm -lz
 DPADD+=		${LIBEVENT} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBM} ${LIBZ}
+
+CFLAGS+=   -fstack-protector-all
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
diff --git a/usr.sbin/smtpd/table-ldap/Makefile b/usr.sbin/smtpd/table-ldap/Makefile
index 1bfabbe5514..2b9d700dff6 100644
--- a/usr.sbin/smtpd/table-ldap/Makefile
+++ b/usr.sbin/smtpd/table-ldap/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2014/07/08 13:49:09 eric Exp $
+#	$OpenBSD: Makefile,v 1.5 2015/10/06 00:30:32 deraadt Exp $
 
 .PATH: ${.CURDIR}/..
 
@@ -18,6 +18,7 @@ BINDIR=	/usr/libexec/smtpd
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
+CFLAGS+=   -fstack-protector-all
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
diff --git a/usr.sbin/smtpd/table-passwd/Makefile b/usr.sbin/smtpd/table-passwd/Makefile
index 3b65b5aba39..b542368b71d 100644
--- a/usr.sbin/smtpd/table-passwd/Makefile
+++ b/usr.sbin/smtpd/table-passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2014/04/01 23:14:25 fgsch Exp $
+#	$OpenBSD: Makefile,v 1.5 2015/10/06 00:30:32 deraadt Exp $
 
 .PATH: ${.CURDIR}/..
 
@@ -16,6 +16,7 @@ BINDIR=	/usr/libexec/smtpd
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
+CFLAGS+=   -fstack-protector-all
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
diff --git a/usr.sbin/smtpd/table-sqlite/Makefile b/usr.sbin/smtpd/table-sqlite/Makefile
index 41062e4b9fc..eb69c00f1b3 100644
--- a/usr.sbin/smtpd/table-sqlite/Makefile
+++ b/usr.sbin/smtpd/table-sqlite/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2014/04/01 23:14:25 fgsch Exp $
+#	$OpenBSD: Makefile,v 1.4 2015/10/06 00:30:32 deraadt Exp $
 
 .PATH: ${.CURDIR}/..
 
@@ -16,6 +16,7 @@ BINDIR=	/usr/libexec/smtpd
 DPADD=	${LIBUTIL} ${LIBSQLITE3}
 LDADD=	-lutil -lsqlite3
 
+CFLAGS+=   -fstack-protector-all
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=	-Wmissing-declarations
-- 
2.20.1