diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | net/samba/Makefile | 17 | ||||
| -rw-r--r-- | net/samba/PLIST | 404 | ||||
| -rw-r--r-- | net/samba/buildlink3.mk | 4 | ||||
| -rw-r--r-- | net/samba/distinfo | 9 | ||||
| -rw-r--r-- | net/samba/patches/patch-aa | 13 | ||||
| -rw-r--r-- | net/samba/patches/patch-af | 14 |
7 files changed, 231 insertions, 233 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 3a8d18036e2..7c3dece1943 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.7150 2004/09/14 14:41:40 jlam Exp $ +$NetBSD: CHANGES,v 1.7151 2004/09/14 17:18:06 jlam Exp $ Changes to the packages collection and infrastructure in 2004: @@ -4248,3 +4248,4 @@ Changes to the packages collection and infrastructure in 2004: Updated xmms-osd to 2.2.12 [jmmv 2004-09-14] Updated thttpd to 2.25bnb1 [wiz 2004-09-14] Updated heimdal to 0.6.3 [jlam 2004-09-14] + Updated samba to 3.0.7 [jlam 2004-09-14] diff --git a/net/samba/Makefile b/net/samba/Makefile index 89348f0220e..c893d3613ab 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.128 2004/09/12 05:00:53 jlam Exp $ +# $NetBSD: Makefile,v 1.129 2004/09/14 17:18:05 jlam Exp $ -DISTNAME= samba-3.0.5 +DISTNAME= samba-3.0.7 CATEGORIES= net MASTER_SITES= ftp://ftp.samba.org/pub/samba/old-versions/ \ ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \ @@ -10,7 +10,6 @@ COUNTRY_MIRRORS= au1 ca fi fr it pl ru sg se us1 us6 .for COUNTRY in ${COUNTRY_MIRRORS} MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/old-versions/ .endfor -#EXTRACT_SUFX= .tar.bz2 MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://www.samba.org/ @@ -46,12 +45,12 @@ FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} +CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR} CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} -CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR} CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat CONFIGURE_ARGS+= --with-libsmbclient @@ -112,17 +111,17 @@ post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh post-install: - -cd ${PREFIX}/lib && ln -s libsmbclient.so libsmbclient.so.0 -.for d in auth idmap pdb rpc - ${RMDIR} ${SAMBA_LIBDIR}/${d} -.endfor - ${INSTALL_DATA_DIR} ${DOCDIR} + -cd ${SAMBA_LIBDIR} && ln -s libsmbclient.so libsmbclient.so.0 + for d in auth idmap pdb rpc; do \ + ${RMDIR} ${SAMBA_LIBDIR}/$$d; \ + done .if !empty(NSS_WINBIND) ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib .endif .if !empty(NSS_WINS) ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib .endif + ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}/../docs/registry; for file in *.reg; do \ ${INSTALL_DATA} $$file ${DOCDIR}/$$file; \ done diff --git a/net/samba/PLIST b/net/samba/PLIST index 788cc193437..b34cd4402a1 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2004/09/12 05:00:53 jlam Exp $ +@comment $NetBSD: PLIST,v 1.24 2004/09/14 17:18:06 jlam Exp $ bin/findsmb bin/net bin/nmblookup @@ -26,9 +26,6 @@ bin/wbinfo include/libsmbclient.h ${NSS_WINBIND} ${NSS_WINS} -lib/libsmbclient.a -lib/libsmbclient.so -lib/libsmbclient.so.0 lib/samba/charset/CP437.so lib/samba/charset/CP850.so lib/samba/de.msg @@ -36,6 +33,9 @@ lib/samba/en.msg lib/samba/fr.msg lib/samba/it.msg lib/samba/ja.msg +lib/samba/libsmbclient.a +lib/samba/libsmbclient.so +lib/samba/libsmbclient.so.0 lib/samba/lowcase.dat lib/samba/nl.msg lib/samba/pl.msg @@ -48,6 +48,7 @@ lib/samba/vfs/default_quota.so lib/samba/vfs/expand_msdfs.so lib/samba/vfs/extd_audit.so lib/samba/vfs/fake_perms.so +lib/samba/vfs/full_audit.so lib/samba/vfs/netatalk.so lib/samba/vfs/readonly.so lib/samba/vfs/recycle.so @@ -123,195 +124,204 @@ ${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/samba/swat/help/devel/CodingSuggestions.html -share/samba/swat/help/devel/Packaging.html -share/samba/swat/help/devel/architecture.html -share/samba/swat/help/devel/contributing.html -share/samba/swat/help/devel/debug.html -share/samba/swat/help/devel/index.html -share/samba/swat/help/devel/internals.html -share/samba/swat/help/devel/modules.html -share/samba/swat/help/devel/netbios.html -share/samba/swat/help/devel/ntdomain.html -share/samba/swat/help/devel/parsing.html -share/samba/swat/help/devel/pr01.html -share/samba/swat/help/devel/printing.html -share/samba/swat/help/devel/pt01.html -share/samba/swat/help/devel/pt02.html -share/samba/swat/help/devel/pt03.html -share/samba/swat/help/devel/pt04.html -share/samba/swat/help/devel/pt05.html -share/samba/swat/help/devel/pwencrypt.html -share/samba/swat/help/devel/registry.html -share/samba/swat/help/devel/rpc-plugin.html -share/samba/swat/help/devel/sam.html -share/samba/swat/help/devel/tracing.html -share/samba/swat/help/devel/unix-smb.html -share/samba/swat/help/devel/vfs.html -share/samba/swat/help/devel/windows-debug.html -share/samba/swat/help/devel/wins.html +share/samba/swat/help/Samba-Developers-Guide/CodingSuggestions.html +share/samba/swat/help/Samba-Developers-Guide/Packaging.html +share/samba/swat/help/Samba-Developers-Guide/architecture.html +share/samba/swat/help/Samba-Developers-Guide/contributing.html +share/samba/swat/help/Samba-Developers-Guide/debug.html +share/samba/swat/help/Samba-Developers-Guide/index.html +share/samba/swat/help/Samba-Developers-Guide/internals.html +share/samba/swat/help/Samba-Developers-Guide/modules.html +share/samba/swat/help/Samba-Developers-Guide/netbios.html +share/samba/swat/help/Samba-Developers-Guide/ntdomain.html +share/samba/swat/help/Samba-Developers-Guide/parsing.html +share/samba/swat/help/Samba-Developers-Guide/pr01.html +share/samba/swat/help/Samba-Developers-Guide/printing.html +share/samba/swat/help/Samba-Developers-Guide/pt01.html +share/samba/swat/help/Samba-Developers-Guide/pt02.html +share/samba/swat/help/Samba-Developers-Guide/pt03.html +share/samba/swat/help/Samba-Developers-Guide/pt04.html +share/samba/swat/help/Samba-Developers-Guide/pt05.html +share/samba/swat/help/Samba-Developers-Guide/pwencrypt.html +share/samba/swat/help/Samba-Developers-Guide/registry.html +share/samba/swat/help/Samba-Developers-Guide/rpc-plugin.html +share/samba/swat/help/Samba-Developers-Guide/tracing.html +share/samba/swat/help/Samba-Developers-Guide/unix-smb.html +share/samba/swat/help/Samba-Developers-Guide/vfs.html +share/samba/swat/help/Samba-Developers-Guide/windows-debug.html +share/samba/swat/help/Samba-Developers-Guide/wins.html +share/samba/swat/help/Samba-Guide/2000users.html +share/samba/swat/help/Samba-Guide/AccountingNetwork.png +share/samba/swat/help/Samba-Guide/Big500users.html +share/samba/swat/help/Samba-Guide/Charity-Network.png +share/samba/swat/help/Samba-Guide/DomApps.html +share/samba/swat/help/Samba-Guide/HA.html +share/samba/swat/help/Samba-Guide/HostAnnouncment.png +share/samba/swat/help/Samba-Guide/NullConnect.png +share/samba/swat/help/Samba-Guide/UNIX-Samba-and-LDAP.png +share/samba/swat/help/Samba-Guide/UserConnect.png +share/samba/swat/help/Samba-Guide/UserMgrNT4.png +share/samba/swat/help/Samba-Guide/WINREPRESSME-Capture.png +share/samba/swat/help/Samba-Guide/WINREPRESSME-Capture2.png +share/samba/swat/help/Samba-Guide/WindowsXP-NullConnection.png +share/samba/swat/help/Samba-Guide/WindowsXP-UserConnection.png +share/samba/swat/help/Samba-Guide/XP-screen001.png +share/samba/swat/help/Samba-Guide/acct2net.png +share/samba/swat/help/Samba-Guide/appendix.html +share/samba/swat/help/Samba-Guide/ch7-dual-additive-LDAP-Ok.png +share/samba/swat/help/Samba-Guide/ch7-dual-additive-LDAP.png +share/samba/swat/help/Samba-Guide/ch7-fail-overLDAP.png +share/samba/swat/help/Samba-Guide/ch7-singleLDAP.png +share/samba/swat/help/Samba-Guide/ch8-migration.png +share/samba/swat/help/Samba-Guide/chap4-net.png +share/samba/swat/help/Samba-Guide/chap5-net.png +share/samba/swat/help/Samba-Guide/chap6-net.png +share/samba/swat/help/Samba-Guide/chap7-idresol.png +share/samba/swat/help/Samba-Guide/chap7-net-Ar.png +share/samba/swat/help/Samba-Guide/chap7-net2-Br.png +share/samba/swat/help/Samba-Guide/chap9-ADSDC.png +share/samba/swat/help/Samba-Guide/chap9-SambaDC.png +share/samba/swat/help/Samba-Guide/go01.html +share/samba/swat/help/Samba-Guide/gpl.html +share/samba/swat/help/Samba-Guide/happy.html +share/samba/swat/help/Samba-Guide/index.html +share/samba/swat/help/Samba-Guide/ix01.html +share/samba/swat/help/Samba-Guide/kerberos.html +share/samba/swat/help/Samba-Guide/lam-config.png +share/samba/swat/help/Samba-Guide/lam-group-members.png +share/samba/swat/help/Samba-Guide/lam-groups.png +share/samba/swat/help/Samba-Guide/lam-hosts.png +share/samba/swat/help/Samba-Guide/lam-login.png +share/samba/swat/help/Samba-Guide/lam-users.png +share/samba/swat/help/Samba-Guide/migration.html +share/samba/swat/help/Samba-Guide/openmag.png +share/samba/swat/help/Samba-Guide/pr01.html +share/samba/swat/help/Samba-Guide/pr02.html +share/samba/swat/help/Samba-Guide/pr03.html +share/samba/swat/help/Samba-Guide/preface.html +share/samba/swat/help/Samba-Guide/primer.html +share/samba/swat/help/Samba-Guide/secure.html +share/samba/swat/help/Samba-Guide/simple.html +share/samba/swat/help/Samba-Guide/small.html +share/samba/swat/help/Samba-Guide/unixclients.html +share/samba/swat/help/Samba-Guide/wxpp001.png +share/samba/swat/help/Samba-Guide/wxpp004.png +share/samba/swat/help/Samba-Guide/wxpp006.png +share/samba/swat/help/Samba-Guide/wxpp007.png +share/samba/swat/help/Samba-Guide/wxpp008.png +share/samba/swat/help/Samba-HOWTO-Collection/10small.png +share/samba/swat/help/Samba-HOWTO-Collection/11small.png +share/samba/swat/help/Samba-HOWTO-Collection/12small.png +share/samba/swat/help/Samba-HOWTO-Collection/13small.png +share/samba/swat/help/Samba-HOWTO-Collection/14small.png +share/samba/swat/help/Samba-HOWTO-Collection/1small.png +share/samba/swat/help/Samba-HOWTO-Collection/2small.png +share/samba/swat/help/Samba-HOWTO-Collection/3small.png +share/samba/swat/help/Samba-HOWTO-Collection/4small.png +share/samba/swat/help/Samba-HOWTO-Collection/5small.png +share/samba/swat/help/Samba-HOWTO-Collection/6small.png +share/samba/swat/help/Samba-HOWTO-Collection/7small.png +share/samba/swat/help/Samba-HOWTO-Collection/8small.png +share/samba/swat/help/Samba-HOWTO-Collection/9small.png +share/samba/swat/help/Samba-HOWTO-Collection/AccessControls.html +share/samba/swat/help/Samba-HOWTO-Collection/AdvancedNetworkManagement.html +share/samba/swat/help/Samba-HOWTO-Collection/Appendix.html +share/samba/swat/help/Samba-HOWTO-Collection/Backup.html +share/samba/swat/help/Samba-HOWTO-Collection/CUPS-printing.html +share/samba/swat/help/Samba-HOWTO-Collection/ClientConfig.html +share/samba/swat/help/Samba-HOWTO-Collection/DNSDHCP.html +share/samba/swat/help/Samba-HOWTO-Collection/FastStart.html +share/samba/swat/help/Samba-HOWTO-Collection/InterdomainTrusts.html +share/samba/swat/help/Samba-HOWTO-Collection/IntroSMB.html +share/samba/swat/help/Samba-HOWTO-Collection/NT4Migration.html +share/samba/swat/help/Samba-HOWTO-Collection/NetworkBrowsing.html +share/samba/swat/help/Samba-HOWTO-Collection/Other-Clients.html +share/samba/swat/help/Samba-HOWTO-Collection/PolicyMgmt.html +share/samba/swat/help/Samba-HOWTO-Collection/Portability.html +share/samba/swat/help/Samba-HOWTO-Collection/ProfileMgmt.html +share/samba/swat/help/Samba-HOWTO-Collection/SWAT.html +share/samba/swat/help/Samba-HOWTO-Collection/SambaHA.html +share/samba/swat/help/Samba-HOWTO-Collection/ServerType.html +share/samba/swat/help/Samba-HOWTO-Collection/StandAloneServer.html +share/samba/swat/help/Samba-HOWTO-Collection/VFS.html +share/samba/swat/help/Samba-HOWTO-Collection/WME001.png +share/samba/swat/help/Samba-HOWTO-Collection/WME002.png +share/samba/swat/help/Samba-HOWTO-Collection/WME003.png +share/samba/swat/help/Samba-HOWTO-Collection/WME005.png +share/samba/swat/help/Samba-HOWTO-Collection/WME009.png +share/samba/swat/help/Samba-HOWTO-Collection/WME010.png +share/samba/swat/help/Samba-HOWTO-Collection/WME013.png +share/samba/swat/help/Samba-HOWTO-Collection/WME014.png +share/samba/swat/help/Samba-HOWTO-Collection/WXPP002.png +share/samba/swat/help/Samba-HOWTO-Collection/WXPP003.png +share/samba/swat/help/Samba-HOWTO-Collection/WXPP005.png +share/samba/swat/help/Samba-HOWTO-Collection/WXPP009.png +share/samba/swat/help/Samba-HOWTO-Collection/WXPP014.png +share/samba/swat/help/Samba-HOWTO-Collection/a_small.png +share/samba/swat/help/Samba-HOWTO-Collection/access1.png +share/samba/swat/help/Samba-HOWTO-Collection/browsing1.png +share/samba/swat/help/Samba-HOWTO-Collection/bugreport.html +share/samba/swat/help/Samba-HOWTO-Collection/compiling.html +share/samba/swat/help/Samba-HOWTO-Collection/cups1.png +share/samba/swat/help/Samba-HOWTO-Collection/cups2.png +share/samba/swat/help/Samba-HOWTO-Collection/diagnosis.html +share/samba/swat/help/Samba-HOWTO-Collection/domain-member.html +share/samba/swat/help/Samba-HOWTO-Collection/domain.png +share/samba/swat/help/Samba-HOWTO-Collection/ethereal1.png +share/samba/swat/help/Samba-HOWTO-Collection/ethereal2.png +share/samba/swat/help/Samba-HOWTO-Collection/go01.html +share/samba/swat/help/Samba-HOWTO-Collection/gpl.html +share/samba/swat/help/Samba-HOWTO-Collection/groupmapping.html +share/samba/swat/help/Samba-HOWTO-Collection/idmap-gid2sid.png +share/samba/swat/help/Samba-HOWTO-Collection/idmap-sid2gid.png +share/samba/swat/help/Samba-HOWTO-Collection/idmap-sid2uid.png +share/samba/swat/help/Samba-HOWTO-Collection/idmap-store-gid2sid.png +share/samba/swat/help/Samba-HOWTO-Collection/idmap-uid2sid.png +share/samba/swat/help/Samba-HOWTO-Collection/idmap_winbind_no_loop.png +share/samba/swat/help/Samba-HOWTO-Collection/index.html +share/samba/swat/help/Samba-HOWTO-Collection/install.html +share/samba/swat/help/Samba-HOWTO-Collection/integrate-ms-networks.html +share/samba/swat/help/Samba-HOWTO-Collection/introduction.html +share/samba/swat/help/Samba-HOWTO-Collection/ix01.html +share/samba/swat/help/Samba-HOWTO-Collection/locking.html +share/samba/swat/help/Samba-HOWTO-Collection/migration.html +share/samba/swat/help/Samba-HOWTO-Collection/msdfs.html +share/samba/swat/help/Samba-HOWTO-Collection/optional.html +share/samba/swat/help/Samba-HOWTO-Collection/pam.html +share/samba/swat/help/Samba-HOWTO-Collection/passdb.html +share/samba/swat/help/Samba-HOWTO-Collection/pdftoepsonusb.png +share/samba/swat/help/Samba-HOWTO-Collection/pdftosocket.png +share/samba/swat/help/Samba-HOWTO-Collection/pr01.html +share/samba/swat/help/Samba-HOWTO-Collection/pr02.html +share/samba/swat/help/Samba-HOWTO-Collection/pr03.html +share/samba/swat/help/Samba-HOWTO-Collection/printing.html +share/samba/swat/help/Samba-HOWTO-Collection/problems.html +share/samba/swat/help/Samba-HOWTO-Collection/samba-bdc.html +share/samba/swat/help/Samba-HOWTO-Collection/samba-pdc.html +share/samba/swat/help/Samba-HOWTO-Collection/securing-samba.html +share/samba/swat/help/Samba-HOWTO-Collection/speed.html +share/samba/swat/help/Samba-HOWTO-Collection/troubleshooting.html +share/samba/swat/help/Samba-HOWTO-Collection/trusts1.png +share/samba/swat/help/Samba-HOWTO-Collection/type.html +share/samba/swat/help/Samba-HOWTO-Collection/unicode.html +share/samba/swat/help/Samba-HOWTO-Collection/upgrading-to-3.0.html +share/samba/swat/help/Samba-HOWTO-Collection/w2kp001.png +share/samba/swat/help/Samba-HOWTO-Collection/w2kp002.png +share/samba/swat/help/Samba-HOWTO-Collection/w2kp003.png +share/samba/swat/help/Samba-HOWTO-Collection/w2kp004.png +share/samba/swat/help/Samba-HOWTO-Collection/w2kp005.png +share/samba/swat/help/Samba-HOWTO-Collection/winbind.html +share/samba/swat/help/Samba-HOWTO-Collection/wxpp001.png +share/samba/swat/help/Samba-HOWTO-Collection/wxpp004.png +share/samba/swat/help/Samba-HOWTO-Collection/wxpp006.png +share/samba/swat/help/Samba-HOWTO-Collection/wxpp007.png +share/samba/swat/help/Samba-HOWTO-Collection/wxpp008.png share/samba/swat/help/editreg.1.html share/samba/swat/help/findsmb.1.html -share/samba/swat/help/guide/2000users.html -share/samba/swat/help/guide/AccountingNetwork.png -share/samba/swat/help/guide/Big500users.html -share/samba/swat/help/guide/Charity-Network.png -share/samba/swat/help/guide/DomApps.html -share/samba/swat/help/guide/Domain-WorkgroupAnnouncement.png -share/samba/swat/help/guide/HA.html -share/samba/swat/help/guide/HostAnnouncment.png -share/samba/swat/help/guide/LocalMasterAnnouncement.png -share/samba/swat/help/guide/NullConnect.png -share/samba/swat/help/guide/UNIX-Samba-and-LDAP.png -share/samba/swat/help/guide/UserConnect.png -share/samba/swat/help/guide/UserMgrNT4.png -share/samba/swat/help/guide/WINREPRESSME-Capture.png -share/samba/swat/help/guide/WINREPRESSME-Capture2.png -share/samba/swat/help/guide/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png -share/samba/swat/help/guide/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png -share/samba/swat/help/guide/WindowsXP-NullConnection.png -share/samba/swat/help/guide/WindowsXP-UserConnection.png -share/samba/swat/help/guide/XP-screen001.png -share/samba/swat/help/guide/acct2net.png -share/samba/swat/help/guide/appendix.html -share/samba/swat/help/guide/ch7-dual-additive-LDAP-Ok.png -share/samba/swat/help/guide/ch7-dual-additive-LDAP.png -share/samba/swat/help/guide/ch7-fail-overLDAP.png -share/samba/swat/help/guide/ch7-singleLDAP.png -share/samba/swat/help/guide/ch8-migration.png -share/samba/swat/help/guide/chap4-net.png -share/samba/swat/help/guide/chap5-net.png -share/samba/swat/help/guide/chap6-net.png -share/samba/swat/help/guide/chap7-idresol.png -share/samba/swat/help/guide/chap7-net-A.png -share/samba/swat/help/guide/chap7-net-Ar.png -share/samba/swat/help/guide/chap7-net.png -share/samba/swat/help/guide/chap7-net2-B.png -share/samba/swat/help/guide/chap7-net2-Br.png -share/samba/swat/help/guide/chap7-net2.png -share/samba/swat/help/guide/chap7-net2r.png -share/samba/swat/help/guide/chap7-netr.png -share/samba/swat/help/guide/chap9-ADSDC.png -share/samba/swat/help/guide/chap9-SambaDC.png -share/samba/swat/help/guide/go01.html -share/samba/swat/help/guide/happy.html -share/samba/swat/help/guide/index.html -share/samba/swat/help/guide/ix01.html -share/samba/swat/help/guide/kerberos.html -share/samba/swat/help/guide/lam-config.png -share/samba/swat/help/guide/lam-group-members.png -share/samba/swat/help/guide/lam-groups.png -share/samba/swat/help/guide/lam-hosts.png -share/samba/swat/help/guide/lam-login.png -share/samba/swat/help/guide/lam-users.png -share/samba/swat/help/guide/migration.html -share/samba/swat/help/guide/openmag.png -share/samba/swat/help/guide/pr01.html -share/samba/swat/help/guide/pr02.html -share/samba/swat/help/guide/pr03.html -share/samba/swat/help/guide/preface.html -share/samba/swat/help/guide/primer.html -share/samba/swat/help/guide/secure.html -share/samba/swat/help/guide/simple.html -share/samba/swat/help/guide/small.html -share/samba/swat/help/guide/unixclients.html -share/samba/swat/help/guide/wxpp001.png -share/samba/swat/help/guide/wxpp004.png -share/samba/swat/help/guide/wxpp006.png -share/samba/swat/help/guide/wxpp007.png -share/samba/swat/help/guide/wxpp008.png -share/samba/swat/help/guide/wxpp010.png -share/samba/swat/help/guide/wxpp011.png -share/samba/swat/help/guide/wxpp012.png -share/samba/swat/help/guide/wxpp013.png -share/samba/swat/help/guide/wxpp015.png -share/samba/swat/help/howto/10small.png -share/samba/swat/help/howto/11small.png -share/samba/swat/help/howto/12small.png -share/samba/swat/help/howto/13small.png -share/samba/swat/help/howto/14small.png -share/samba/swat/help/howto/1small.png -share/samba/swat/help/howto/2small.png -share/samba/swat/help/howto/3small.png -share/samba/swat/help/howto/4small.png -share/samba/swat/help/howto/5small.png -share/samba/swat/help/howto/6small.png -share/samba/swat/help/howto/7small.png -share/samba/swat/help/howto/8small.png -share/samba/swat/help/howto/9small.png -share/samba/swat/help/howto/AccessControls.html -share/samba/swat/help/howto/AdvancedNetworkManagement.html -share/samba/swat/help/howto/Appendix.html -share/samba/swat/help/howto/Backup.html -share/samba/swat/help/howto/CUPS-printing.html -share/samba/swat/help/howto/ClientConfig.html -share/samba/swat/help/howto/DNSDHCP.html -share/samba/swat/help/howto/FastStart.html -share/samba/swat/help/howto/InterdomainTrusts.html -share/samba/swat/help/howto/IntroSMB.html -share/samba/swat/help/howto/NT4Migration.html -share/samba/swat/help/howto/NetworkBrowsing.html -share/samba/swat/help/howto/Other-Clients.html -share/samba/swat/help/howto/PolicyMgmt.html -share/samba/swat/help/howto/Portability.html -share/samba/swat/help/howto/ProfileMgmt.html -share/samba/swat/help/howto/SWAT.html -share/samba/swat/help/howto/SambaHA.html -share/samba/swat/help/howto/ServerType.html -share/samba/swat/help/howto/StandAloneServer.html -share/samba/swat/help/howto/VFS.html -share/samba/swat/help/howto/a_small.png -share/samba/swat/help/howto/access1.png -share/samba/swat/help/howto/browsing1.png -share/samba/swat/help/howto/bugreport.html -share/samba/swat/help/howto/compiling.html -share/samba/swat/help/howto/cups1.png -share/samba/swat/help/howto/cups2.png -share/samba/swat/help/howto/diagnosis.html -share/samba/swat/help/howto/domain-member.html -share/samba/swat/help/howto/domain.png -share/samba/swat/help/howto/ethereal1.png -share/samba/swat/help/howto/ethereal2.png -share/samba/swat/help/howto/go01.html -share/samba/swat/help/howto/groupmapping.html -share/samba/swat/help/howto/idmap-gid2sid.png -share/samba/swat/help/howto/idmap-groups.png -share/samba/swat/help/howto/idmap-sid2gid.png -share/samba/swat/help/howto/idmap-sid2uid.png -share/samba/swat/help/howto/idmap-store-gid2sid.png -share/samba/swat/help/howto/idmap-uid2sid.png -share/samba/swat/help/howto/idmap.png -share/samba/swat/help/howto/idmap_winbind_no_loop.png -share/samba/swat/help/howto/index.html -share/samba/swat/help/howto/install.html -share/samba/swat/help/howto/integrate-ms-networks.html -share/samba/swat/help/howto/introduction.html -share/samba/swat/help/howto/ix01.html -share/samba/swat/help/howto/locking.html -share/samba/swat/help/howto/migration.html -share/samba/swat/help/howto/msdfs.html -share/samba/swat/help/howto/optional.html -share/samba/swat/help/howto/pam.html -share/samba/swat/help/howto/passdb.html -share/samba/swat/help/howto/pdftoepsonusb.png -share/samba/swat/help/howto/pdftosocket.png -share/samba/swat/help/howto/pr01.html -share/samba/swat/help/howto/pr02.html -share/samba/swat/help/howto/pr03.html -share/samba/swat/help/howto/printing.html -share/samba/swat/help/howto/problems.html -share/samba/swat/help/howto/samba-bdc.html -share/samba/swat/help/howto/samba-pdc.html -share/samba/swat/help/howto/securing-samba.html -share/samba/swat/help/howto/speed.html -share/samba/swat/help/howto/troubleshooting.html -share/samba/swat/help/howto/trusts1.png -share/samba/swat/help/howto/type.html -share/samba/swat/help/howto/unicode.html -share/samba/swat/help/howto/upgrading-to-3.0.html -share/samba/swat/help/howto/winbind.html +share/samba/swat/help/index.html share/samba/swat/help/lmhosts.5.html share/samba/swat/help/log2pcap.1.html +share/samba/swat/help/manpages.html share/samba/swat/help/mount.cifs.8.html share/samba/swat/help/net.8.html share/samba/swat/help/nmbd.8.html @@ -553,13 +563,15 @@ share/samba/swat/using_samba/toc.html @dirrm share/samba/swat/images @exec ${MKDIR} %D/share/samba/swat/help/images @dirrm share/samba/swat/help/images -@exec ${MKDIR} %D/share/samba/swat/help/howto/images -@dirrm share/samba/swat/help/howto/images -@dirrm share/samba/swat/help/howto -@exec ${MKDIR} %D/share/samba/swat/help/guide/images -@dirrm share/samba/swat/help/guide/images -@dirrm share/samba/swat/help/guide -@dirrm share/samba/swat/help/devel +@exec ${MKDIR} %D/share/samba/swat/help/Samba-HOWTO-Collection/images +@dirrm share/samba/swat/help/Samba-HOWTO-Collection/images +@dirrm share/samba/swat/help/Samba-HOWTO-Collection +@exec ${MKDIR} %D/share/samba/swat/help/Samba-Guide/images +@dirrm share/samba/swat/help/Samba-Guide/images +@dirrm share/samba/swat/help/Samba-Guide +@exec ${MKDIR} %D/share/samba/swat/help/Samba-Developers-Guide/images +@dirrm share/samba/swat/help/Samba-Developers-Guide/images +@dirrm share/samba/swat/help/Samba-Developers-Guide @dirrm share/samba/swat/help @dirrm share/samba/swat @dirrm share/samba diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk index e0002620b47..00378e73e1c 100644 --- a/net/samba/buildlink3.mk +++ b/net/samba/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/04/15 16:28:11 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/09/14 17:18:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SAMBA_BUILDLINK3_MK:= ${SAMBA_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsamba} BUILDLINK_PACKAGES+= samba .if !empty(SAMBA_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.samba+= samba>=3.0.2anb1 +BUILDLINK_DEPENDS.samba+= samba>=3.0.7 BUILDLINK_PKGSRCDIR.samba?= ../../net/samba .endif # SAMBA_BUILDLINK3_MK diff --git a/net/samba/distinfo b/net/samba/distinfo index aaa358b693e..32d6922a23a 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.34 2004/07/23 15:11:30 tron Exp $ +$NetBSD: distinfo,v 1.35 2004/09/14 17:18:06 jlam Exp $ -SHA1 (samba-3.0.5.tar.gz) = 15ca6660b385b936192b43a8da18dc625d7979bf -Size (samba-3.0.5.tar.gz) = 15076996 bytes -SHA1 (patch-aa) = 26698e5f98fca1bf3632809e2886f7a880c02117 +SHA1 (samba-3.0.7.tar.gz) = 7eff8b831e49bbed2cebfc368af55715c7abf635 +Size (samba-3.0.7.tar.gz) = 15012667 bytes SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644 SHA1 (patch-ad) = b75770eb6fc7ff5d26764fced83e26fd6cf153af SHA1 (patch-ae) = cf3a040f04142df534abe54b66156a48697b665d -SHA1 (patch-af) = dce26803c2a9c04d714c0929ae2efeaa1487aeda +SHA1 (patch-af) = bc0cead8f8350001e5291443821e875bab540fc3 diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa deleted file mode 100644 index 500407f761a..00000000000 --- a/net/samba/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.27 2004/05/13 06:44:56 xtraeme Exp $ - ---- Makefile.in.orig 2004-05-13 07:57:15.000000000 +0200 -+++ Makefile.in 2004-05-13 07:58:12.000000000 +0200 -@@ -58,7 +58,7 @@ - BINDIR = @bindir@ - # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode. - SBINDIR = @sbindir@ --LIBDIR = @libdir@ -+LIBDIR = @libdir@/samba - VFSLIBDIR = $(LIBDIR)/vfs - PDBLIBDIR = $(LIBDIR)/pdb - RPCLIBDIR = $(LIBDIR)/rpc diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af index a9bc6b32d9a..f383a9cebaa 100644 --- a/net/samba/patches/patch-af +++ b/net/samba/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.5 2004/01/11 02:26:31 jlam Exp $ +$NetBSD: patch-af,v 1.6 2004/09/14 17:18:06 jlam Exp $ ---- ../examples/smb.conf.default.orig Fri Aug 15 16:39:44 2003 +--- ../examples/smb.conf.default.orig Thu Jul 8 13:06:16 2004 +++ ../examples/smb.conf.default -@@ -21,7 +21,7 @@ +@@ -26,7 +26,7 @@ workgroup = MYGROUP # server string is the equivalent of the NT Description field @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.5 2004/01/11 02:26:31 jlam Exp $ # Security mode. Defines in which mode Samba will operate. Possible # values are share, user, server, domain and ads. Most people will want -@@ -58,10 +58,10 @@ +@@ -63,10 +63,10 @@ # this tells Samba to use a separate log file for each machine # that connects @@ -24,7 +24,7 @@ $NetBSD: patch-af,v 1.5 2004/01/11 02:26:31 jlam Exp $ # Use password server option only with security = server # The argument list may include: -@@ -91,7 +91,7 @@ +@@ -96,7 +96,7 @@ # and the manual pages for details. # You may want to add the following on a Linux system: # SO_RCVBUF=8192 SO_SNDBUF=8192 @@ -33,7 +33,7 @@ $NetBSD: patch-af,v 1.5 2004/01/11 02:26:31 jlam Exp $ # Configure Samba to use multiple interfaces # If you have multiple network interfaces then you must list them -@@ -147,7 +147,7 @@ +@@ -152,7 +152,7 @@ # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names # via DNS nslookups. The default is NO. @@ -42,7 +42,7 @@ $NetBSD: patch-af,v 1.5 2004/01/11 02:26:31 jlam Exp $ # These scripts are used on a domain controller or stand-alone # machine to add or delete corresponding unix accounts -@@ -186,7 +186,7 @@ +@@ -191,7 +191,7 @@ # specifically define each individual printer [printers] comment = All Printers |