From 02fd838edccb51c4e82967f79f4619a333022c08 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Fri, 10 Nov 2017 20:07:13 +0200
Subject: [PATCH] world: Enforce non static linkage for a few PROG cases.

The keyserv case is still to be decided.
---
 sbin/ipfw3/Makefile       | 3 +++
 sbin/mount_smbfs/Makefile | 2 +-
 usr.bin/ldd/Makefile      | 3 +++
 usr.sbin/keyserv/Makefile | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sbin/ipfw3/Makefile b/sbin/ipfw3/Makefile
index 8ac691e758..d9aa998ed7 100644
--- a/sbin/ipfw3/Makefile
+++ b/sbin/ipfw3/Makefile
@@ -7,4 +7,7 @@ SRCS += ipfw3sync.c ipfw3sync.h
 SRCS += ipfw3nat.c ipfw3nat.h
 WARNS?=	2
 
+# DO NOT USE -static, dlopen() for ipfw3 modules
+.undef NOSHARED
+
 .include <bsd.prog.mk>
diff --git a/sbin/mount_smbfs/Makefile b/sbin/mount_smbfs/Makefile
index b3d97db2c8..07e3f32361 100644
--- a/sbin/mount_smbfs/Makefile
+++ b/sbin/mount_smbfs/Makefile
@@ -13,7 +13,7 @@ DPADD+= ${LIBSMB}
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv (see the -E option).
 #
-NOSHARED?=	NO
+.undef NOSHARED
 
 .PATH:	${CONTRIBDIR}/mount_smbfs
 
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index 9694a1129e..6ae041d51b 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -2,4 +2,7 @@
 
 PROG=	ldd
 
+# DO NOT USE -static, dlopen() for shared libs
+.undef NOSHARED
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 999d9a0afd..c1602b40cf 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -6,6 +6,9 @@ WARNS?=	2
 
 MAN=	keyserv.8
 
+# DO NOT USE -static, dlopen() for _des_crypt symbol
+# XXX .undef NOSHARED
+
 CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I.
 
 DPADD=	${LIBRPCSVC}
-- 
2.11.4.GIT