Update "samba" package to version 3.0.30. Changes since 3.0.28a:

- Fix for CVE-2008-1105.
- Remove man pages for ldb tools not included in Samba 3.0.
- Fix build for pam_smbpass.
- Fix a crash in tdb_wrap_log().
- BUG 5267: Fix for nmbd termination problems when no interfaces
  found.
- BUG 5326: OS/2 servers give strange "high word" replies for
  print jobs.
- Remove MS-DFS check that required the target host be ourself.
- BUG 5372: Fix high CPU usage of cupsd on large print servers
  by using more efficient CUPS queries in smbd.
- Rewrite integer wrap checks to deal with gcc 4.x optimizations.
- BUG 5095: Fix the enforcement of the "Manage Documents" access right.
- Don't free memory from getpass() in mount.cifs.
- BUG 5460: Fix MS-DFS referral problem in server code.
- Fix bug in Winbind that caused the parent to ignore dead children.
- Fix compile warnings.
- Fix build for pam_smbpass.
- Document build fixes.
- BUG 4235: Improve compliance to the Squid helper protocol.
- BUG 5107: Fix handling of large DNS replies on AIX and Solaris.
- Prevent cycle in Wibind's list of children when reaping dead processes.
- BUG 5419: Fix memory leak in ads_do_search_all_args() (merge from v3-2).
- Fix winbind NETLOGON credential chain on a samba dc for w2k8 trusts.
- Fix client connections and negotiation with Windows 2008 DCs
  in member server code.
- Add NT_STATUS_DOWNGRADE_DETECTED error code (merge from v3-2).
- BUG 5430: Fix pam_winbind.so on Solaris (requires -lsocket).
- Re-add samr getdispinfoindex parsing which got lost in the glue commit.
- BUG 5461: Implement a very basic _samr_GetDisplayEnumerationIndex().
  Corrects interop problem between Citrix PM and a Samba DC.
- BUG 3840: Fix smbclient connecting to NetApp filers when using
  whitespace in the user's password.
- BUG 4901: Fix behavior of "ldap passwd sync = only".
- BUG 5317: Fix debug output from domain_client_validate().
- BUG 5338: Fix format string bug in rpcclient.
- Ensure that "wbinfo -a trusted\\user%password" works correctly
  on a Samba DC with trusts.
- BUG 5336: Fix SetUsetrInfo(level 25) to update the pwdLastSet
  attribute.
- BUG 5350: Fallback to anonymous sessions if not trust password
  could be obtained on Samba DCs and member servers.
- BUG 5366: Fix password chat on Sun OpenSolaris (Nevada).
- Fix signing problem in the client with trans requests.
- Fix alignment bug hitting Solaris with "reset in zero vc" activated.
- Fix build with glibc 2.8.
- Enable winbind child processes to do something with signals, in
  particular closing and reopening logs on SIGHUP.
- Documentation cleanup after r emerging docs from svn to git and
  back-porting from the v3-2 branch.
- Add implementation of machine-authenticated connection to netlogon
  pipe used when connecting to win2k and newer domain controllers.
- Fix trusted users on a DC that uses the old idmap syntax.
- Only have Winbind cache domain password policies that were
  successfully retrieved.
- Fix alignment bug when marshalling printer data replies.
- Fix DeleteDriverDriverEx() checks to prevent removing in use files.

12 files changed, 55 insertions, 420 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 67d025243e4..5880f9fc144 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.182 2008/05/28 15:39:55 drochner Exp $
+# $NetBSD: Makefile,v 1.183 2008/06/28 22:51:21 tron Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=		samba-${VERSION}
-PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${SAMBA_MIRRORS:=old-versions/}
 
@@ -13,7 +12,7 @@ MAINTAINER=		jlam@pkgsrc.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite
 
-VERSION=		3.0.28a
+VERSION=		3.0.30
 CONFLICTS+=		ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]*	\
 			winbind-[0-9]*
 MAKE_JOBS_SAFE=		NO
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 6e2ce5987fe..55312500bb6 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2008/04/12 22:43:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.40 2008/06/28 22:51:21 tron Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -128,6 +128,7 @@ man/man8/vfs_readahead.8
 man/man8/vfs_readonly.8
 man/man8/vfs_recycle.8
 man/man8/vfs_shadow_copy.8
+man/man8/vfs_xattr_tdb.8
 man/man8/winbindd.8
 ${PLIST.cifsmount}sbin/mount.cifs
 sbin/nmbd
@@ -171,10 +172,10 @@ 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/gpl.html
 share/samba/swat/help/Samba3-ByExample/happy.html
 share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
 share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
