pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Create a pam.buildlink3.mk file that is used by PAM-us...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ae1e4ab0d8b4
branches: trunk
changeset: 487417:ae1e4ab0d8b4
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jan 14 05:15:39 2005 +0000
description:
Create a pam.buildlink3.mk file that is used by PAM-using packages.
It includes the correct buildlink3.mk file from either Linux-PAM
(security/PAM) or OpenPAM (security/openpam) and eventually will
support solaris-pam. pam.buildlink3.mk will:
* set PAMBASE to the base directory of the PAM files;
* set PAM_TYPE to the PAM implementation used.
There are two variables that can be used to tweak the selection of
the PAM implementation:
PAM_DEFAULT is a user-settable variable whose value is the default
PAM implementation to use.
PAM_ACCEPTED is a package-settable list of PAM implementations
that may be used by the package.
Modify most packages that include PAM/buildlink3.mk to include
pam.buildlink3.mk instead.
diffstat:
chat/jabberd2/options.mk | 4 +-
databases/postgresql73-server/Makefile | 4 +-
databases/postgresql74-server/Makefile | 4 +-
mail/courier-auth/Makefile.authdaemond | 4 +-
mk/pam.buildlink3.mk | 76 ++++++++++++++++++++++++++++++++++
net/ja-samba/Makefile | 4 +-
net/proftpd/Makefile | 4 +-
net/samba2/Makefile | 4 +-
print/cups/Makefile | 4 +-
security/PAM/module.mk | 8 +-
security/cy-login/Makefile | 6 +-
security/cyrus-sasl/Makefile | 6 +-
security/cyrus-sasl/buildlink3.mk | 4 +-
security/cyrus-saslauthd/options.mk | 6 +-
security/openssh+gssapi/Makefile | 4 +-
security/openssh/options.mk | 4 +-
security/pam-dbm/Makefile | 4 +-
security/sudo/options.mk | 4 +-
sysutils/checkpassword-pam/Makefile | 4 +-
www/ap-auth-pam/Makefile | 4 +-
x11/gdm/Makefile | 4 +-
21 files changed, 121 insertions(+), 45 deletions(-)
diffs (truncated from 443 to 300 lines):
diff -r e199609f6851 -r ae1e4ab0d8b4 chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk Fri Jan 14 05:10:37 2005 +0000
+++ b/chat/jabberd2/options.mk Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/11/29 17:59:11 xtraeme Exp $
+# $NetBSD: options.mk,v 1.5 2005/01/14 05:15:39 jlam Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
@@ -31,5 +31,5 @@
.if !empty(PKG_OPTIONS:MPAM)
CONFIGURE_ARGS+= --enable-pam
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
.endif
diff -r e199609f6851 -r ae1e4ab0d8b4 databases/postgresql73-server/Makefile
--- a/databases/postgresql73-server/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/databases/postgresql73-server/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:43 reed Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/14 05:15:39 jlam Exp $
PKGNAME= postgresql73-server-${BASE_VERS}
PKGREVISION= 3
@@ -25,7 +25,7 @@
.include "../../mk/dlopen.buildlink3.mk"
.if defined(USE_PAM)
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+= --with-pam
.endif
diff -r e199609f6851 -r ae1e4ab0d8b4 databases/postgresql74-server/Makefile
--- a/databases/postgresql74-server/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/databases/postgresql74-server/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/28 02:47:43 reed Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/14 05:15:39 jlam Exp $
PKGNAME= postgresql74-server-${BASE_VERS}
PKGREVISION= 3
@@ -24,7 +24,7 @@
.include "../../mk/dlopen.buildlink3.mk"
.if defined(USE_PAM)
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+= --with-pam
.endif
diff -r e199609f6851 -r ae1e4ab0d8b4 mail/courier-auth/Makefile.authdaemond
--- a/mail/courier-auth/Makefile.authdaemond Fri Jan 14 05:10:37 2005 +0000
+++ b/mail/courier-auth/Makefile.authdaemond Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.authdaemond,v 1.13 2004/07/14 21:37:09 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.14 2005/01/14 05:15:39 jlam Exp $
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
@@ -46,5 +46,5 @@
.include "../../mk/bdb.buildlink3.mk"
.if defined(USE_PAM)
BUILD_DEFS+= USE_PAM
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
.endif
diff -r e199609f6851 -r ae1e4ab0d8b4 mk/pam.buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/pam.buildlink3.mk Fri Jan 14 05:15:39 2005 +0000
@@ -0,0 +1,76 @@
+# $NetBSD: pam.buildlink3.mk,v 1.1 2005/01/14 05:15:39 jlam Exp $
+#
+# This Makefile fragment is meant to be included by packages that
+# require a PAM implementation. pam.buildlink3.mk will:
+#
+# * set PAMBASE to the base directory of the PAM files;
+# * set PAM_TYPE to the PAM implementation used.
+#
+# There are two variables that can be used to tweak the selection of
+# the PAM implementation:
+#
+# PAM_DEFAULT is a user-settable variable whose value is the default
+# PAM implementation to use.
+#
+# PAM_ACCEPTED is a package-settable list of PAM implementations
+# that may be used by the package.
+#
+
+PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PAM_BUILDLINK3_MK:M+)
+#
+# This is an exhaustive list of all of the PAM implementations
+# that may be used with PAM.buildlink3.mk, in order of precedence.
+#
+_PAM_PKGS?= linux-pam openpam #solaris-pam
+
+BUILDLINK_BUILTIN_MK.linux-pam= ../../security/PAM/builtin.mk
+BUILDLINK_BUILTIN_MK.openpam= ../../security/openpam/builtin.mk
+BUILDLINK_BUILTIN_MK.solaris-pam= ../../mk/solaris-pam.builtin.mk
+
+# If we have a particular PAM implementation in the base system, then
+# default to using that PAM type. Otherwise, default to "linux-pam".
+#
+. for _pam_ in ${_PAM_PKGS}
+. if exists(${BUILDLINK_BUILTIN_MK.${_pam_}})
+CHECK_BUILTIN.${_pam_}:= yes
+. include "${BUILDLINK_BUILTIN_MK.${_pam_}}"
+. if defined(IS_BUILTIN.${_pam_}) && !empty(IS_BUILTIN.${_pam_})
+PAM_DEFAULT?= ${_pam_}
+. endif
+CHECK_BUILTIN.${_pam_}:= no
+. endif
+. endfor
+PAM_DEFAULT?= linux-pam
+PAM_ACCEPTED?= ${_PAM_PKGS}
+
+_PAM_DEFAULT= ${PAM_DEFAULT}
+_PAM_ACCEPTED= ${PAM_ACCEPTED}
+
+_PAM_TYPE?= ${_PAM_DEFAULT}
+
+. if !empty(_PAM_ACCEPTED:M${_PAM_TYPE})
+PAM_TYPE= ${_PAM_TYPE}
+. else
+PAM_TYPE= none
+. endif
+PAMBASE= ${BUILDLINK_PREFIX.${PAM_TYPE}}
+
+BUILD_DEFS+= PAM_TYPE
+BUILD_DEFS+= PAMBASE
+.endif # PAM_BUILDLINK3_MK
+
+.if ${PAM_TYPE} == "none"
+PKG_FAIL_REASON= \
+ "${_PAM_TYPE} is not an acceptable PAM type for ${PKGNAME}."
+.elif ${PAM_TYPE} == "linux-pam"
+. include "../../security/PAM/buildlink3.mk"
+.elif ${PAM_TYPE} == "openpam"
+. include "../../security/openpam/buildlink3.mk"
+.elif ${PAM_TYPE} == "solaris-pam"
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsolaris-pam}
+BUILDLINK_PACKAGES+= solaris-pam
+.endif
diff -r e199609f6851 -r ae1e4ab0d8b4 net/ja-samba/Makefile
--- a/net/ja-samba/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/net/ja-samba/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.32 2005/01/14 05:15:39 jlam Exp $
.include "Makefile.common"
@@ -37,7 +37,7 @@
.endif
.if defined(USE_PAM)
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
BUILD_DEFS+= USE_PAM
CONFIGURE_ARGS+= --with-pam
.endif
diff -r e199609f6851 -r ae1e4ab0d8b4 net/proftpd/Makefile
--- a/net/proftpd/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/net/proftpd/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:47 reed Exp $
+# $NetBSD: Makefile,v 1.19 2005/01/14 05:15:39 jlam Exp $
DISTNAME= proftpd-1.2.10
PKGREVISION= 1
@@ -40,7 +40,7 @@
.if !empty(PKG_OPTIONS:MPAM)
CONFIGURE_ARGS+= --enable-auth-pam
-.include "../../security/PAM/buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mwrap)
diff -r e199609f6851 -r ae1e4ab0d8b4 net/samba2/Makefile
--- a/net/samba2/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/net/samba2/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:48 reed Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/14 05:15:39 jlam Exp $
.include "Makefile.common"
PKGREVISION= # empty1
@@ -28,7 +28,7 @@
.endif
.if defined(USE_PAM)
-.include "../../security/PAM/buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
BUILD_DEFS+= USE_PAM
CONFIGURE_ARGS+= --with-pam
.endif
diff -r e199609f6851 -r ae1e4ab0d8b4 print/cups/Makefile
--- a/print/cups/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/print/cups/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2005/01/06 07:26:39 jlam Exp $
+# $NetBSD: Makefile,v 1.87 2005/01/14 05:15:39 jlam Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -62,7 +62,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:MPAM)
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+= --enable-pam
MESSAGE_SRC= ${PKGDIR}/MESSAGE
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam
diff -r e199609f6851 -r ae1e4ab0d8b4 security/PAM/module.mk
--- a/security/PAM/module.mk Fri Jan 14 05:10:37 2005 +0000
+++ b/security/PAM/module.mk Fri Jan 14 05:15:39 2005 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: module.mk,v 1.3 2005/01/14 00:08:46 jlam Exp $
+# $NetBSD: module.mk,v 1.4 2005/01/14 05:15:39 jlam Exp $
.if !defined(PAM_MODULE_MK)
PAM_MODULE_MK= # defined
.if empty(USE_BUILDLINK3:M[nN][oO])
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
.endif
-.if defined(DEFAULT_VIEW.linux-pam)
-DEFAULT_VIEW.${PKGBASE}= ${DEFAULT_VIEW.linux-pam}
+.if defined(DEFAULT_VIEW.${PAM_TYPE})
+DEFAULT_VIEW.${PKGBASE}= ${DEFAULT_VIEW.${PAM_TYPE}}
.endif
PAM_MODULEDIR= ${VIEWBASE}/lib/security
diff -r e199609f6851 -r ae1e4ab0d8b4 security/cy-login/Makefile
--- a/security/cy-login/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/security/cy-login/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/01/14 00:08:46 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/14 05:15:39 jlam Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy-login/}
PKGREVISION= 1
@@ -13,9 +13,9 @@
CONFIGURE_ARGS+= --enable-login # LOGIN
CONFIGURE_ARGS+= --enable-plain # PLAIN
.if defined(USE_PAM)
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
BUILD_DEFS+= USE_PAM
-CONFIGURE_ARGS+= --with-pam=${BUILDLINK_PREFIX.linux-pam}
+CONFIGURE_ARGS+= --with-pam=${PAMBASE}
.endif
BUILD_DIRS= ${WRKSRC}/plugins
diff -r e199609f6851 -r ae1e4ab0d8b4 security/cyrus-sasl/Makefile
--- a/security/cyrus-sasl/Makefile Fri Jan 14 05:10:37 2005 +0000
+++ b/security/cyrus-sasl/Makefile Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/12/28 02:47:48 reed Exp $
+# $NetBSD: Makefile,v 1.48 2005/01/14 05:15:39 jlam Exp $
.include "Makefile.common"
@@ -23,8 +23,8 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:MPAM)
-. include "../../security/PAM/buildlink3.mk"
-CONFIGURE_ARGS+= --with-pam=${BUILDLINK_PREFIX.pam}
+. include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+= --with-pam=${PAMBASE}
.endif
.if !empty(PKG_OPTIONS:Mkerberos)
diff -r e199609f6851 -r ae1e4ab0d8b4 security/cyrus-sasl/buildlink3.mk
--- a/security/cyrus-sasl/buildlink3.mk Fri Jan 14 05:10:37 2005 +0000
+++ b/security/cyrus-sasl/buildlink3.mk Fri Jan 14 05:15:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/11/25 22:55:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/01/14 05:15:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@
PKG_OPTIONS.cyrus-sasl?= ${PKG_DEFAULT_OPTIONS}
.if !empty(PKG_OPTIONS.cyrus-sasl:MPAM)
-. include "../../security/PAM/buildlink3.mk"
+. include "../../mk/pam.buildlink3.mk"
.endif
Home |
Main Index |
Thread Index |
Old Index