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@

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 61f1ddb..ca7f1a4 100644 (file)
--- 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=