@@ -277,6 +278,7 @@ 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
@@ -286,7 +288,6 @@ 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/gpl.html
 share/samba/swat/help/Samba3-HOWTO/groupmapping.html
 share/samba/swat/help/Samba3-HOWTO/idmapper.html
 share/samba/swat/help/Samba3-HOWTO/images/10small.png
@@ -431,6 +432,7 @@ 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_shadow_copy.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/winbindd.8.html
@@ -457,171 +459,6 @@ 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
-share/samba/swat/using_samba/appa.html
-share/samba/swat/using_samba/appb.html
-share/samba/swat/using_samba/appc.html
-share/samba/swat/using_samba/appd.html
-share/samba/swat/using_samba/appe.html
-share/samba/swat/using_samba/appf.html
-share/samba/swat/using_samba/appg.html
-share/samba/swat/using_samba/ch00.html
-share/samba/swat/using_samba/ch01.html
-share/samba/swat/using_samba/ch02.html
-share/samba/swat/using_samba/ch03.html
-share/samba/swat/using_samba/ch04.html
-share/samba/swat/using_samba/ch05.html
-share/samba/swat/using_samba/ch06.html
-share/samba/swat/using_samba/ch07.html
-share/samba/swat/using_samba/ch08.html
-share/samba/swat/using_samba/ch09.html
-share/samba/swat/using_samba/ch10.html
-share/samba/swat/using_samba/ch11.html
-share/samba/swat/using_samba/ch12.html
-share/samba/swat/using_samba/figs/sam2_0101.gif
-share/samba/swat/using_samba/figs/sam2_0102.gif
-share/samba/swat/using_samba/figs/sam2_0103.gif
-share/samba/swat/using_samba/figs/sam2_0104.gif
-share/samba/swat/using_samba/figs/sam2_0105.gif
-share/samba/swat/using_samba/figs/sam2_0106.gif
-share/samba/swat/using_samba/figs/sam2_0107.gif
-share/samba/swat/using_samba/figs/sam2_0108.gif
-share/samba/swat/using_samba/figs/sam2_0109.gif
-share/samba/swat/using_samba/figs/sam2_0110.gif
-share/samba/swat/using_samba/figs/sam2_0111.gif
-share/samba/swat/using_samba/figs/sam2_0112.gif
-share/samba/swat/using_samba/figs/sam2_0113.gif
-share/samba/swat/using_samba/figs/sam2_0114.gif
-share/samba/swat/using_samba/figs/sam2_0201.gif
-share/samba/swat/using_samba/figs/sam2_0202.gif
-share/samba/swat/using_samba/figs/sam2_0203.gif
-share/samba/swat/using_samba/figs/sam2_0204.gif
-share/samba/swat/using_samba/figs/sam2_0301.gif
-share/samba/swat/using_samba/figs/sam2_0302.gif
-share/samba/swat/using_samba/figs/sam2_0303.gif
-share/samba/swat/using_samba/figs/sam2_0304.gif
-share/samba/swat/using_samba/figs/sam2_0305.gif
-share/samba/swat/using_samba/figs/sam2_0306.gif
-share/samba/swat/using_samba/figs/sam2_0307.gif
-share/samba/swat/using_samba/figs/sam2_0308.gif
-share/samba/swat/using_samba/figs/sam2_0309.gif
-share/samba/swat/using_samba/figs/sam2_0310.gif
-share/samba/swat/using_samba/figs/sam2_0311.gif
-share/samba/swat/using_samba/figs/sam2_0312.gif
-share/samba/swat/using_samba/figs/sam2_0313.gif
-share/samba/swat/using_samba/figs/sam2_0314.gif
-share/samba/swat/using_samba/figs/sam2_0315.gif
-share/samba/swat/using_samba/figs/sam2_0316.gif
-share/samba/swat/using_samba/figs/sam2_0317.gif
-share/samba/swat/using_samba/figs/sam2_0318.gif
-share/samba/swat/using_samba/figs/sam2_0319.gif
-share/samba/swat/using_samba/figs/sam2_0320.gif
-share/samba/swat/using_samba/figs/sam2_0321.gif
-share/samba/swat/using_samba/figs/sam2_0322.gif
-share/samba/swat/using_samba/figs/sam2_0323.gif
-share/samba/swat/using_samba/figs/sam2_0324.gif
-share/samba/swat/using_samba/figs/sam2_0325.gif
-share/samba/swat/using_samba/figs/sam2_0326.gif
-share/samba/swat/using_samba/figs/sam2_0327.gif
-share/samba/swat/using_samba/figs/sam2_0328.gif
-share/samba/swat/using_samba/figs/sam2_0329.gif
-share/samba/swat/using_samba/figs/sam2_0330.gif
-share/samba/swat/using_samba/figs/sam2_0331.gif
-share/samba/swat/using_samba/figs/sam2_0332.gif
-share/samba/swat/using_samba/figs/sam2_0333.gif
-share/samba/swat/using_samba/figs/sam2_0334.gif
-share/samba/swat/using_samba/figs/sam2_0335.gif
-share/samba/swat/using_samba/figs/sam2_0336.gif
-share/samba/swat/using_samba/figs/sam2_0337.gif
-share/samba/swat/using_samba/figs/sam2_0338.gif
-share/samba/swat/using_samba/figs/sam2_0339.gif
-share/samba/swat/using_samba/figs/sam2_0340.gif
-share/samba/swat/using_samba/figs/sam2_0341.gif
-share/samba/swat/using_samba/figs/sam2_0342.gif
-share/samba/swat/using_samba/figs/sam2_0343.gif
-share/samba/swat/using_samba/figs/sam2_0344.gif
-share/samba/swat/using_samba/figs/sam2_0345.gif
-share/samba/swat/using_samba/figs/sam2_0346.gif
-share/samba/swat/using_samba/figs/sam2_0347.gif
-share/samba/swat/using_samba/figs/sam2_0348.gif
-share/samba/swat/using_samba/figs/sam2_0349.gif
-share/samba/swat/using_samba/figs/sam2_0350.gif
-share/samba/swat/using_samba/figs/sam2_0351.gif
-share/samba/swat/using_samba/figs/sam2_0352.gif
-share/samba/swat/using_samba/figs/sam2_0353.gif
-share/samba/swat/using_samba/figs/sam2_0354.gif
-share/samba/swat/using_samba/figs/sam2_0355.gif
-share/samba/swat/using_samba/figs/sam2_0356.gif
-share/samba/swat/using_samba/figs/sam2_0357.gif
-share/samba/swat/using_samba/figs/sam2_0358.gif
-share/samba/swat/using_samba/figs/sam2_0359.gif
-share/samba/swat/using_samba/figs/sam2_0360.gif
-share/samba/swat/using_samba/figs/sam2_0361.gif
-share/samba/swat/using_samba/figs/sam2_0401.gif
-share/samba/swat/using_samba/figs/sam2_0402.gif
-share/samba/swat/using_samba/figs/sam2_0403.gif
-share/samba/swat/using_samba/figs/sam2_0404.gif
-share/samba/swat/using_samba/figs/sam2_0405.gif
-share/samba/swat/using_samba/figs/sam2_0406.gif
-share/samba/swat/using_samba/figs/sam2_0407.gif
-share/samba/swat/using_samba/figs/sam2_0408.gif
-share/samba/swat/using_samba/figs/sam2_0409.gif
-share/samba/swat/using_samba/figs/sam2_0410.gif
-share/samba/swat/using_samba/figs/sam2_0411.gif
-share/samba/swat/using_samba/figs/sam2_0412.gif
-share/samba/swat/using_samba/figs/sam2_0413.gif
-share/samba/swat/using_samba/figs/sam2_0414.gif
-share/samba/swat/using_samba/figs/sam2_0415.gif
-share/samba/swat/using_samba/figs/sam2_0416.gif
-share/samba/swat/using_samba/figs/sam2_0417.gif
-share/samba/swat/using_samba/figs/sam2_0501.gif
-share/samba/swat/using_samba/figs/sam2_0502.gif
-share/samba/swat/using_samba/figs/sam2_0503.gif
-share/samba/swat/using_samba/figs/sam2_0504.gif
-share/samba/swat/using_samba/figs/sam2_0505.gif
-share/samba/swat/using_samba/figs/sam2_0506.gif
-share/samba/swat/using_samba/figs/sam2_0507.gif
-share/samba/swat/using_samba/figs/sam2_0508.gif
-share/samba/swat/using_samba/figs/sam2_0601.gif
-share/samba/swat/using_samba/figs/sam2_0602.gif
-share/samba/swat/using_samba/figs/sam2_0603.gif
-share/samba/swat/using_samba/figs/sam2_0604.gif
-share/samba/swat/using_samba/figs/sam2_0605.gif
-share/samba/swat/using_samba/figs/sam2_0701.gif
-share/samba/swat/using_samba/figs/sam2_0801.gif
-share/samba/swat/using_samba/figs/sam2_0802.gif
-share/samba/swat/using_samba/figs/sam2_0803.gif
-share/samba/swat/using_samba/figs/sam2_0804.gif
-share/samba/swat/using_samba/figs/sam2_0805.gif
-share/samba/swat/using_samba/figs/sam2_0806.gif
-share/samba/swat/using_samba/figs/sam2_0807.gif
-share/samba/swat/using_samba/figs/sam2_0808.gif
-share/samba/swat/using_samba/figs/sam2_0809.gif
-share/samba/swat/using_samba/figs/sam2_0810.gif
-share/samba/swat/using_samba/figs/sam2_0811.gif
-share/samba/swat/using_samba/figs/sam2_0901.gif
-share/samba/swat/using_samba/figs/sam2_0902.gif
-share/samba/swat/using_samba/figs/sam2_0903.gif
-share/samba/swat/using_samba/figs/sam2_1001.gif
-share/samba/swat/using_samba/figs/sam2_1002.gif
-share/samba/swat/using_samba/figs/sam2_1003.gif
-share/samba/swat/using_samba/figs/sam2_1004.gif
-share/samba/swat/using_samba/figs/sam2_1005.gif
-share/samba/swat/using_samba/figs/sam2_1006.gif
-share/samba/swat/using_samba/figs/sam2_1101.gif
-share/samba/swat/using_samba/figs/sam2_1102.gif
-share/samba/swat/using_samba/figs/sam2_af01.gif
-share/samba/swat/using_samba/figs/sam2_af02.gif
-share/samba/swat/using_samba/figs/sam2_af03.gif
-share/samba/swat/using_samba/figs/sam2_af04.gif
-share/samba/swat/using_samba/figs/sam2_af05.gif
-share/samba/swat/using_samba/figs/sam2_af06.gif
-share/samba/swat/using_samba/figs/sam2_af07.gif
-share/samba/swat/using_samba/inx.html
-share/samba/swat/using_samba/samba2_s.gif
-share/samba/swat/using_samba/samba2_xs.gif
-share/samba/swat/using_samba/toc.html
-@dirrm share/samba/swat/using_samba/figs
-@dirrm share/samba/swat/using_samba
 @dirrm share/samba/swat/lang/tr/images
 @dirrm share/samba/swat/lang/tr/help
 @dirrm share/samba/swat/lang/tr
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 74483418a3a..df6a2e1c2db 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.62 2008/05/28 15:39:55 drochner Exp $
+$NetBSD: distinfo,v 1.63 2008/06/28 22:51:21 tron Exp $
 
