pam-*: g/c NO_STATIC_MODULES hacks. Handled in openpam/builtin.mk.

9 files changed, 9 insertions, 40 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index dc836136019..107fee73b13 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2020/08/17 20:17:41 leot Exp $
+# $NetBSD: Makefile,v 1.97 2020/10/23 09:20:59 tnn Exp $
 
 DISTNAME=	gnome-keyring-2.32.1
 PKGREVISION=	30
@@ -19,12 +19,6 @@ PKGCONFIG_OVERRIDE+=	gcr/gcr.pc.in
 PKGCONFIG_OVERRIDE+=	gp11/gp11.pc.in
 
 CFLAGS.HPUX+=		-DMAP_ANON=MAP_ANONYMOUS
-
-# Workaround a bug with NetBSD's openpam
-# The bug is described in PR security/39313
-#
-CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
-
 CONFIGURE_ENV.SunOS+=	ac_cv_header_security_pam_modules_h=yes
 
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/security/pam-dbm/Makefile b/security/pam-dbm/Makefile
index 427c7b98bcd..7a2cb0d1159 100644
--- a/security/pam-dbm/Makefile
+++ b/security/pam-dbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/09/03 08:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2020/10/23 09:20:59 tnn Exp $
 #
 
 DISTNAME=		pam_dbm-0.2
@@ -18,10 +18,6 @@ BDB_ACCEPTED=		db1
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 
-# Fix (workaround?) a bug with openpam/NetBSD
-# The bug is described in PR security/39313.
-CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/authtest ${DESTDIR}${PREFIX}/sbin/pam_dbm-authtest
 
diff --git a/security/pam-fprint/Makefile b/security/pam-fprint/Makefile
index 9871e9ccb79..c3dfbd3921e 100644
--- a/security/pam-fprint/Makefile
+++ b/security/pam-fprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/02/26 09:41:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2020/10/23 09:20:59 tnn Exp $
 
 DISTNAME=	pam_fprint-0.2
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -15,10 +15,6 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
 
-# Fix (workaround?) a bug with openpam/NetBSD
-# The bug is described in PR security/39313.
-CFLAGS.NetBSD+=	-DNO_STATIC_MODULES
-
 .include "../../security/libfprint/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-krb5/Makefile b/security/pam-krb5/Makefile
index 767ce6eb245..47128f7d4eb 100644
--- a/security/pam-krb5/Makefile
+++ b/security/pam-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/11/04 21:12:57 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/10/23 09:20:59 tnn Exp $
 #
 
 DISTNAME=	pam-krb5-4.6
@@ -14,8 +14,6 @@ USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
 
-CPPFLAGS.NetBSD+=	-DNO_STATIC_MODULES
-
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index d387db5c62d..dca4c924c5a 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2020/04/29 19:33:25 maya Exp $
+# $NetBSD: Makefile,v 1.50 2020/10/23 09:20:59 tnn Exp $
 
 DISTNAME=	pam_ldap-186
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -23,10 +23,6 @@ CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
 CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret
 
-# Fix (workaround?) a bug with openpam/NetBSD
-# The bug is described in PR security/39313.
-CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
-
 # shared with databases/nss_ldap
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=		${EGDIR}/ldap.conf ${PKG_SYSCONFDIR}/ldap.conf
diff --git a/security/pam-mkhomedir/Makefile b/security/pam-mkhomedir/Makefile
index 1bef6905211..82e53953e30 100644
--- a/security/pam-mkhomedir/Makefile
+++ b/security/pam-mkhomedir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/05/04 14:52:26 he Exp $
+# $NetBSD: Makefile,v 1.10 2020/10/23 09:20:59 tnn Exp $
 
 DISTNAME=	pam-mkhomedir-1
 PKGREVISION=	1
@@ -30,9 +30,5 @@ do-install:
 	${SHLIBTOOL} --mode=install ${INSTALL_PROGRAM} -c		\
 		${WRKSRC}/pam_mkhomedir.la ${DESTDIR}${PREFIX}/lib/security
 
-# Fix (workaround?) a bug with openpam/NetBSD
-# The bug is described in PR security/39313.
-CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
-
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-passwdqc/Makefile b/security/pam-passwdqc/Makefile
index 212ca007e53..80e2922b5e1 100644
--- a/security/pam-passwdqc/Makefile
+++ b/security/pam-passwdqc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/01/26 17:32:06 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/10/23 09:20:59 tnn Exp $
 #
 
 DISTNAME=	passwdqc-1.1.4
@@ -13,7 +13,6 @@ COMMENT=	Password strength checker
 
 BUILD_TARGET=		pam
 INSTALLATION_DIRS=	lib/security ${PKGMANDIR}/man8 ${PKGMANDIR}/man5
-CFLAGS+=		-DNO_STATIC_MODULES
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libpasswdqc.so ${DESTDIR}${PREFIX}/lib
diff --git a/security/pam-pwauth_suid/Makefile b/security/pam-pwauth_suid/Makefile
index 2d5ce618453..a61d7e88ac8 100644
--- a/security/pam-pwauth_suid/Makefile
+++ b/security/pam-pwauth_suid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/08/04 02:58:12 gutteridge Exp $
+# $NetBSD: Makefile,v 1.12 2020/10/23 09:20:59 tnn Exp $
 
 DISTNAME=	pam-pwauth_suid-1.2
 PKGREVISION=	1
@@ -11,7 +11,6 @@ COMMENT=	PAM authentication module for unprivileged users
 WRKSRC=		${WRKDIR}
 
 PAMDEF+=	-DPATH_HELPER=\"${PREFIX}/libexec/pwauth_suid_helper\"
-PAMDEF+=	-DNO_STATIC_MODULES
 
 INSTALLATION_DIRS=	lib/security libexec share/examples/pam-pwauth_suid
 
diff --git a/security/pam-yubico/Makefile b/security/pam-yubico/Makefile
index 973f61d6a85..f7c2bcb54cb 100644
--- a/security/pam-yubico/Makefile
+++ b/security/pam-yubico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/05/22 10:56:38 adam Exp $
+# $NetBSD: Makefile,v 1.30 2020/10/23 09:21:00 tnn Exp $
 
 DISTNAME=	pam_yubico-2.17
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -16,11 +16,6 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 
-# Workaround a bug with NetBSD's openpam
-# The bug is described in PR security/39313
-#
-CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
-
 .include "../../security/libyubikey/buildlink3.mk"
 .include "../../security/ykclient/buildlink3.mk"
 .include "../../security/ykpers/buildlink3.mk"