diff options
| author | adam <adam> | 2010-12-06 17:01:22 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-12-06 17:01:22 +0000 |
| commit | 374bddaa722e0d92a7ac2ba85f9059ad1174e1bb (patch) | |
| tree | 41bc026b244dd7f3a0dcf73a79412c4d0a63f5e0 /net | |
| parent | f2bb4cec82e4ab3560032f38661a570b08c954d4 (diff) | |
| download | pkgsrc-374bddaa722e0d92a7ac2ba85f9059ad1174e1bb.tar.gz | |
Samba provides file and print services for Microsoft Windows clients.
These services may be hosted off any TCP/IP-enabled platform. The
Samba project includes not only an impressive feature set in file and
print serving capabilities, but has been extended to include client
functionality, utilities to ease migration to Samba, tools to aid
interoperability with Microsoft Windows, and administration tools.
Diffstat (limited to 'net')
27 files changed, 1291 insertions, 0 deletions
diff --git a/net/samba35/Makefile b/net/samba35/Makefile new file mode 100644 index 00000000000..aafbe72e27f --- /dev/null +++ b/net/samba35/Makefile @@ -0,0 +1,157 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/12/06 17:01:22 adam Exp $ + +.include "../../net/samba/Makefile.mirrors" + +DISTNAME= samba-${VERSION} +CATEGORIES= net +MASTER_SITES= ${SAMBA_MIRRORS:=stable/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.samba.org/ +COMMENT= SMB/CIFS protocol server suite +LICENSE= gnu-gpl-v3 + +VERSION= 3.5.6 +CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* + +PKG_DESTDIR_SUPPORT= user-destdir + +FILESDIR= ${PKGDIR}/../../net/samba/files +DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR +MESSAGE_SRC= ${PKGDIR}/../../net/samba/MESSAGE +WRKSRC= ${WRKDIR}/${DISTNAME}/source3 +BUILD_DEFS+= VARBASE + +.include "../../mk/bsd.prefs.mk" + +PKG_SYSCONFSUBDIR= samba +SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} +SAMBA_LIBDIR?= ${PREFIX}/lib +SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/run/samba +SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log +SAMBA_MODULESDIR?= ${SAMBA_LIBDIR}/samba +SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run +SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private +SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba +SAMBA_VARDIR?= ${VARBASE} +WINBINDD_RCD_SCRIPT= # empty + +FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} +FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR} +FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} +FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR} +FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} +FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} + +# mktemp is useful for the replacement adduser script, but don't require +# a full dependency since it's not actually needed by samba. +USE_TOOLS+= gmake mktemp perl:run +REPLACE_PERL= script/findsmb.in + +USE_GNU_READLINE= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} +CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} +CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} +CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} +CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} +CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat + +.include "../../net/samba/options.mk" + +PLIST_VARS+= cifsmount macosx + +# Only Linux supports mount.cifs for mounting a CIFS share into the filesystem. +.if ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --with-cifsmount +PLIST.cifsmount= yes +.endif + +.if ${OPSYS} == "Darwin" +PLIST.macosx= yes +.endif + +.if ${_OPSYS_SHLIB_TYPE} == "dylib" +PLIST_SUBST+= LIBEXT=dylib +.else +PLIST_SUBST+= LIBEXT=so +.endif + +.if !defined(PWD_MKDB) +PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ + ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }' +MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} +.endif +FILES_SUBST+= MKTEMP=${MKTEMP:Q} +FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} + +INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} + +DOCDIR= share/doc/${PKGBASE} +EGDIR= share/examples/${PKGBASE} +CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf +MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} +OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR} +OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 +RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} + +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= Fixing paths. +SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh +SUBST_STAGE.paths= post-patch +SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' +SUBST_SED.paths+= -e 's,@CAT@,${CAT},g' +SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' +SUBST_SED.paths+= -e 's,@RM@,${RM},g' +SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' +SUBST_SED.paths+= -e 's,@SH@,${SH},g' + +post-extract: + ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} + +post-install: + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/js + ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/gpext + ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/idmap + ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/pdb + ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/rpc + set -e ; cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do \ + ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ + done + ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \ + ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh + ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \ + ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/LDAP/samba.schema \ + ${DESTDIR}${PREFIX}/${EGDIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/smb.conf.default \ + ${DESTDIR}${PREFIX}/${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpasswd.sh \ + ${DESTDIR}${PREFIX}/${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpwdtbl.sh \ + ${DESTDIR}${PREFIX}/${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ + ${DESTDIR}${PREFIX}/${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/script/updatesmbpasswd.sh \ + ${DESTDIR}${PREFIX}/${EGDIR} + ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h + +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/samba35/PLIST b/net/samba35/PLIST new file mode 100644 index 00000000000..7af3258ac0e --- /dev/null +++ b/net/samba35/PLIST @@ -0,0 +1,454 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/12/06 17:01:22 adam Exp $ +bin/eventlogadm +bin/findsmb +bin/ldbadd +bin/ldbdel +bin/ldbedit +bin/ldbmodify +bin/ldbrename +bin/ldbsearch +bin/net +bin/nmblookup +bin/ntlm_auth +bin/pdbedit +bin/profiles +bin/rpcclient +bin/sharesec +bin/smbcacls +bin/smbclient +bin/smbcontrol +bin/smbcquotas +bin/smbget +bin/smbpasswd +bin/smbspool +bin/smbstatus +bin/smbtar +bin/smbtree +bin/tdbbackup +bin/tdbdump +bin/tdbtool +bin/testparm +${PLIST.winbind}bin/wbinfo +include/libsmbclient.h +include/netapi.h +include/smb_share_modes.h +include/talloc.h +include/tdb.h +${PLIST.winbind}include/wbclient.h +include/wbc_async.h +lib/libnetapi.${LIBEXT} +lib/libnetapi.${LIBEXT}.0 +lib/libsmbclient.${LIBEXT} +lib/libsmbclient.${LIBEXT}.0 +lib/libsmbsharemodes.${LIBEXT} +lib/libsmbsharemodes.${LIBEXT}.0 +lib/libtalloc.${LIBEXT} +lib/libtalloc.${LIBEXT}.2 +lib/libtdb.${LIBEXT} +lib/libtdb.${LIBEXT}.1 +${PLIST.winbind}lib/libwbclient.${LIBEXT} +${PLIST.winbind}lib/libwbclient.${LIBEXT}.0 +lib/samba/auth/script.${LIBEXT} +lib/samba/charset/CP437.${LIBEXT} +lib/samba/charset/CP850.${LIBEXT} +${PLIST.macosx}lib/samba/charset/macosxfs.${LIBEXT} +lib/samba/de.msg +lib/samba/en.msg +lib/samba/fi.msg +lib/samba/fr.msg +lib/samba/it.msg +lib/samba/ja.msg +lib/samba/lowcase.dat +lib/samba/nl.msg +lib/samba/pl.msg +lib/samba/ru.msg +lib/samba/tr.msg +lib/samba/upcase.dat +lib/samba/valid.dat +lib/samba/vfs/acl_tdb.${LIBEXT} +lib/samba/vfs/acl_xattr.${LIBEXT} +lib/samba/vfs/audit.${LIBEXT} +lib/samba/vfs/cap.${LIBEXT} +lib/samba/vfs/catia.${LIBEXT} +lib/samba/vfs/default_quota.${LIBEXT} +lib/samba/vfs/expand_msdfs.${LIBEXT} +lib/samba/vfs/extd_audit.${LIBEXT} +lib/samba/vfs/fake_perms.${LIBEXT} +lib/samba/vfs/full_audit.${LIBEXT} +lib/samba/vfs/netatalk.${LIBEXT} +${PLIST.fam}lib/samba/vfs/notify_fam.${LIBEXT} +lib/samba/vfs/preopen.${LIBEXT} +lib/samba/vfs/readahead.${LIBEXT} +lib/samba/vfs/readonly.${LIBEXT} +lib/samba/vfs/recycle.${LIBEXT} +lib/samba/vfs/scannedonly.${LIBEXT} +lib/samba/vfs/shadow_copy.${LIBEXT} +lib/samba/vfs/shadow_copy2.${LIBEXT} +lib/samba/vfs/smb_traffic_analyzer.${LIBEXT} +lib/samba/vfs/streams_depot.${LIBEXT} +lib/samba/vfs/streams_xattr.${LIBEXT} +lib/samba/vfs/xattr_tdb.${LIBEXT} +${PLIST.pam}lib/security/pam_smbpass.${LIBEXT} +${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.${LIBEXT} +${PLIST.cups}libexec/cups/backend/smb +man/man1/findsmb.1 +man/man1/ldbadd.1 +man/man1/ldbdel.1 +man/man1/ldbedit.1 +man/man1/ldbmodify.1 +man/man1/ldbrename.1 +man/man1/ldbsearch.1 +man/man1/log2pcap.1 +man/man1/nmblookup.1 +man/man1/ntlm_auth.1 +man/man1/profiles.1 +man/man1/rpcclient.1 +man/man1/sharesec.1 +man/man1/smbcacls.1 +man/man1/smbclient.1 +man/man1/smbcontrol.1 +man/man1/smbcquotas.1 +man/man1/smbget.1 +man/man1/smbstatus.1 +man/man1/smbtar.1 +man/man1/smbtree.1 +man/man1/testparm.1 +man/man1/vfstest.1 +man/man1/wbinfo.1 +man/man5/lmhosts.5 +man/man5/pam_winbind.conf.5 +man/man5/smb.conf.5 +man/man5/smbgetrc.5 +man/man5/smbpasswd.5 +man/man7/libsmbclient.7 +man/man7/samba.7 +man/man7/winbind_krb5_locator.7 +man/man8/eventlogadm.8 +man/man8/idmap_ad.8 +man/man8/idmap_adex.8 +man/man8/idmap_hash.8 +man/man8/idmap_ldap.8 +man/man8/idmap_nss.8 +man/man8/idmap_rid.8 +man/man8/idmap_tdb.8 +man/man8/idmap_tdb2.8 +man/man8/mount.cifs.8 +man/man8/net.8 +man/man8/nmbd.8 +man/man8/pam_winbind.8 +man/man8/pdbedit.8 +man/man8/smbd.8 +man/man8/smbpasswd.8 +man/man8/smbspool.8 +man/man8/swat.8 +man/man8/tdbbackup.8 +man/man8/tdbdump.8 +man/man8/tdbtool.8 +man/man8/umount.cifs.8 +man/man8/vfs_acl_tdb.8 +man/man8/vfs_acl_xattr.8 +man/man8/vfs_audit.8 +man/man8/vfs_cacheprime.8 +man/man8/vfs_cap.8 +man/man8/vfs_catia.8 +man/man8/vfs_commit.8 +man/man8/vfs_default_quota.8 +man/man8/vfs_dirsort.8 +man/man8/vfs_extd_audit.8 +man/man8/vfs_fake_perms.8 +man/man8/vfs_fileid.8 +man/man8/vfs_full_audit.8 +man/man8/vfs_gpfs.8 +man/man8/vfs_netatalk.8 +man/man8/vfs_notify_fam.8 +man/man8/vfs_prealloc.8 +man/man8/vfs_preopen.8 +man/man8/vfs_readahead.8 +man/man8/vfs_readonly.8 +man/man8/vfs_recycle.8 +man/man8/vfs_scannedonly.8 +man/man8/vfs_shadow_copy.8 +man/man8/vfs_shadow_copy2.8 +man/man8/vfs_smb_traffic_analyzer.8 +man/man8/vfs_streams_depot.8 +man/man8/vfs_streams_xattr.8 +man/man8/vfs_xattr_tdb.8 +man/man8/winbindd.8 +${PLIST.cifsmount}sbin/mount.cifs +sbin/nmbd +sbin/smbd +sbin/swat +${PLIST.cifsmount}sbin/umount.cifs +${PLIST.winbind}sbin/winbindd +share/doc/samba/NT4-Locking.reg +share/doc/samba/NT4_PlainPassword.reg +${PLIST.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 +share/doc/samba/Win2000_PlainPassword.reg +share/doc/samba/Win7_Samba3DomainMember.reg +share/doc/samba/Win95_PlainPassword.reg +share/doc/samba/Win98_PlainPassword.reg +share/doc/samba/Win9X-CacheHandling.reg +share/doc/samba/WinME_PlainPassword.reg +share/doc/samba/WinXP_PlainPassword.reg +share/doc/samba/WindowsTerminalServer.reg +share/examples/rc.d/nmbd +share/examples/rc.d/samba +share/examples/rc.d/smbd +${PLIST.winbind}share/examples/rc.d/winbindd +share/examples/samba/adduser.sh +share/examples/samba/deluser.sh +share/examples/samba/mknissmbpasswd.sh +share/examples/samba/mknissmbpwdtbl.sh +share/examples/samba/mksmbpasswd.sh +${PLIST.pam}share/examples/samba/pam_smbpass/kdc-pdc +${PLIST.pam}share/examples/samba/pam_smbpass/password-mature +${PLIST.pam}share/examples/samba/pam_smbpass/password-migration +${PLIST.pam}share/examples/samba/pam_smbpass/password-sync +share/examples/samba/samba.schema +share/examples/samba/smb.conf.default +share/examples/samba/updatesmbpasswd.sh +share/locale/ar/LC_MESSAGES/pam_winbind.mo +share/locale/cs/LC_MESSAGES/pam_winbind.mo +share/locale/da/LC_MESSAGES/pam_winbind.mo +share/locale/de/LC_MESSAGES/net.mo +share/locale/de/LC_MESSAGES/pam_winbind.mo +share/locale/es/LC_MESSAGES/pam_winbind.mo +share/locale/fi/LC_MESSAGES/pam_winbind.mo +share/locale/fr/LC_MESSAGES/pam_winbind.mo +share/locale/hu/LC_MESSAGES/pam_winbind.mo +share/locale/it/LC_MESSAGES/pam_winbind.mo +share/locale/ja/LC_MESSAGES/pam_winbind.mo +share/locale/ko/LC_MESSAGES/pam_winbind.mo +share/locale/nb/LC_MESSAGES/pam_winbind.mo +share/locale/nl/LC_MESSAGES/pam_winbind.mo +share/locale/pl/LC_MESSAGES/pam_winbind.mo +share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo +share/locale/ru/LC_MESSAGES/pam_winbind.mo +share/locale/sv/LC_MESSAGES/pam_winbind.mo +share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo +share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo +share/samba/swat/help/Samba3-ByExample/Big500users.html +share/samba/swat/help/Samba3-ByExample/DMSMig.html +share/samba/swat/help/Samba3-ByExample/DomApps.html +share/samba/swat/help/Samba3-ByExample/ExNetworks.html +share/samba/swat/help/Samba3-ByExample/HA.html +share/samba/swat/help/Samba3-ByExample/RefSection.html +share/samba/swat/help/Samba3-ByExample/apa.html +share/samba/swat/help/Samba3-ByExample/appendix.html +share/samba/swat/help/Samba3-ByExample/ch14.html +share/samba/swat/help/Samba3-ByExample/go01.html +share/samba/swat/help/Samba3-ByExample/happy.html +share/samba/swat/help/Samba3-ByExample/index.html +share/samba/swat/help/Samba3-ByExample/ix01.html +share/samba/swat/help/Samba3-ByExample/kerberos.html +share/samba/swat/help/Samba3-ByExample/net2000users.html +share/samba/swat/help/Samba3-ByExample/ntmigration.html +share/samba/swat/help/Samba3-ByExample/nw4migration.html +share/samba/swat/help/Samba3-ByExample/pr01.html +share/samba/swat/help/Samba3-ByExample/pr02.html +share/samba/swat/help/Samba3-ByExample/pr03.html +share/samba/swat/help/Samba3-ByExample/preface.html +share/samba/swat/help/Samba3-ByExample/primer.html +share/samba/swat/help/Samba3-ByExample/secure.html +share/samba/swat/help/Samba3-ByExample/simple.html +share/samba/swat/help/Samba3-ByExample/small.html +share/samba/swat/help/Samba3-ByExample/unixclients.html +share/samba/swat/help/Samba3-ByExample/upgrades.html +share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html +share/samba/swat/help/Samba3-Developers-Guide/Packaging.html +share/samba/swat/help/Samba3-Developers-Guide/architecture.html +share/samba/swat/help/Samba3-Developers-Guide/contributing.html +share/samba/swat/help/Samba3-Developers-Guide/debug.html +share/samba/swat/help/Samba3-Developers-Guide/devprinting.html +share/samba/swat/help/Samba3-Developers-Guide/index.html +share/samba/swat/help/Samba3-Developers-Guide/internals.html +share/samba/swat/help/Samba3-Developers-Guide/modules.html +share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html +share/samba/swat/help/Samba3-Developers-Guide/parsing.html +share/samba/swat/help/Samba3-Developers-Guide/pr01.html +share/samba/swat/help/Samba3-Developers-Guide/pt01.html +share/samba/swat/help/Samba3-Developers-Guide/pt02.html +share/samba/swat/help/Samba3-Developers-Guide/pt03.html +share/samba/swat/help/Samba3-Developers-Guide/pt04.html +share/samba/swat/help/Samba3-Developers-Guide/pt05.html +share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html +share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html +share/samba/swat/help/Samba3-Developers-Guide/tracing.html +share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html +share/samba/swat/help/Samba3-Developers-Guide/vfs.html +share/samba/swat/help/Samba3-Developers-Guide/wins.html +share/samba/swat/help/Samba3-HOWTO/AccessControls.html +share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html +share/samba/swat/help/Samba3-HOWTO/Appendix.html +share/samba/swat/help/Samba3-HOWTO/Backup.html +share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html +share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html +share/samba/swat/help/Samba3-HOWTO/ClientConfig.html +share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html +share/samba/swat/help/Samba3-HOWTO/FastStart.html +share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html +share/samba/swat/help/Samba3-HOWTO/IntroSMB.html +share/samba/swat/help/Samba3-HOWTO/NT4Migration.html +share/samba/swat/help/Samba3-HOWTO/NetCommand.html +share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html +share/samba/swat/help/Samba3-HOWTO/Other-Clients.html +share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html +share/samba/swat/help/Samba3-HOWTO/Portability.html +share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html +share/samba/swat/help/Samba3-HOWTO/SWAT.html +share/samba/swat/help/Samba3-HOWTO/SambaHA.html +share/samba/swat/help/Samba3-HOWTO/ServerType.html +share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html +share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html +share/samba/swat/help/Samba3-HOWTO/VFS.html +share/samba/swat/help/Samba3-HOWTO/apa.html +share/samba/swat/help/Samba3-HOWTO/bugreport.html +share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html +share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html +share/samba/swat/help/Samba3-HOWTO/ch47.html +share/samba/swat/help/Samba3-HOWTO/classicalprinting.html +share/samba/swat/help/Samba3-HOWTO/compiling.html +share/samba/swat/help/Samba3-HOWTO/diagnosis.html +share/samba/swat/help/Samba3-HOWTO/domain-member.html +share/samba/swat/help/Samba3-HOWTO/go01.html +share/samba/swat/help/Samba3-HOWTO/groupmapping.html +share/samba/swat/help/Samba3-HOWTO/idmapper.html +share/samba/swat/help/Samba3-HOWTO/index.html +share/samba/swat/help/Samba3-HOWTO/install.html +share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html +share/samba/swat/help/Samba3-HOWTO/introduction.html +share/samba/swat/help/Samba3-HOWTO/ix01.html +share/samba/swat/help/Samba3-HOWTO/largefile.html +share/samba/swat/help/Samba3-HOWTO/locking.html +share/samba/swat/help/Samba3-HOWTO/migration.html +share/samba/swat/help/Samba3-HOWTO/msdfs.html +share/samba/swat/help/Samba3-HOWTO/optional.html +share/samba/swat/help/Samba3-HOWTO/pam.html +share/samba/swat/help/Samba3-HOWTO/passdb.html +share/samba/swat/help/Samba3-HOWTO/pr01.html +share/samba/swat/help/Samba3-HOWTO/pr02.html +share/samba/swat/help/Samba3-HOWTO/pr03.html +share/samba/swat/help/Samba3-HOWTO/problems.html +share/samba/swat/help/Samba3-HOWTO/rights.html +share/samba/swat/help/Samba3-HOWTO/samba-bdc.html +share/samba/swat/help/Samba3-HOWTO/samba-pdc.html +share/samba/swat/help/Samba3-HOWTO/securing-samba.html +share/samba/swat/help/Samba3-HOWTO/speed.html +share/samba/swat/help/Samba3-HOWTO/tdb.html +share/samba/swat/help/Samba3-HOWTO/troubleshooting.html +share/samba/swat/help/Samba3-HOWTO/type.html +share/samba/swat/help/Samba3-HOWTO/unicode.html +share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html +share/samba/swat/help/Samba3-HOWTO/winbind.html +share/samba/swat/help/manpages/cifs.upcall.8.html +share/samba/swat/help/manpages/eventlogadm.8.html +share/samba/swat/help/manpages/findsmb.1.html +share/samba/swat/help/manpages/idmap_ad.8.html +share/samba/swat/help/manpages/idmap_adex.8.html +share/samba/swat/help/manpages/idmap_hash.8.html +share/samba/swat/help/manpages/idmap_ldap.8.html +share/samba/swat/help/manpages/idmap_nss.8.html +share/samba/swat/help/manpages/idmap_rid.8.html +share/samba/swat/help/manpages/idmap_tdb.8.html +share/samba/swat/help/manpages/idmap_tdb2.8.html +share/samba/swat/help/manpages/index.html +share/samba/swat/help/manpages/ldb.3.html +share/samba/swat/help/manpages/ldbadd.1.html +share/samba/swat/help/manpages/ldbdel.1.html +share/samba/swat/help/manpages/ldbedit.1.html +share/samba/swat/help/manpages/ldbmodify.1.html +share/samba/swat/help/manpages/ldbrename.1.html +share/samba/swat/help/manpages/ldbsearch.1.html +share/samba/swat/help/manpages/libsmbclient.7.html +share/samba/swat/help/manpages/lmhosts.5.html +share/samba/swat/help/manpages/log2pcap.1.html +share/samba/swat/help/manpages/mount.cifs.8.html +share/samba/swat/help/manpages/net.8.html +share/samba/swat/help/manpages/nmbd.8.html +share/samba/swat/help/manpages/nmblookup.1.html +share/samba/swat/help/manpages/ntlm_auth.1.html +share/samba/swat/help/manpages/pam_winbind.8.html +share/samba/swat/help/manpages/pam_winbind.conf.5.html +share/samba/swat/help/manpages/pdbedit.8.html +share/samba/swat/help/manpages/profiles.1.html +share/samba/swat/help/manpages/rpcclient.1.html +share/samba/swat/help/manpages/samba.7.html +share/samba/swat/help/manpages/sharesec.1.html +share/samba/swat/help/manpages/smb.conf.5.html +share/samba/swat/help/manpages/smbcacls.1.html +share/samba/swat/help/manpages/smbclient.1.html +share/samba/swat/help/manpages/smbcontrol.1.html +share/samba/swat/help/manpages/smbcquotas.1.html +share/samba/swat/help/manpages/smbd.8.html +share/samba/swat/help/manpages/smbget.1.html +share/samba/swat/help/manpages/smbgetrc.5.html +share/samba/swat/help/manpages/smbpasswd.5.html +share/samba/swat/help/manpages/smbpasswd.8.html +share/samba/swat/help/manpages/smbspool.8.html +share/samba/swat/help/manpages/smbstatus.1.html +share/samba/swat/help/manpages/smbtar.1.html +share/samba/swat/help/manpages/smbtree.1.html +share/samba/swat/help/manpages/swat.8.html +share/samba/swat/help/manpages/tdbbackup.8.html +share/samba/swat/help/manpages/tdbdump.8.html +share/samba/swat/help/manpages/tdbtool.8.html +share/samba/swat/help/manpages/testparm.1.html +share/samba/swat/help/manpages/umount.cifs.8.html +share/samba/swat/help/manpages/vfs_acl_tdb.8.html +share/samba/swat/help/manpages/vfs_acl_xattr.8.html +share/samba/swat/help/manpages/vfs_audit.8.html +share/samba/swat/help/manpages/vfs_cacheprime.8.html +share/samba/swat/help/manpages/vfs_cap.8.html +share/samba/swat/help/manpages/vfs_catia.8.html +share/samba/swat/help/manpages/vfs_commit.8.html +share/samba/swat/help/manpages/vfs_default_quota.8.html +share/samba/swat/help/manpages/vfs_dirsort.8.html +share/samba/swat/help/manpages/vfs_extd_audit.8.html +share/samba/swat/help/manpages/vfs_fake_perms.8.html +share/samba/swat/help/manpages/vfs_fileid.8.html +share/samba/swat/help/manpages/vfs_full_audit.8.html +share/samba/swat/help/manpages/vfs_gpfs.8.html +share/samba/swat/help/manpages/vfs_netatalk.8.html +share/samba/swat/help/manpages/vfs_notify_fam.8.html +share/samba/swat/help/manpages/vfs_prealloc.8.html +share/samba/swat/help/manpages/vfs_preopen.8.html +share/samba/swat/help/manpages/vfs_readahead.8.html +share/samba/swat/help/manpages/vfs_readonly.8.html +share/samba/swat/help/manpages/vfs_recycle.8.html +share/samba/swat/help/manpages/vfs_scannedonly.8.html +share/samba/swat/help/manpages/vfs_shadow_copy.8.html +share/samba/swat/help/manpages/vfs_shadow_copy2.8.html +share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html +share/samba/swat/help/manpages/vfs_streams_depot.8.html +share/samba/swat/help/manpages/vfs_streams_xattr.8.html +share/samba/swat/help/manpages/vfs_xattr_tdb.8.html +share/samba/swat/help/manpages/vfstest.1.html +share/samba/swat/help/manpages/wbinfo.1.html +share/samba/swat/help/manpages/winbind_krb5_locator.7.html +share/samba/swat/help/manpages/winbindd.8.html +share/samba/swat/help/welcome-no-samba-doc.html +share/samba/swat/help/welcome.html +share/samba/swat/images/globals.gif +share/samba/swat/images/home.gif +share/samba/swat/images/passwd.gif +share/samba/swat/images/printers.gif +share/samba/swat/images/samba.gif +share/samba/swat/images/shares.gif +share/samba/swat/images/status.gif +share/samba/swat/images/viewconfig.gif +share/samba/swat/images/wizard.gif +share/samba/swat/include/footer.html +share/samba/swat/include/header.html +share/samba/swat/lang/ja/help/welcome.html +share/samba/swat/lang/tr/help/welcome.html +share/samba/swat/lang/tr/images/globals.gif +share/samba/swat/lang/tr/images/home.gif +share/samba/swat/lang/tr/images/passwd.gif +share/samba/swat/lang/tr/images/printers.gif +share/samba/swat/lang/tr/images/samba.gif +share/samba/swat/lang/tr/images/shares.gif +share/samba/swat/lang/tr/images/status.gif +share/samba/swat/lang/tr/images/viewconfig.gif diff --git a/net/samba35/distinfo b/net/samba35/distinfo new file mode 100644 index 00000000000..11da61134d9 --- /dev/null +++ b/net/samba35/distinfo @@ -0,0 +1,28 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/12/06 17:01:22 adam Exp $ + +SHA1 (samba-3.5.6.tar.gz) = 5eb31e8d542d5b65867cfa5290f97783ea4628d3 +RMD160 (samba-3.5.6.tar.gz) = 0993c0ac080fd873860e176f3efe0ba07d1e99e1 +Size (samba-3.5.6.tar.gz) = 30803319 bytes +SHA1 (patch-aa) = 7a007f347752782a0a60468d3dcb1ac37065445a +SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 +SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032 +SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 +SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 +SHA1 (patch-af) = a87cf7c3ef4b75ac5d99034cc521bd7041770af2 +SHA1 (patch-ag) = 92fd576c4b05a913051925e461cde9f5a2f2d6bf +SHA1 (patch-ah) = ce4529a6f0afcc8a14bdd6ad4fc86c5c097cfef0 +SHA1 (patch-ai) = 7dc10895549439f87b8a62458878fd8c766dadb7 +SHA1 (patch-aj) = aecf98cf53e6bf6890e0fc9a40e6936df5f20a1a +SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3 +SHA1 (patch-al) = f347808c376922da057256d3614a34b556721a66 +SHA1 (patch-am) = 13744f8a5cce3016c37002079eba3c47077e8d6d +SHA1 (patch-an) = a9b31b791d979a1062006bbe55375aaab69210a1 +SHA1 (patch-ao) = bc31d3003bdaad141652daff2e0b6b3cafcee8c1 +SHA1 (patch-ap) = 3a47d212b1c29a6b3c46b83903c4f011c28a8c3c +SHA1 (patch-aq) = 09adfab1c047bb71af21a4a9689725fa8f42fcf7 +SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a +SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61 +SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b +SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84 +SHA1 (patch-av) = 72c73ee755fd260726fca23ff8c8e0e49fa9dbf0 +SHA1 (patch-aw) = 36cb31313cdbd1e4670f33924371df5ed3390420 diff --git a/net/samba35/hacks.mk b/net/samba35/hacks.mk new file mode 100644 index 00000000000..b81a7a8c1c4 --- /dev/null +++ b/net/samba35/hacks.mk @@ -0,0 +1,3 @@ +# $NetBSD: hacks.mk,v 1.1.1.1 2010/12/06 17:01:22 adam Exp $ + +.include "../../net/samba/hacks.mk" diff --git a/net/samba35/patches/patch-aa b/net/samba35/patches/patch-aa new file mode 100644 index 00000000000..530130b65c8 --- /dev/null +++ b/net/samba35/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- ../docs/manpages/smb.conf.5.orig 2010-06-18 08:11:31.000000000 +0000 ++++ ../docs/manpages/smb.conf.5 +@@ -7698,6 +7698,15 @@ Example: + \fI\fIpasswd chat\fR\fR\fI = \fR\fI\FC"*Enter NEW password*" %n\en "*Reenter NEW password*" %n\en "*Password changed*"\F[]\fR\fI \fR + .RE + ++passwd expand gecos (G) ++.PP ++.RS 4 ++This boolean specifies if ampersand characters in the GECOS field of a passwd database entry should be replaced with the capitalized login name for that entry when the information is used by various Samba programs\&. This parameter is off by default\&. ++.sp ++Default: \fB\fIpasswd expand gecos\fR = no \fR ++.TP 3n ++.sp ++ + passwd program (G) + .\" passwd program + .PP diff --git a/net/samba35/patches/patch-ab b/net/samba35/patches/patch-ab new file mode 100644 index 00000000000..f6dbd84389d --- /dev/null +++ b/net/samba35/patches/patch-ab @@ -0,0 +1,57 @@ +$NetBSD: patch-ab,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- ../examples/smb.conf.default.orig 2010-01-14 10:12:10.000000000 +0000 ++++ ../examples/smb.conf.default +@@ -26,7 +26,7 @@ + workgroup = MYGROUP + + # server string is the equivalent of the NT Description field +- server string = Samba Server ++ server string = Samba %v (%h) + + # Security mode. Defines in which mode Samba will operate. Possible + # values are share, user, server, domain and ads. Most people will want +@@ -63,10 +63,10 @@ + + # this tells Samba to use a separate log file for each machine + # that connects +- log file = /usr/local/samba/var/log.%m ++; log file = @VARBASE@/log/log.%m + + # Put a capping on the size of the log files (in Kb). +- max log size = 50 ++; max log size = 50 + + # Use password server option only with security = server + # The argument list may include: +@@ -145,7 +145,7 @@ + + # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names + # via DNS nslookups. The default is NO. +- dns proxy = no ++; dns proxy = no + + # These scripts are used on a domain controller or stand-alone + # machine to add or delete corresponding unix accounts +@@ -182,14 +182,14 @@ + + # NOTE: If you have a BSD-style print system there is no need to + # specifically define each individual printer +-[printers] +- comment = All Printers +- path = /usr/spool/samba +- browseable = no ++;[printers] ++; comment = All Printers ++; path = /usr/spool/samba ++; browseable = no + # Set public = yes to allow user 'guest account' to print +- guest ok = no +- writable = no +- printable = yes ++; guest ok = no ++; writable = no ++; printable = yes + + # This one is useful for people to share files + ;[tmp] diff --git a/net/samba35/patches/patch-ac b/net/samba35/patches/patch-ac new file mode 100644 index 00000000000..2e29db834e3 --- /dev/null +++ b/net/samba35/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- libads/kerberos.c.orig 2010-12-05 21:57:18.000000000 +0000 ++++ libads/kerberos.c +@@ -460,7 +460,7 @@ char* kerberos_secrets_fetch_des_salt( v + + if ( (key = des_salt_key()) == NULL ) { + DEBUG(0,("kerberos_secrets_fetch_des_salt: failed to generate key!\n")); +- return False; ++ return NULL; + } + + salt = (char*)secrets_fetch( key, NULL ); diff --git a/net/samba35/patches/patch-ad b/net/samba35/patches/patch-ad new file mode 100644 index 00000000000..5977626e16a --- /dev/null +++ b/net/samba35/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- VERSION.orig 2010-01-14 10:12:10.000000000 +0000 ++++ VERSION +@@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT= + # SAMBA_VERSION_VENDOR_FUNCTION # + # # + ######################################################## +-SAMBA_VERSION_VENDOR_SUFFIX= ++SAMBA_VERSION_VENDOR_SUFFIX="pkgsrc" + SAMBA_VERSION_VENDOR_PATCH= + + ######################################################## diff --git a/net/samba35/patches/patch-ae b/net/samba35/patches/patch-ae new file mode 100644 index 00000000000..3269e25fa46 --- /dev/null +++ b/net/samba35/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- auth/pampass.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ auth/pampass.c +@@ -46,6 +46,10 @@ + #include <pam/pam_appl.h> + #endif + ++#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR) ++#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR ++#endif ++ + /* + * Structure used to communicate between the conversation function + * and the server_login/change password functions. diff --git a/net/samba35/patches/patch-af b/net/samba35/patches/patch-af new file mode 100644 index 00000000000..ea87ddebc2b --- /dev/null +++ b/net/samba35/patches/patch-af @@ -0,0 +1,142 @@ +$NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- configure.orig 2010-10-07 16:42:24.000000000 +0000 ++++ configure +@@ -52166,6 +52166,7 @@ _ACEOF + + BLDSHARED="true" + LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress" ++ SONAMEFLAG="-install_name \$(LIBDIR)/" + CFLAGS="$CFLAGS -fno-common" + SHLD="\${CC}" + SHLIBEXT="dylib" +@@ -52206,7 +52206,7 @@ fi + $as_echo "$BLDSHARED" >&6; } + + saved_before_as_needed_ldflags="$LDFLAGS" +-for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do ++for flags in "-Wl,-z,ignore" "-z ignore" ; do + saved_ldflags="$LDFLAGS" + { $as_echo "$as_me:$LINENO: checking if $flags works" >&5 + $as_echo_n "checking if $flags works... " >&6; } +@@ -65398,9 +65398,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS" + + + +- { $as_echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5 +-$as_echo_n "checking for des_set_key in -lcrypto... " >&6; } +-if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking for EVP_des_cbc -lcrypto" >&5 ++$as_echo_n "checking for EVP_des_cbc in -lcrypto... " >&6; } ++if test "${ac_cv_lib_ext_crypto_EVP_des_cbc+set}" = set; then + $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -65416,11 +65416,11 @@ cat >>conftest.$ac_ext <<_ACEOF + #ifdef __cplusplus + extern "C" + #endif +-char des_set_key (); ++char EVP_des_cbc (); + int + main () + { +-return des_set_key (); ++return EVP_des_cbc (); + ; + return 0; + } +@@ -65446,13 +65446,13 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_ext_crypto_des_set_key=yes; ++ ac_cv_lib_ext_crypto_EVP_des_cbc=yes; + ac_cv_lib_ext_crypto=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_ext_crypto_des_set_key=no; ++ ac_cv_lib_ext_crypto_EVP_des_cbc=no; + ac_cv_lib_ext_crypto=no + fi + +@@ -65461,11 +65461,11 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_des_set_key" >&5 +-$as_echo "$ac_cv_lib_ext_crypto_des_set_key" >&6; } +- if test $ac_cv_lib_ext_crypto_des_set_key = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_EVP_des_cbc" >&5 ++$as_echo "$ac_cv_lib_ext_crypto_EVP_des_cbc" >&6; } ++ if test $ac_cv_lib_ext_crypto_EVP_des_cbc = yes; then + cat >>confdefs.h <<_ACEOF +-#define HAVE_DES_SET_KEY 1 ++#define HAVE_EVP_DES_CBC 1 + _ACEOF + + fi +@@ -81610,31 +81610,39 @@ case "$host_os" in + NSSSONAMEVERSIONSUFFIX=".2" + WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o" + ;; +- *freebsd[5-9]*) +- # FreeBSD winbind client is implemented as a wrapper around +- # the Linux version. +- NSSSONAMEVERSIONSUFFIX=".1" +- WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \ +- ../nsswitch/winbind_nss_linux.o" +- WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT" +- WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT" +- ;; +- +- *netbsd*[3-9]*) +- # NetBSD winbind client is implemented as a wrapper +- # around the Linux version. It needs getpwent_r() to +- # indicate libc's use of the correct nsdispatch API. +- # +- if test x"$ac_cv_func_getpwent_r" = x"yes"; then +- WINBIND_NSS_EXTRA_OBJS="\ +- ../nsswitch/winbind_nss_netbsd.o \ ++ *freebsd*) ++ case "$UNAME_R" in ++ [5-9]*) ++ # FreeBSD winbind client is implemented as a wrapper ++ # around the Linux version. ++ NSSSONAMEVERSIONSUFFIX=".1" ++ WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \ + ../nsswitch/winbind_nss_linux.o" + WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT" + WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT" +- else +- HAVE_WINBIND=no +- winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported" +- fi ++ ;; ++ esac ++ ;; ++ ++ *netbsd*) ++ case "$UNAME_R" in ++ [3-9]*) ++ # NetBSD winbind client is implemented as a wrapper ++ # around the Linux version. It needs getpwent_r() to ++ # indicate libc's use of the correct nsdispatch API. ++ # ++ if test x"$ac_cv_func_getpwent_r" = x"yes"; then ++ WINBIND_NSS_EXTRA_OBJS="\ ++ ../nsswitch/winbind_nss_netbsd.o \ ++ ../nsswitch/winbind_nss_linux.o" ++ WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT" ++ WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT" ++ else ++ HAVE_WINBIND=no ++ winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported" ++ fi ++ ;; ++ esac + ;; + *irix*) + # IRIX has differently named shared libraries diff --git a/net/samba35/patches/patch-ag b/net/samba35/patches/patch-ag new file mode 100644 index 00000000000..eb8a32b516c --- /dev/null +++ b/net/samba35/patches/patch-ag @@ -0,0 +1,70 @@ +$NetBSD: patch-ag,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- registry/regfio.c.orig 2010-12-05 16:01:50.000000000 +0000 ++++ registry/regfio.c +@@ -480,7 +480,7 @@ static REGF_HBIN* read_hbin_block( REGF_ + /* remember that the record_size is in the 4 bytes preceeding the record itself */ + + if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE-sizeof(uint32) ) ) +- return False; ++ return NULL; + + record_size = 0; + header = 0; +@@ -503,12 +503,12 @@ static REGF_HBIN* read_hbin_block( REGF_ + } + + if ( !prs_set_offset( &hbin->ps, curr_off) ) +- return False; ++ return NULL; + + if ( !prs_uint32( "rec_size", &hbin->ps, 0, &record_size ) ) +- return False; ++ return NULL; + if ( !prs_uint32( "header", &hbin->ps, 0, &header ) ) +- return False; ++ return NULL; + + SMB_ASSERT( record_size != 0 ); + +@@ -532,7 +532,7 @@ static REGF_HBIN* read_hbin_block( REGF_ + DEBUG(10,("read_hbin_block: free space offset == 0x%x\n", hbin->free_off)); + + if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE ) ) +- return False; ++ return NULL; + + return hbin; + } +@@ -1557,7 +1557,7 @@ done: + for the record */ + + if ( !prs_uint32("allocated_size", &hbin->ps, 0, &size) ) +- return False; ++ return NULL; + + update_free_space( hbin, size ); + +@@ -1771,7 +1771,7 @@ static int hashrec_cmp( REGF_HASH_REC *h + qsort( parent->subkeys.hashes, parent->subkey_index, sizeof(REGF_HASH_REC), QSORT_CAST hashrec_cmp ); + + if ( !hbin_prs_lf_records( "lf_rec", parent->subkeys.hbin, 0, parent ) ) +- return False; ++ return NULL; + } + + /* write the security descriptor */ +@@ -1923,11 +1923,11 @@ static int hashrec_cmp( REGF_HASH_REC *h + + prs_set_offset( &nk->hbin->ps, nk->hbin_off ); + if ( !prs_nk_rec( "nk_rec", &nk->hbin->ps, 0, nk ) ) +- return False; ++ return NULL; + + if ( nk->num_values ) { + if ( !hbin_prs_vk_records( "vk_records", vlist_hbin, 0, nk, file ) ) +- return False; ++ return NULL; + } + + diff --git a/net/samba35/patches/patch-ah b/net/samba35/patches/patch-ah new file mode 100644 index 00000000000..df994d32dd9 --- /dev/null +++ b/net/samba35/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- libsmb/cliconnect.c.orig 2010-12-05 16:06:50.000000000 +0000 ++++ libsmb/cliconnect.c +@@ -2579,7 +2579,7 @@ struct cli_state *get_ipc_connect_master + if (!NT_STATUS_IS_OK(name_resolve_bcast(MSBROWSE, 1, &ip_list, + &count))) { + DEBUG(99, ("No master browsers responded\n")); +- return False; ++ return NULL; + } + + for (i = 0; i < count; i++) { diff --git a/net/samba35/patches/patch-ai b/net/samba35/patches/patch-ai new file mode 100644 index 00000000000..8016c069358 --- /dev/null +++ b/net/samba35/patches/patch-ai @@ -0,0 +1,17 @@ +$NetBSD: patch-ai,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- include/local.h.orig 2010-10-07 16:41:16.000000000 +0000 ++++ include/local.h +@@ -188,10 +188,10 @@ + * Default passwd chat script. + */ + +-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" ++#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n" + + /* Minimum length of allowed password when changing UNIX password. */ +-#define MINPASSWDLENGTH 5 ++#define MINPASSWDLENGTH 6 + + /* maximum ID number used for session control. This cannot be larger + than 62*62 for the current code */ diff --git a/net/samba35/patches/patch-aj b/net/samba35/patches/patch-aj new file mode 100644 index 00000000000..e6cf0d973c7 --- /dev/null +++ b/net/samba35/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- smbd/dir.c.orig 2010-12-05 20:59:48.000000000 +0000 ++++ smbd/dir.c +@@ -193,7 +193,7 @@ static struct dptr_struct *dptr_get(stru + dptr->wcard, dptr->attr))) { + DEBUG(4,("dptr_get: Failed to open %s (%s)\n",dptr->path, + strerror(errno))); +- return False; ++ return NULL; + } + } + DLIST_PROMOTE(sconn->smb1.searches.dirptrs,dptr); diff --git a/net/samba35/patches/patch-ak b/net/samba35/patches/patch-ak new file mode 100644 index 00000000000..4b448eeb075 --- /dev/null +++ b/net/samba35/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- intl/lang_tdb.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ intl/lang_tdb.c +@@ -139,7 +139,7 @@ bool lang_tdb_init(const char *lang) + goto done; + } + +- if (asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang) == -1) { ++ if (asprintf(&path, "%s%s.tdb", state_path("lang_"), lang) == -1) { + DEBUG(0, ("asprintf failed\n")); + goto done; + } diff --git a/net/samba35/patches/patch-al b/net/samba35/patches/patch-al new file mode 100644 index 00000000000..fc3ad7863b3 --- /dev/null +++ b/net/samba35/patches/patch-al @@ -0,0 +1,19 @@ +$NetBSD: patch-al,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- lib/ldb/tests/test-schema.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ lib/ldb/tests/test-schema.sh +@@ -19,12 +19,12 @@ $VALGRIND bin/ldbmodify $LDBDIR/tests/sc + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-2.ldif || exit 1 + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-3.ldif || exit 1 + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-4.ldif +-if [ "$?" == "0" ]; then ++if [ "$?" = "0" ]; then + echo "test failed!" + exit 1 + fi + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-5.ldif +-if [ "$?" == "0" ]; then ++if [ "$?" = "0" ]; then + echo "test failed!" + exit 1 + fi diff --git a/net/samba35/patches/patch-am b/net/samba35/patches/patch-am new file mode 100644 index 00000000000..824249b7c10 --- /dev/null +++ b/net/samba35/patches/patch-am @@ -0,0 +1,78 @@ +$NetBSD: patch-am,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +Add support for "passwd expand gecos". + +--- lib/util_pw.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ lib/util_pw.c +@@ -4,6 +4,7 @@ + Safe versions of getpw* calls + + Copyright (C) Andrew Bartlett 2002 ++ Copyright (C) Luke Mewburn 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -21,9 +22,12 @@ + + #include "includes.h" + ++static char *passwd_expand_gecos(const struct passwd *); ++ + struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) + { + struct passwd *ret = TALLOC_P(mem_ctx, struct passwd); ++ char *gecos; + if (!ret) { + return NULL; + } +@@ -31,7 +35,10 @@ struct passwd *tcopy_passwd(TALLOC_CTX * + ret->pw_passwd = talloc_strdup(ret, from->pw_passwd); + ret->pw_uid = from->pw_uid; + ret->pw_gid = from->pw_gid; +- ret->pw_gecos = talloc_strdup(ret, from->pw_gecos); ++ gecos = (from->pw_gecos != NULL) ? passwd_expand_gecos(from) : NULL; ++ ret->pw_gecos = talloc_strdup(ret, gecos); ++ if (gecos != NULL) ++ SAFE_FREE(gecos); + ret->pw_dir = talloc_strdup(ret, from->pw_dir); + ret->pw_shell = talloc_strdup(ret, from->pw_shell); + return ret; +@@ -85,3 +92,38 @@ struct passwd *getpwuid_alloc(TALLOC_CTX + + return tcopy_passwd(mem_ctx, temp); + } ++ ++ ++/**************************************************************** ++ Expand any `&' characters in pw_gecos with a capitalized pw_name. ++****************************************************************/ ++ ++static char *passwd_expand_gecos(const struct passwd *pw) ++{ ++ char *p, *bp, *buf; ++ size_t ac, buflen; ++ ++ if (!lp_passwd_expand_gecos()) { ++ return smb_xstrdup(pw->pw_gecos); ++ } ++ ++ ac = 0; ++ /* count number of `&' in pw_gecos */ ++ for (p = pw->pw_gecos; *p; p++) { ++ if (*p == '&') ++ ac++; ++ } ++ buflen = strlen(pw->pw_gecos) + (ac * (strlen(pw->pw_name) - 1)) + 1; ++ buf = smb_xmalloc_array(sizeof(char), buflen); ++ bp = buf; ++ for (p = pw->pw_gecos; *p; p++) { ++ if (*p == '&') { /* replace & with capitalized pw_name */ ++ ac = snprintf(bp, buflen - (bp - buf), ++ "%s", pw->pw_name); ++ *bp = toupper((unsigned char)*bp); ++ bp += ac; ++ } else ++ *bp++ = *p; ++ } ++ return buf; ++} diff --git a/net/samba35/patches/patch-an b/net/samba35/patches/patch-an new file mode 100644 index 00000000000..a14a322ac20 --- /dev/null +++ b/net/samba35/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- smbd/ntquotas.c.orig 2010-12-05 21:00:36.000000000 +0000 ++++ smbd/ntquotas.c +@@ -234,7 +234,7 @@ void *init_quota_handle(TALLOC_CTX *mem_ + SMB_NTQUOTA_HANDLE *qt_handle; + + if (!mem_ctx) +- return False; ++ return NULL; + + qt_handle = TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_HANDLE); + if (qt_handle==NULL) { diff --git a/net/samba35/patches/patch-ao b/net/samba35/patches/patch-ao new file mode 100644 index 00000000000..2f72c0efab3 --- /dev/null +++ b/net/samba35/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- libsmb/samlogon_cache.c.orig 2010-12-05 21:01:38.000000000 +0000 ++++ libsmb/samlogon_cache.c +@@ -217,7 +217,7 @@ struct netr_SamInfo3 *netsamlogon_cache_ + if (!netsamlogon_cache_init()) { + DEBUG(0,("netsamlogon_cache_get: cannot open %s for write!\n", + NETSAMLOGON_TDB)); +- return false; ++ return NULL; + } + + /* Prepare key as DOMAIN-SID/USER-RID string */ diff --git a/net/samba35/patches/patch-ap b/net/samba35/patches/patch-ap new file mode 100644 index 00000000000..4392b507010 --- /dev/null +++ b/net/samba35/patches/patch-ap @@ -0,0 +1,15 @@ +$NetBSD: patch-ap,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- nmbd/nmbd.c.orig 2010-10-07 16:41:16.000000000 +0000 ++++ nmbd/nmbd.c +@@ -916,6 +916,10 @@ static bool open_sockets(bool isdaemon, + mkdir(lp_lockdir(), 0755); + } + ++ if (!directory_exist(lp_statedir())) { ++ mkdir(lp_statedir(), 0755); ++ } ++ + pidfile_create("nmbd"); + + if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(), diff --git a/net/samba35/patches/patch-aq b/net/samba35/patches/patch-aq new file mode 100644 index 00000000000..6471f9139a5 --- /dev/null +++ b/net/samba35/patches/patch-aq @@ -0,0 +1,46 @@ +$NetBSD: patch-aq,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +Add support for passwd expand gecos + +--- param/loadparm.c.orig 2010-02-25 09:46:35.000000000 +0000 ++++ param/loadparm.c +@@ -297,6 +298,7 @@ struct global { + bool bUnixPasswdSync; + bool bPasswdChatDebug; + int iPasswdChatTimeout; ++ bool bPasswdExpandGecos; + bool bTimestampLogs; + bool bNTSmbSupport; + bool bNTPipeSupport; +@@ -1248,6 +1250,15 @@ static struct parm_struct parm_table[] = + .flags = FLAG_ADVANCED, + }, + { ++ .label = "passwd expand gecos", ++ .type = P_BOOL, ++ .p_class = P_GLOBAL, ++ .ptr = &Globals.bPasswdExpandGecos, ++ .special = NULL, ++ .enum_list = NULL, ++ .flags = FLAG_ADVANCED, ++ }, ++ { + .label = "check password script", + .type = P_STRING, + .p_class = P_GLOBAL, +@@ -4759,6 +4780,7 @@ static void init_globals(bool first_time + Globals.bPamPasswordChange = False; + Globals.bPasswdChatDebug = False; + Globals.iPasswdChatTimeout = 2; /* 2 second default. */ ++ Globals.bPasswdExpandGecos = False; + Globals.bNTPipeSupport = True; /* Do NT pipes by default. */ + Globals.bNTStatusSupport = True; /* Use NT status by default. */ + Globals.bStatCache = True; /* use stat cache by default */ +@@ -5178,6 +5201,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, & + FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync) + FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug) + FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout) ++FN_GLOBAL_BOOL(lp_passwd_expand_gecos, &Globals.bPasswdExpandGecos) + FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport) + FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport) + FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache) diff --git a/net/samba35/patches/patch-ar b/net/samba35/patches/patch-ar new file mode 100644 index 00000000000..38273d8b7c8 --- /dev/null +++ b/net/samba35/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- script/installman.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installman.sh +@@ -33,7 +33,7 @@ for lang in $langs; do + langdir=$MANDIR/$lang + for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do + if [ ! -d $d ]; then +- mkdir $d ++ mkdir -p $d + if [ ! -d $d ]; then + echo Failed to make directory $d, does $USER have privileges? + exit 1 diff --git a/net/samba35/patches/patch-as b/net/samba35/patches/patch-as new file mode 100644 index 00000000000..31ec8809e4c --- /dev/null +++ b/net/samba35/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- script/installmodules.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installmodules.sh +@@ -11,7 +11,7 @@ shift + + for d in $prefix $LIBDIR; do + if [ ! -d $DESTDIR/$d ]; then +-mkdir $DESTDIR/$d ++mkdir -p $DESTDIR/$d + if [ ! -d $DESTDIR/$d ]; then + echo Failed to make directory $DESTDIR/$d + exit 1 diff --git a/net/samba35/patches/patch-at b/net/samba35/patches/patch-at new file mode 100644 index 00000000000..20c259f1680 --- /dev/null +++ b/net/samba35/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD: patch-at,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- script/installscripts.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installscripts.sh +@@ -12,7 +12,7 @@ echo Installing scripts in $BINDIR + + for d in $BINDIR; do + if [ ! -d $d ]; then +- mkdir $d ++ mkdir -p $d + if [ ! -d $d ]; then + echo Failed to make directory $d + echo Have you run installbin first? diff --git a/net/samba35/patches/patch-au b/net/samba35/patches/patch-au new file mode 100644 index 00000000000..32cdf05eb4b --- /dev/null +++ b/net/samba35/patches/patch-au @@ -0,0 +1,13 @@ +$NetBSD: patch-au,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- script/installswat.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installswat.sh +@@ -140,7 +140,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then + + INSTALLDIR="$DESTDIR/$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`" + if test ! -d "$INSTALLDIR" -a "$mode" = 'install'; then +- mkdir "$INSTALLDIR" ++ mkdir -p "$INSTALLDIR" + if test ! -d "$INSTALLDIR"; then + echo "Failed to make directory $INSTALLDIR, does $USER have privileges? " + exit 1 diff --git a/net/samba35/patches/patch-av b/net/samba35/patches/patch-av new file mode 100644 index 00000000000..04c5109566f --- /dev/null +++ b/net/samba35/patches/patch-av @@ -0,0 +1,14 @@ +$NetBSD: patch-av,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- smbd/server.c.orig 2010-10-07 16:41:16.000000000 +0000 ++++ smbd/server.c +@@ -1189,6 +1189,9 @@ extern void build_options(bool screen); + if (!directory_exist(lp_lockdir())) + mkdir(lp_lockdir(), 0755); + ++ if (!directory_exist(lp_statedir())) ++ mkdir(lp_statedir(), 0755); ++ + if (is_daemon) + pidfile_create("smbd"); + diff --git a/net/samba35/patches/patch-aw b/net/samba35/patches/patch-aw new file mode 100644 index 00000000000..fcd63798941 --- /dev/null +++ b/net/samba35/patches/patch-aw @@ -0,0 +1,13 @@ +$NetBSD: patch-aw,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ + +--- winbindd/winbindd_cache.c.orig 2010-12-05 21:02:29.000000000 +0000 ++++ winbindd/winbindd_cache.c +@@ -4438,7 +4438,7 @@ struct winbindd_tdc_domain * wcache_tdc_ + DEBUG(10,("wcache_tdc_fetch_domain: Searching for domain %s\n", name)); + + if ( !init_wcache() ) { +- return false; ++ return NULL; + } + + /* fetch the list */ |