-SHA1 (samba-3.0.28a.tar.gz) = b4829b133af3865f6518bae14af4d989b6f1c31a
-RMD160 (samba-3.0.28a.tar.gz) = 646680c49fd56d98430d325884a5911d406e13be
-Size (samba-3.0.28a.tar.gz) = 18172643 bytes
+SHA1 (samba-3.0.30.tar.gz) = 609c602d9a17ea05954fc9fc021cfd95227eaefb
+RMD160 (samba-3.0.30.tar.gz) = 49f2f77294cdab6d7ca9db878755db2384e897cc
+Size (samba-3.0.30.tar.gz) = 20510081 bytes
 SHA1 (patch-aa) = b323c778c0c4f01cd102d019a996914d0d7eb106
 SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
 SHA1 (patch-ae) = 28fc3d1ad158f8025f1f9ba8e170d93c31fa45ba
 SHA1 (patch-af) = 9f14842b7d0b5e66bf1d52bcacefe5e1aa392b7c
 SHA1 (patch-ag) = c73e717e053b6618b2a334602fefabe5a5f98a98
 SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
-SHA1 (patch-at) = a7f9ba91cee27bcfcc9bce2d06141bf01cd0ac38
+SHA1 (patch-at) = 8664f61528e589beba02094e74e2485b3a865eb9
 SHA1 (patch-au) = f1b86b6f3a161b485bf5507fa1da69352b5a5e93
 SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
 SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538
