diff options
author | dillo <dillo@pkgsrc.org> | 2005-05-31 11:24:32 +0000 |
---|---|---|
committer | dillo <dillo@pkgsrc.org> | 2005-05-31 11:24:32 +0000 |
commit | d6bfbe85829aea0114438e88656e5bbf748e39a7 (patch) | |
tree | 9fa6ca91820e60dd51d24475d2159189a4b2df85 /security | |
parent | 6e68b06993127a08a66fd54d03bc6a7d7f55f491 (diff) | |
download | pkgsrc-d6bfbe85829aea0114438e88656e5bbf748e39a7.tar.gz |
Rename option PAM to pam (so all options are lower case). Backwards
compatibility provided via PKG_OPTIONS_LEGACY_OPTS.
Diffstat (limited to 'security')
-rw-r--r-- | security/courier-authlib/options.mk | 6 | ||||
-rw-r--r-- | security/cyrus-saslauthd/options.mk | 6 | ||||
-rw-r--r-- | security/openssh+gssapi/Makefile | 8 | ||||
-rw-r--r-- | security/openssh/options.mk | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk index 52be7c1d4d8..27ab8a77984 100644 --- a/security/courier-authlib/options.mk +++ b/security/courier-authlib/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:39 dillo Exp $ +# $NetBSD: options.mk,v 1.5 2005/05/31 11:24:32 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.courier-authlib -PKG_SUPPORTED_OPTIONS= PAM bdb ldap mysql pgsql +PKG_SUPPORTED_OPTIONS= pam bdb ldap mysql pgsql PKG_SUGGESTED_OPTIONS= bdb .include "../../mk/bsd.options.mk" @@ -15,7 +15,7 @@ AUTHLIB_PLIST+= ${AUTHLIBDIR}/libauthshadow.la ### ### PAM authentication ### -.if !empty(PKG_OPTIONS:MPAM) +.if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-authpam AUTHLIB_PLIST+= ${AUTHLIBDIR}/libauthpam.la diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk index 184603aafe5..09802b75bfd 100644 --- a/security/cyrus-saslauthd/options.mk +++ b/security/cyrus-saslauthd/options.mk @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.5 2005/01/14 05:15:40 jlam Exp $ +# $NetBSD: options.mk,v 1.6 2005/05/31 11:24:33 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd -PKG_SUPPORTED_OPTIONS= PAM kerberos ldap gssapi +PKG_SUPPORTED_OPTIONS= pam kerberos ldap gssapi .include "../../mk/bsd.options.mk" ### ### PAM (Pluggable Authentication Mechanism) ### -.if !empty(PKG_OPTIONS:MPAM) +.if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam=${PAMBASE} .endif diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index 70d0c5ca6c6..5fdb5e049e4 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/28 14:11:13 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/05/31 11:24:33 dillo Exp $ # NOTE: This package is modeled on ../openssh, but does not share # files with it as that package may update faster than the gssapi @@ -74,10 +74,10 @@ CPPFLAGS+= -I/usr/include/krb5 -I/usr/include/kerberosIV # XXX: why yet. For the moment, disable PAM authentication. # #PKG_OPTIONS_VAR= PKG_OPTIONS.openssh+gssapi -#PKG_SUPPORTED_OPTIONS= PAM +#PKG_SUPPORTED_OPTIONS= pam #.include "../../mk/bsd.options.mk" # -#.if !empty(PKG_OPTIONS:MPAM) +#.if !empty(PKG_OPTIONS:Mpam) #. include "../../mk/pam.buildlink3.mk" #CONFIGURE_ARGS+= --with-pam #PLIST_SRC+= ${.CURDIR}/PLIST.pam @@ -154,7 +154,7 @@ post-install: cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do \ ${INSTALL_DATA} $${file}.out ${EGDIR}/$${file}; \ done -#.if defined(USE_PAM) +#.if !empty(PKT_OPTIONS:Mpam) # ${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.freebsd ${EGDIR}/sshd.pam #.endif diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 3d39929061d..14625acacca 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/01/14 05:15:40 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2005/05/31 11:24:33 dillo Exp $ .include "../../mk/bsd.prefs.mk" @@ -6,7 +6,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.openssh PKG_SUPPORTED_OPTIONS= kerberos hpn-patch .if !empty(OPSYS:MLinux) -PKG_SUPPORTED_OPTIONS+= PAM +PKG_SUPPORTED_OPTIONS+= pam .endif .include "../../mk/bsd.options.mk" @@ -22,7 +22,7 @@ PATCH_SITES= http://www.psc.edu/networking/projects/hpn-ssh/ PATCH_DIST_STRIP= -p1 .endif -.if !empty(PKG_OPTIONS:MPAM) +.if !empty(PKG_OPTIONS:Mpam) # XXX: PAM authentication causes memory faults, and haven't tracked down # XXX: why yet. For the moment, disable PAM authentication for non-Linux. .include "../../mk/pam.buildlink3.mk" |