From a738a6b060f8fd59ee2a60e7662bbecf5675887d Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Thu, 11 Feb 2021 19:41:05 +0000
Subject: [PATCH] Link isakmpd dynamically.  Mount /usr on NFS via IPsec does
 not work anyway.  Dynamic binaries help building errata, reduce disk usage
 and make ROP harder.  Also remove an unused bsd.subdir.mk include. OK sthen@
 mvs@ deraadt@ tobhe@ patrick@

---
 sbin/isakmpd/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 61f1ddb38d5..ca7f1a4b9ea 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.88 2017/07/10 21:30:37 espie Exp $
+#	$OpenBSD: Makefile,v 1.89 2021/02/11 19:41:05 bluhm Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -87,4 +87,6 @@ generated: ${GENERATED}
 BUILDFIRST = ${GENERATED}
 
 .include <bsd.prog.mk>
-.include <bsd.subdir.mk>
+
+# Don't compile isakmpd as static binary by default
+LDSTATIC=
-- 
2.20.1