@@ -29,8 +29,7 @@ SHA1 (patch-bp) = 08f2387324aaec8161f3114de84d81c815dd8179
 SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
 SHA1 (patch-br) = fc0d4c1f638a534f86e59ed8ebaddbf1978fa64f
 SHA1 (patch-bs) = 1c08caf388e337497464097a11c909ddd5f9a3ff
-SHA1 (patch-bt) = 262a86f15af3550966e05949bb3c1e4325532c1f
-SHA1 (patch-bu) = ba28d950f8e1c14fa99a400b79cb4d6b587a7140
+SHA1 (patch-bu) = d53281ee030b00fe526e32d96fef94b683ca3550
 SHA1 (patch-bv) = 2d80f4e24edab32bf4f620f651e70b9e63d28cc5
 SHA1 (patch-bw) = 11f9b3713382a23075ed5980d7b8a2dbd11ecf54
 SHA1 (patch-ca) = 0c2c4c1bdb3348de3e8719cc468a6e0c28a36b73
@@ -40,9 +39,3 @@ SHA1 (patch-cg) = 2755a019759826a39c3e201f6a0d1646e6dd2fba
 SHA1 (patch-ch) = 3c4c404519154e294cee134ddb4d2b9c7d8e02a2
 SHA1 (patch-da) = 2dddd250b2207d658b02ff43b46199ce4305b7f8
 SHA1 (patch-db) = a43800408fae9bc2bfdd0db4d481dda6b936778b
