Update net/samba to 3.0.4.

Common bugs fixed in Samba 3.0.3 include:

  o Crash bugs and change notify issues in Samba's printing code.
  o Honoring secondary group membership on domain member servers.
  o TDB scalability issue surrounding the TDB_CLEAR_IF_FIRST flag.
  o Substitution errors for %[UuGg] in smb.conf.
  o winbindd crashes when using ADS security mode.
  o SMB signing errors.
  o Delays in winbindd startup caused by unnecessary
    connections to trusted domain controllers.
  o Various small memory leaks.
  o Winbindd failing due to expired Kerberos tickets.

New features introduced in Samba 3.0.3 include:

  o Improved support for i18n character sets.
  o Support for account lockout policy based on
    bad password attempts.
  o Improved support for long password changes (>14
    characters) and strong password enforcement.
  o Support for Windows aliases (i.e. nested groups).
  o Experimental support for storing DOS attribute on files
    and folders in Extended Attributes.
  o Support for local nested groups via winbindd.
  o Specifying options to be passed directly to the CUPS libraries.

And more... please review "WHATSNEW.txt".

6 files changed, 227 insertions, 69 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 945e40f73a0..968b7c31104 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5918 2004/05/13 04:29:12 xtraeme Exp $
+$NetBSD: CHANGES,v 1.5919 2004/05/13 06:44:55 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2501,3 +2501,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated tcl to 8.4.6nb4 [minskim 2004-05-13]
 	Updated amaya to 8.5 [xtraeme 2004-05-13]
 	Updated fluxbox to 0.9.9 [xtraeme 2004-05-13]
+	Updated samba to 3.0.4 [xtraeme 2004-05-13]
diff --git a/doc/TODO b/doc/TODO
index 613bd89ec15..043939db5ce 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -339,7 +339,6 @@ Suggested package updates
 	o ruby-1.8.1 [taca]
 	o sablecc-2.18.1
 	o samba-2.2.9
-	o samba-3.0.4
 	o sawfish-1.3
 	o scm-5d9
 	o scmxx-0.7.0
diff --git a/net/samba/Makefile b/net/samba/Makefile
index c0e0e64d77e..ffecb2f0d61 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.121 2004/04/21 21:09:32 cube Exp $
+# $NetBSD: Makefile,v 1.122 2004/05/13 06:44:56 xtraeme Exp $
 
-DISTNAME=		samba-3.0.2a
-PKGREVISION=		1
+DISTNAME=		samba-3.0.4
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
 			ftp://ring.asahi-net.or.jp/pub/net/samba/ \
@@ -11,7 +10,7 @@ COUNTRY_MIRRORS=	au1 ca fi fr de it pl ru sg se us1 us6
 .for COUNTRY in ${COUNTRY_MIRRORS}
 MASTER_SITES+=		ftp://${COUNTRY}.samba.org/pub/samba/
 .endfor
-EXTRACT_SUFX=		.tar.bz2
+#EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.samba.org/
@@ -151,15 +150,14 @@ post-build:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
 
 post-install:
-	cd ${PREFIX}/lib && ln -s libsmbclient.so libsmbclient.so.0
-	${RMDIR} ${SAMBA_LIBDIR}/auth
-	${RMDIR} ${SAMBA_LIBDIR}/idmap
-	${RMDIR} ${SAMBA_LIBDIR}/pdb
-	${RMDIR} ${SAMBA_LIBDIR}/rpc
+	-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}
 	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_winbind.so ${PREFIX}/lib
 	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_wins.so ${PREFIX}/lib
-	cd ${WRKSRC}/../docs/Registry; for file in *.reg; do		\
+	cd ${WRKSRC}/../docs/registry; for file in *.reg; do		\
 		${INSTALL_DATA} $$file ${DOCDIR}/$$file;		\
 	done
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 34fbce8fd25..fad735a1f56 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2004/04/23 22:07:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.21 2004/05/13 06:44:56 xtraeme Exp $
 bin/findsmb
 bin/net
 bin/nmblookup
@@ -45,11 +45,13 @@ lib/samba/valid.dat
 lib/samba/vfs/audit.so
 lib/samba/vfs/cap.so
 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/netatalk.so
 lib/samba/vfs/readonly.so
 lib/samba/vfs/recycle.so
+lib/samba/vfs/shadow_copy.so
 man/man1/editreg.1
 man/man1/findsmb.1
 man/man1/log2pcap.1
@@ -72,6 +74,7 @@ man/man1/vfstest.1
 man/man1/wbinfo.1
 man/man5/lmhosts.5
 man/man5/smb.conf.5
+man/man5/smbgetrc.5
 man/man5/smbpasswd.5
 man/man7/samba.7
 man/man8/mount.cifs.8
@@ -113,66 +116,204 @@ share/examples/samba/mksmbpasswd.sh
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
 share/examples/samba/updatesmbpasswd.sh
