From b460ce1ab51a88c8a15737b9aaf78a949fe6f32e Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 30 Jul 2004 21:05:41 +0000 Subject: Convert to use bsd.options.mk. The relevant options variable to set for each package can be determined by invoking: make show-var VARNAME=PKG_OPTIONS_VAR The old options are still supported unless the variable named in PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf). --- net/samba/Makefile | 55 ++------------------------ net/samba/Makefile.options | 96 ++++++++++++++++++++++++++++++++++++++++++++++ net/samba/PLIST | 10 ++++- net/samba/PLIST.pam | 9 ----- 4 files changed, 108 insertions(+), 62 deletions(-) create mode 100644 net/samba/Makefile.options delete mode 100644 net/samba/PLIST.pam (limited to 'net') diff --git a/net/samba/Makefile b/net/samba/Makefile index 360f0a625a6..642c302e4a5 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.123 2004/07/23 15:11:30 tron Exp $ +# $NetBSD: Makefile,v 1.124 2004/07/30 21:05:41 jlam Exp $ DISTNAME= samba-3.0.5 CATEGORIES= net @@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/source USE_BUILDLINK3= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL="${PERL5}" -PLIST_SRC= # empty .include "../../mk/bsd.prefs.mk" @@ -65,48 +64,7 @@ USE_GNU_READLINE= yes .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -.if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) -. include "../../mk/krb5.buildlink3.mk" -SAMBA_USE_LDAP= # defined -CONFIGURE_ARGS+= --with-ads -CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} -.else -CONFIGURE_ARGS+= --without-ads -CONFIGURE_ARGS+= --without-krb5 -.endif -BUILD_DEFS+= SAMBA_WITH_ADS - -.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) -. include "../../print/cups/buildlink3.mk" -CONFIGURE_ARGS+= --enable-cups -.else -CONFIGURE_ARGS+= --disable-cups -.endif -BUILD_DEFS+= USE_CUPS - -.if defined(USE_PAM) -. include "../../security/PAM/module.mk" -CONFIGURE_ARGS+= --with-pam -CONFIGURE_ARGS+= --with-pam_smbpass -PLIST_SRC+= ${PKGDIR}/PLIST.pam -.endif -BUILD_DEFS+= USE_PAM - -.if defined(SAMBA_USE_LDAP) || (defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])) -. include "../../databases/openldap/buildlink3.mk" -CONFIGURE_ARGS+= --with-ldap -. if defined(SAMBA_USE_LDAP_COMPAT) && \ - !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS]) -CONFIGURE_ARGS+= --with-ldapsam -. endif -.else -CONFIGURE_ARGS+= --without-ldap -.endif -BUILD_DEFS+= USE_OPENLDAP -BUILD_DEFS+= SAMBA_USE_LDAP -BUILD_DEFS+= SAMBA_USE_LDAP_COMPAT - -PLIST_SRC+= ${PKGDIR}/PLIST +.include "Makefile.options" .if !defined(MKTEMP) MKTEMP!= ${TYPE} mktemp 2>&1 | \ @@ -124,13 +82,6 @@ FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} DOCDIR= ${PREFIX}/share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} -.if ${OPSYS} == "Linux" -CONFIGURE_ARGS+= --with-smbmount -PLIST_SUBST+= SMBMOUNT= -.else -PLIST_SUBST+= SMBMOUNT="@comment " -.endif - USE_PKGINSTALL= yes CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf SUPPORT_FILES_PERMS= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ @@ -169,7 +120,7 @@ post-install: cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR} cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR} cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${EGDIR} -.if defined(USE_PAM) +.if !empty(PKG_OPTIONS:MPAM) ${INSTALL_DATA_DIR} ${PAM_INSTMODULEDIR} ${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PAM_INSTMODULEDIR} ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so ${PAM_INSTMODULEDIR} diff --git a/net/samba/Makefile.options b/net/samba/Makefile.options new file mode 100644 index 00000000000..daeab7a9a39 --- /dev/null +++ b/net/samba/Makefile.options @@ -0,0 +1,96 @@ +# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:41 jlam Exp $ + +# Global and legacy options +.if defined(USE_CUPS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \ + defined(SAMBA_WITH_ADS) || defined(SAMBA_USE_LDAP) || \ + defined(SAMBA_USE_LDAP_COMPAT) +. if !defined(PKG_OPTIONS.samba) +. if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) +PKG_OPTIONS.samba+= cups +. endif +. if defined(USE_PAM) +PKG_OPTIONS.samba+= PAM +. endif +. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +PKG_OPTIONS.samba+= ldap +. endif +. if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) +PKG_OPTIONS.samba+= ads +. endif +. if defined(SAMBA_USE_LDAP) +PKG_OPTIONS.samba+= ldap +. endif +. if defined(SAMBA_USE_LDAP_COMPAT) && \ + !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS]) +PKG_OPTIONS.samba+= ldap-compat +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.samba +PKG_SUPPORTED_OPTIONS= PAM ads cups ldap ldap-compat +.include "../../mk/bsd.options.mk" + +### +### Support PAM authentication and build smbpass and winbind PAM modules. +### +.if !empty(PKG_OPTIONS:MPAM) +. include "../../security/PAM/module.mk" +CONFIGURE_ARGS+= --with-pam +CONFIGURE_ARGS+= --with-pam_smbpass +PLIST_SUBST+= PAM= +.else +PLIST_SUBST+= PAM="@comment " +.endif + +### +### Allow Samba to join as a member server of an Active Directory domain. +### +.if !empty(PKG_OPTIONS:Mads) +. include "../../mk/krb5.buildlink3.mk" +PKG_OPTIONS+= ldap +CONFIGURE_ARGS+= --with-ads +CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} +.else +CONFIGURE_ARGS+= --without-ads +CONFIGURE_ARGS+= --without-krb5 +.endif + +### +### Native CUPS support for printing +### +.if !empty(PKG_OPTIONS:Mcups) +. include "../../print/cups/buildlink3.mk" +CONFIGURE_ARGS+= --enable-cups +.else +CONFIGURE_ARGS+= --disable-cups +.endif + +### +### Support Samba-2.x LDAP password and account databases. +### +.if !empty(PKG_OPTIONS:Mldap-compat) +PKG_OPTIONS+= ldap +CONFIGURE_ARGS+= --with-ldapsam +.endif + +### +### Support LDAP authentication and storage of Samba account information. +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldap +.else +CONFIGURE_ARGS+= --without-ldap +.endif + +### +### Only Linux supports smbmount for mounting a Samba share into the +### filesystem. +### +.if ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --with-smbmount +PLIST_SUBST+= SMBMOUNT= +.else +PLIST_SUBST+= SMBMOUNT="@comment " +.endif diff --git a/net/samba/PLIST b/net/samba/PLIST index fad735a1f56..fc7f0e489c4 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2004/05/13 06:44:56 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.22 2004/07/30 21:05:41 jlam Exp $ bin/findsmb bin/net bin/nmblookup @@ -52,6 +52,8 @@ lib/samba/vfs/netatalk.so lib/samba/vfs/readonly.so lib/samba/vfs/recycle.so lib/samba/vfs/shadow_copy.so +${PAM}lib/security/pam_smbpass.so +${PAM}lib/security/pam_winbind.so man/man1/editreg.1 man/man1/findsmb.1 man/man1/log2pcap.1 @@ -97,6 +99,7 @@ sbin/swat sbin/winbindd share/doc/samba/NT4-Locking.reg share/doc/samba/NT4_PlainPassword.reg +${PAM}share/doc/samba/README.pam_smbpass share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg share/doc/samba/Win-NT-DeleteRoamingProfile.reg @@ -113,6 +116,10 @@ share/examples/samba/deluser.sh share/examples/samba/mknissmbpasswd.sh share/examples/samba/mknissmbpwdtbl.sh share/examples/samba/mksmbpasswd.sh +${PAM}share/examples/samba/pam_smbpass/kdc-pdc +${PAM}share/examples/samba/pam_smbpass/password-mature +${PAM}share/examples/samba/pam_smbpass/password-migration +${PAM}share/examples/samba/pam_smbpass/password-sync share/examples/samba/samba.schema share/examples/samba/smb.conf.default share/examples/samba/updatesmbpasswd.sh @@ -556,6 +563,7 @@ share/samba/swat/using_samba/toc.html @dirrm share/samba/swat/help @dirrm share/samba/swat @dirrm share/samba +${PAM}@dirrm share/examples/samba/pam_smbpass @dirrm share/examples/samba @dirrm share/doc/samba @dirrm lib/samba/vfs diff --git a/net/samba/PLIST.pam b/net/samba/PLIST.pam deleted file mode 100644 index 18eb3002c82..00000000000 --- a/net/samba/PLIST.pam +++ /dev/null @@ -1,9 +0,0 @@ -@comment $NetBSD: PLIST.pam,v 1.1 2004/01/12 03:33:04 jlam Exp $ -lib/security/pam_smbpass.so -lib/security/pam_winbind.so -share/doc/samba/README.pam_smbpass -share/examples/samba/pam_smbpass/kdc-pdc -share/examples/samba/pam_smbpass/password-mature -share/examples/samba/pam_smbpass/password-migration -share/examples/samba/pam_smbpass/password-sync -@dirrm share/examples/samba/pam_smbpass -- cgit v1.2.3