-SHA1 (patch-ea) = 22ca7f088703ad11ba92b61afdf79b2b9cb0fd16
-SHA1 (patch-eb) = ee8b9e5daa2611e21eb9767fcdbabcbf779112de
-SHA1 (patch-ec) = bee1ce2c1ad1e7a98dff053774bb8aee00411389
-SHA1 (patch-ed) = cdeae921837f36ae87aba1b6a8a7d1ebdc84ae9c
-SHA1 (patch-ee) = 89ce3342fe7f0d83f738f4450f84ec91e7fed276
-SHA1 (patch-ef) = f15af3dfd6c8894713fe7e435a458b4a43c84035
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index f93253b2cb8..80fa3892244 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
+$NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
 
---- configure.orig	2008-03-08 10:58:14.000000000 -0500
-+++ configure
-@@ -667,6 +667,7 @@ target_vendor
+--- configure.orig	2008-05-28 15:15:44.000000000 +0100
++++ configure	2008-06-28 14:02:26.000000000 +0100
+@@ -667,6 +667,7 @@
  target_os
  configdir
  lockdir
@@ -10,7 +10,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  piddir
  logfilebase
  privatedir
-@@ -1395,6 +1396,7 @@ Optional Packages:
+@@ -1396,6 +1397,7 @@
    --with-privatedir=DIR   Where to put smbpasswd ($ac_default_prefix/private)
    --with-rootsbindir=DIR  Which directory to use for root sbin ($ac_default_prefix/sbin)
    --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)
@@ -18,7 +18,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
    --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)
    --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)
    --with-configdir=DIR    Where to put configuration files ($libdir)
-@@ -2136,6 +2138,7 @@ fi
+@@ -2137,6 +2139,7 @@
  
  rootsbindir="\${SBINDIR}"
  lockdir="\${VARDIR}/locks"
@@ -26,7 +26,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  piddir="\${VARDIR}/locks"
  test "${mandir}" || mandir="\${prefix}/man"
  logfilebase="\${VARDIR}"
-@@ -2150,7 +2153,8 @@ swatdir="\${prefix}/swat"
+@@ -2151,7 +2154,8 @@
  if test "${with_fhs+set}" = set; then
    withval=$with_fhs;  case "$withval" in
    yes)
@@ -36,7 +36,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
      piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
-@@ -2224,6 +2228,26 @@ fi
+@@ -2225,6 +2229,26 @@
  
  
  #################################################
@@ -63,7 +63,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  # set pid directory location
  
  # Check whether --with-piddir was given.
-@@ -2461,6 +2485,7 @@ fi
+@@ -2462,6 +2486,7 @@
  
  
  
@@ -71,7 +71,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  ## check for --enable-debug first before checking CFLAGS before
  ## so that we don't mix -O and -g
  # Check whether --enable-debug was given.
-@@ -31342,7 +31367,8 @@ done
+@@ -31343,7 +31368,8 @@
  
  
  
@@ -81,7 +81,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -46875,6 +46901,75 @@ _ACEOF
+@@ -46876,6 +46902,75 @@
  fi
  
  if test $iface = no; then
@@ -157,7 +157,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  { echo "$as_me:$LINENO: checking for iface ifconf" >&5
  echo $ECHO_N "checking for iface ifconf... $ECHO_C" >&6; }
  if test "${samba_cv_HAVE_IFACE_IFCONF+set}" = set; then
-@@ -50250,9 +50345,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+@@ -50251,9 +50346,9 @@
  
  
  
@@ -170,7 +170,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -50268,11 +50363,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -50269,11 +50364,11 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -184,7 +184,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
    ;
    return 0;
  }
-@@ -50295,13 +50390,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -50296,13 +50391,13 @@
  	 test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -200,7 +200,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  		  ac_cv_lib_ext_crypto=no
  fi
  
-@@ -50309,11 +50404,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -50310,11 +50405,11 @@
        conftest$ac_exeext conftest.$ac_ext
  
  fi
@@ -216,7 +216,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  _ACEOF
  
  fi