-share/samba/swat/help/AccessControls.html
-share/samba/swat/help/AdvancedNetworkManagement.html
-share/samba/swat/help/Appendixes.html
-share/samba/swat/help/Backup.html
-share/samba/swat/help/CUPS-printing.html
-share/samba/swat/help/ClientConfig.html
-share/samba/swat/help/DNSDHCP.html
-share/samba/swat/help/FastStart.html
-share/samba/swat/help/Further-Resources.html
-share/samba/swat/help/InterdomainTrusts.html
-share/samba/swat/help/IntroSMB.html
-share/samba/swat/help/NT4Migration.html
-share/samba/swat/help/NetworkBrowsing.html
-share/samba/swat/help/Other-Clients.html
-share/samba/swat/help/PolicyMgmt.html
-share/samba/swat/help/Portability.html
-share/samba/swat/help/ProfileMgmt.html
-share/samba/swat/help/SWAT.html
-share/samba/swat/help/Samba-Developers-Guide.html
-share/samba/swat/help/Samba-HOWTO-Collection.html
-share/samba/swat/help/SambaHA.html
-share/samba/swat/help/ServerType.html
-share/samba/swat/help/StandAloneServer.html
-share/samba/swat/help/VFS.html
-share/samba/swat/help/bugreport.html
-share/samba/swat/help/compiling.html
-share/samba/swat/help/diagnosis.html
-share/samba/swat/help/domain-member.html
+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/editreg.1.html
 share/samba/swat/help/findsmb.1.html
-share/samba/swat/help/groupmapping.html
-share/samba/swat/help/index.html
-share/samba/swat/help/install.html
-share/samba/swat/help/integrate-ms-networks.html
-share/samba/swat/help/introduction.html
-share/samba/swat/help/ix01.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/lmhosts.5.html
-share/samba/swat/help/locking.html
 share/samba/swat/help/log2pcap.1.html
-share/samba/swat/help/migration.html
 share/samba/swat/help/mount.cifs.8.html
-share/samba/swat/help/msdfs.html
 share/samba/swat/help/net.8.html
 share/samba/swat/help/nmbd.8.html
 share/samba/swat/help/nmblookup.1.html
 share/samba/swat/help/ntlm_auth.1.html
-share/samba/swat/help/optional.html
-share/samba/swat/help/pam.html
-share/samba/swat/help/passdb.html
 share/samba/swat/help/pdbedit.8.html
-share/samba/swat/help/pr01.html
-share/samba/swat/help/pr02.html
-share/samba/swat/help/printing.html
-share/samba/swat/help/problems.html
 share/samba/swat/help/profiles.1.html
 share/samba/swat/help/rpcclient.1.html
-share/samba/swat/help/samba-bdc.html
-share/samba/swat/help/samba-pdc.html
 share/samba/swat/help/samba.7.html
-share/samba/swat/help/securing-samba.html
 share/samba/swat/help/smb.conf.5.html
 share/samba/swat/help/smbcacls.1.html
 share/samba/swat/help/smbclient.1.html
@@ -180,6 +321,7 @@ share/samba/swat/help/smbcontrol.1.html
 share/samba/swat/help/smbcquotas.1.html
 share/samba/swat/help/smbd.8.html
 share/samba/swat/help/smbget.1.html
+share/samba/swat/help/smbgetrc.5.html
 share/samba/swat/help/smbmnt.8.html
 share/samba/swat/help/smbmount.8.html
 share/samba/swat/help/smbpasswd.5.html
@@ -190,20 +332,14 @@ share/samba/swat/help/smbstatus.1.html
 share/samba/swat/help/smbtar.1.html
 share/samba/swat/help/smbtree.1.html
 share/samba/swat/help/smbumount.8.html
-share/samba/swat/help/speed.html
 share/samba/swat/help/swat.8.html
 share/samba/swat/help/tdbbackup.8.html
 share/samba/swat/help/tdbdump.8.html
 share/samba/swat/help/testparm.1.html
 share/samba/swat/help/testprns.1.html
-share/samba/swat/help/troubleshooting.html
-share/samba/swat/help/type.html
-share/samba/swat/help/unicode.html
-share/samba/swat/help/upgrading-to-3.0.html
 share/samba/swat/help/vfstest.1.html
 share/samba/swat/help/wbinfo.1.html
 share/samba/swat/help/welcome.html
-share/samba/swat/help/winbind.html
 share/samba/swat/help/winbindd.8.html
 share/samba/swat/images/globals.gif
 share/samba/swat/images/home.gif
@@ -401,12 +537,22 @@ share/samba/swat/using_samba/toc.html
 @dirrm share/samba/swat/lang/tr/help
 @dirrm share/samba/swat/lang/tr
 @dirrm share/samba/swat/lang/ja/include
+@exec ${MKDIR} %D/share/samba/swat/lang/ja/images
 @dirrm share/samba/swat/lang/ja/images
 @dirrm share/samba/swat/lang/ja/help
 @dirrm share/samba/swat/lang/ja
 @dirrm share/samba/swat/lang
 @dirrm share/samba/swat/include
 @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
 @dirrm share/samba/swat/help
 @dirrm share/samba/swat
 @dirrm share/samba
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 86e4001cb71..d9d552af436 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.32 2004/02/17 11:51:54 jlam Exp $
+$NetBSD: distinfo,v 1.33 2004/05/13 06:44:56 xtraeme Exp $
 
-SHA1 (samba-3.0.2a.tar.bz2) = dbe0341a97554c78ed024e0122dd5b48fdde10b5
-Size (samba-3.0.2a.tar.bz2) = 9289178 bytes
+SHA1 (samba-3.0.4.tar.gz) = 1c7be860ad4e27f52076888f755ce72598f946d3
+Size (samba-3.0.4.tar.gz) = 15046252 bytes
+SHA1 (patch-aa) = 26698e5f98fca1bf3632809e2886f7a880c02117
 SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644
 SHA1 (patch-ad) = b75770eb6fc7ff5d26764fced83e26fd6cf153af
 SHA1 (patch-ae) = cf3a040f04142df534abe54b66156a48697b665d
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
new file mode 100644
index 00000000000..500407f761a
--- /dev/null
+++ b/net/samba/patches/patch-aa
@@ -0,0 +1,13 @@
+$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