-@@ -63337,31 +63432,39 @@ case "$host_os" in
+@@ -63338,31 +63433,39 @@
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;
@@ -278,7 +278,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  		;;
  	*irix*)
  		# IRIX has differently named shared libraries
-@@ -67888,6 +67991,7 @@ target_vendor!$target_vendor$ac_delim
+@@ -67891,6 +67994,7 @@
  target_os!$target_os$ac_delim
  configdir!$configdir$ac_delim
  lockdir!$lockdir$ac_delim
@@ -286,7 +286,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  piddir!$piddir$ac_delim
  logfilebase!$logfilebase$ac_delim
  privatedir!$privatedir$ac_delim
-@@ -67931,7 +68035,6 @@ IDMAP_LIBS!$IDMAP_LIBS$ac_delim
+@@ -67934,7 +68038,6 @@
  KRB5_LIBS!$KRB5_LIBS$ac_delim
  UUID_LIBS!$UUID_LIBS$ac_delim
  LDAP_LIBS!$LDAP_LIBS$ac_delim
@@ -294,7 +294,7 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67973,6 +68076,7 @@ _ACEOF
+@@ -67976,6 +68079,7 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -302,12 +302,12 @@ $NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
  INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
  UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
  NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -68056,7 +68160,7 @@ SMBD_LIBS!$SMBD_LIBS$ac_delim
+@@ -68060,7 +68164,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/net/samba/patches/patch-bt b/net/samba/patches/patch-bt
deleted file mode 100644
index 66901a88141..00000000000
--- a/net/samba/patches/patch-bt
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-bt,v 1.3 2007/10/28 07:28:49 taca Exp $
-
---- ../docs/htmldocs/manpages/smb.conf.5.html.orig	2007-06-19 17:04:26.000000000 +0900
-+++ ../docs/htmldocs/manpages/smb.conf.5.html
-@@ -3229,6 +3229,11 @@ passdb backend = ldapsam:"ldap://ldap-1.
-     the subsequent answers must be received in one tenth of this time. The default it
-     two seconds.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>passwd chat timeout</code></em> = <code class="literal">2</code>
- </em></span>
-+</p></dd><dt><span class="term"><a name="PASSWDEXPANDGECOS"></a>passwd expand gecos (G)</span></dt><dd><p>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 if off by
-+    default.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>passwd expand gecos</code></em> = no
-+</em></span>
- </p></dd><dt><span class="term"><a name="PASSWDPROGRAM"></a>passwd program (G)</span></dt><dd><p>The name of a program that can be used to set 
-     UNIX user passwords.  Any occurrences of <em class="parameter"><code>%u</code></em> 
-     will be replaced with the user name. The user name is checked for 
-@@ -4137,6 +4142,13 @@ smb passwd file = /etc/samba/smbpasswd
- 	speed up case insensitive name mappings. You should never need 
- 	to change this parameter.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>stat cache</code></em> = <code class="literal">yes</code>
- </em></span>
-+</p></dd><dt><span class="term"><a name="STATEDIRECTORY"></a>state directory (G)</span></dt><dd><p>This parameter defines the directory the Samba daemon
-+	processes will use for storing state files that must persist
-+	across machine reboots.
-+	</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>state directory</code></em> = ${prefix}/var/locks
-+</em></span>
-+</p><p>Example: <span class="emphasis"><em><em class="parameter"><code>state directory</code></em> = /var/db/samba
-+</em></span>
- </p></dd><dt><span class="term"><a name="STOREDOSATTRIBUTES"></a>store dos attributes (S)</span></dt><dd><p>
- 	If this parameter is set Samba attempts to first read DOS attributes (SYSTEM, HIDDEN, ARCHIVE or
- 	READ-ONLY) from a filesystem extended attribute, before mapping DOS attributes to UNIX permission bits (such
diff --git a/net/samba/patches/patch-bu b/net/samba/patches/patch-bu
index a09e1abeaf6..c64b81d43b5 100644
--- a/net/samba/patches/patch-bu
+++ b/net/samba/patches/patch-bu
@@ -1,31 +1,35 @@
-$NetBSD: patch-bu,v 1.5 2007/10/28 07:28:49 taca Exp $
+$NetBSD: patch-bu,v 1.6 2008/06/28 22:51:22 tron Exp $
 
---- ../docs/manpages/smb.conf.5.orig	2007-06-19 17:02:26.000000000 +0900
-+++ ../docs/manpages/smb.conf.5
-@@ -4976,6 +4976,11 @@ Default:
- \fB\fIpasswd chat timeout\fR = 2 \fR
+--- ../docs/manpages/smb.conf.5.orig	2008-05-28 14:53:22.000000000 +0100
++++ ../docs/manpages/smb.conf.5	2008-06-28 13:29:43.000000000 +0100
+@@ -6129,6 +6129,14 @@
+ \fI\fIpasswd chat\fR\fR\fI = \fR\fI"*Enter NEW password*" %n\en "*Reenter NEW password*" %n\en "*Password changed*"\fR\fI \fR
  .RE
- .PP
+ 
 +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)
- .RS 3n
- The name of a program that can be used to set UNIX user passwords. Any occurrences of
-@@ -6485,6 +6490,14 @@ Default:
- \fB\fIstat cache\fR = yes \fR
- .RE
  .PP
+ .RS 4
+@@ -7990,6 +7998,15 @@
+ \fI\fIstat cache\fR\fR\fI = \fR\fIyes\fR\fI \fR
+ .RE
+ 
 +state directory (G)
-+.RS 3n
++.PP
++.RS 4
 +This parameter defines the directory the Samba daemon processes will use for storing state files that must persist across machine reboots.
 +.sp
 +Default:
 +\fB\fIstate directory\fR = /var/db/samba \fR
 +.RE
-+.PP
++
  store dos attributes (S)
- .RS 3n
- If this parameter is set Samba attempts to first read DOS attributes (SYSTEM, HIDDEN, ARCHIVE or READ-ONLY) from a filesystem extended attribute, before mapping DOS attributes to UNIX permission bits (such as occurs with
+ .PP
+ .RS 4
diff --git a/net/samba/patches/patch-ea b/net/samba/patches/patch-ea
deleted file mode 100644
index 40360fc77d2..00000000000
--- a/net/samba/patches/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ea,v 1.1 2008/05/28 15:39:55 drochner Exp $
-
---- client/client.c.orig	2008-03-08 16:56:26.000000000 +0100
-+++ client/client.c
-@@ -3626,7 +3626,7 @@ static void readline_callback(void)
- 	   session keepalives and then drop them here.
- 	*/
- 	if (FD_ISSET(cli->fd,&fds)) {
--		if (!receive_smb(cli->fd,cli->inbuf,0)) {
-+		if (!receive_smb(cli->fd,cli->inbuf,cli->bufsize,0)) {
- 			DEBUG(0, ("Read from server failed, maybe it closed the "
- 				"connection\n"));
- 			return;
diff --git a/net/samba/patches/patch-eb b/net/samba/patches/patch-eb
deleted file mode 100644
index 151957b7ffa..00000000000
--- a/net/samba/patches/patch-eb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-eb,v 1.1 2008/05/28 15:39:55 drochner Exp $
-
---- client/smbctool.c.orig	2008-03-08 16:33:34.000000000 +0100
-+++ client/smbctool.c
-@@ -3304,7 +3304,7 @@ static void readline_callback(void)
- 	   session keepalives and then drop them here.
- 	*/
- 	if (FD_ISSET(cli->fd,&fds)) {
--		receive_smb(cli->fd,cli->inbuf,0);
-+		receive_smb(cli->fd,cli->inbuf,cli->bufsize,0);
- 		goto again;
- 	}
- 	  
diff --git a/net/samba/patches/patch-ec b/net/samba/patches/patch-ec
deleted file mode 100644
index ac9a039b841..00000000000
--- a/net/samba/patches/patch-ec
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ec,v 1.1 2008/05/28 15:39:55 drochner Exp $
-
---- lib/util_sock.c.orig	2008-03-08 16:33:34.000000000 +0100
-+++ lib/util_sock.c
-@@ -654,14 +654,13 @@ ssize_t read_smb_length(int fd, char *in
- }
- 
- /****************************************************************************
-- Read an smb from a fd. Note that the buffer *MUST* be of size
-- BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd. 
-  The timeout is in milliseconds. 
-  This function will return on receipt of a session keepalive packet.
-  Doesn't check the MAC on signed packets.
- ****************************************************************************/
- 
--BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
-+BOOL receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout)
- {
- 	ssize_t len,ret;
- 
-@@ -682,25 +681,18 @@ BOOL receive_smb_raw(int fd, char *buffe
- 		return False;
- 	}
- 
--	/*
--	 * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes
--	 * of header. Don't print the error if this fits.... JRA.
--	 */
--
--	if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
-+	if (len > buflen) {
- 		DEBUG(0,("Invalid packet length! (%lu bytes).\n",(unsigned long)len));
--		if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
- 
--			/*
--			 * Correct fix. smb_read_error may have already been
--			 * set. Only set it here if not already set. Global
--			 * variables still suck :-). JRA.
--			 */
-+		/*
-+		 * smb_read_error may have already been
-+		 * set. Only set it here if not already set. Global
-+		 * variables still suck :-). JRA.
-+		 */
- 
--			if (smb_read_error == 0)
--				smb_read_error = READ_ERROR;
--			return False;
--		}
-+		if (smb_read_error == 0)
-+			smb_read_error = READ_ERROR;
-+		return False;
- 	}
- 
- 	if(len > 0) {
-@@ -730,9 +722,9 @@ BOOL receive_smb_raw(int fd, char *buffe
-  Checks the MAC on signed packets.
- ****************************************************************************/
- 
--BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
-+BOOL receive_smb(int fd, char *buffer, size_t buflen, unsigned int timeout)
- {
--	if (!receive_smb_raw(fd, buffer, timeout)) {
-+	if (!receive_smb_raw(fd, buffer, buflen, timeout)) {
- 		return False;
- 	}
- 
diff --git a/net/samba/patches/patch-ed b/net/samba/patches/patch-ed
deleted file mode 100644
index 8b0431892a5..00000000000
--- a/net/samba/patches/patch-ed
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ed,v 1.1 2008/05/28 15:39:55 drochner Exp $
-
---- libsmb/clientgen.c.orig	2008-03-08 16:33:35.000000000 +0100
-+++ libsmb/clientgen.c
-@@ -44,8 +44,7 @@ int cli_set_port(struct cli_state *cli, 
- }
- 
- /****************************************************************************
-- Read an smb from a fd ignoring all keepalive packets. Note that the buffer 
-- *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd ignoring all keepalive packets.
-  The timeout is in milliseconds
- 
-  This is exactly the same as receive_smb except that it never returns
-@@ -54,12 +53,12 @@ int cli_set_port(struct cli_state *cli, 
-  should never go into a blocking read.
- ****************************************************************************/
- 
--static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout)
-+static BOOL client_receive_smb(int fd,char *buffer, size_t bufsize, unsigned int timeout)
- {
- 	BOOL ret;
- 
- 	for(;;) {
--		ret = receive_smb_raw(fd, buffer, timeout);
-+		ret = receive_smb_raw(fd, buffer, bufsize, timeout);
- 
- 		if (!ret) {
- 			DEBUG(10,("client_receive_smb failed\n"));
-@@ -88,7 +87,7 @@ BOOL cli_receive_smb(struct cli_state *c
- 		return False; 
- 
-  again:
--	ret = client_receive_smb(cli->fd,cli->inbuf,cli->timeout);
-+	ret = client_receive_smb(cli->fd,cli->inbuf, cli->bufsize, cli->timeout);
- 	
- 	if (ret) {
- 		/* it might be an oplock break request */
diff --git a/net/samba/patches/patch-ee b/net/samba/patches/patch-ee
deleted file mode 100644
index 31282da4e66..00000000000
--- a/net/samba/patches/patch-ee
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ee,v 1.1 2008/05/28 15:39:55 drochner Exp $
-
---- smbd/process.c.orig	2008-03-08 16:33:36.000000000 +0100
-+++ smbd/process.c
-@@ -521,7 +521,8 @@ static BOOL receive_message_or_smb(char 
- 		goto again;
- 	}
- 
--	return receive_smb(smbd_server_fd(), buffer, 0);
-+	return receive_smb(smbd_server_fd(), buffer,
-+			BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE, 0);
- }
- 
- /*
diff --git a/net/samba/patches/patch-ef b/net/samba/patches/patch-ef
deleted file mode 100644
index 3645657913f..00000000000
--- a/net/samba/patches/patch-ef
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ef,v 1.1 2008/05/28 15:39:55 drochner Exp $
-
---- utils/smbfilter.c.orig	2008-03-08 16:33:37.000000000 +0100
-+++ utils/smbfilter.c
-@@ -140,7 +140,7 @@ static void filter_child(int c, struct i
- 		if (num <= 0) continue;
- 		
- 		if (c != -1 && FD_ISSET(c, &fds)) {
--			if (!receive_smb(c, packet, 0)) {
-+			if (!receive_smb(c, packet, BUFFER_SIZE, 0)) {
- 				d_printf("client closed connection\n");
- 				exit(0);
- 			}
-@@ -151,7 +151,7 @@ static void filter_child(int c, struct i
- 			}			
- 		}
- 		if (s != -1 && FD_ISSET(s, &fds)) {
--			if (!receive_smb(s, packet, 0)) {
-+			if (!receive_smb(s, packet, BUFFER_SIZE, 0)) {
- 				d_printf("server closed connection\n");
- 				exit(0);
- 			}