Update "samba" package to version 3.0.34. Changes since version 3.0.32:

- Fix update of machine account passwords.
- Fix SMB signing issue on Windows Vista with MS Hotfix KB955302.
- Fix Winbind crashes.
- Correctly detect if the current dc is the closest one.
- Add saf_join_store() function to memorize the dc used at join time.
  This avoids problems caused by replication delays shortly after
  domain joins.
- Fix write list in setups using "security = share".

7 files changed, 226 insertions, 62 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index d589830f9c3..749e0bd110c 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.188 2009/03/03 17:50:49 sborrill Exp $
+# $NetBSD: Makefile,v 1.189 2009/03/21 18:25:34 tron Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=		samba-${VERSION}
-PKGREVISION=		3
 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.32
+VERSION=		3.0.34
 CONFLICTS+=		ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]*	\
 			winbind-[0-9]*
 MAKE_JOBS_SAFE=		NO
diff --git a/net/samba/Makefile.patches b/net/samba/Makefile.patches
index 40b18e03a35..dfc34e4d66c 100644
--- a/net/samba/Makefile.patches
+++ b/net/samba/Makefile.patches
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.9 2008/11/28 03:17:58 taca Exp $
+# $NetBSD: Makefile.patches,v 1.10 2009/03/21 18:25:34 tron Exp $
 #
 # This Makefile fragment describes the recommended patches for the
 # currently packaged version of Samba.  All recommended patches for
@@ -11,6 +11,6 @@
 #
 #PATCH_SITES=	http://www.samba.org/samba/patches/patches-${VERSION}/
 #PATCHFILES=
-PATCH_DIST_STRIP= -p2
-PATCH_SITES=	http://www.samba.org/samba/ftp/patches/security/
-PATCHFILES=	samba-3.0.32-CVE-2008-4314.patch
+#PATCH_DIST_STRIP= -p2
+#PATCH_SITES=	http://www.samba.org/samba/ftp/patches/security/
+#PATCHFILES=
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 404793f7128..20d928b662b 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2008/08/30 12:18:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.42 2009/03/21 18:25:34 tron Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -93,6 +93,7 @@ man/man5/smbpasswd.5
 man/man7/libsmbclient.7
 man/man7/pam_winbind.7
 man/man7/samba.7
+man/man8/cifs.upcall.8
 man/man8/eventlogadm.8
 man/man8/idmap_ad.8
 man/man8/idmap_ldap.8
@@ -370,6 +371,7 @@ 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
@@ -458,6 +460,171 @@ 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 93e66f185fb..8f02685bac9 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,24 +1,21 @@
-$NetBSD: distinfo,v 1.66 2009/03/03 17:50:49 sborrill Exp $
+$NetBSD: distinfo,v 1.67 2009/03/21 18:25:34 tron Exp $
 
-SHA1 (samba-3.0.32-CVE-2008-4314.patch) = 23354d8773e791fc9198da49048eff2a6966e6b9
-RMD160 (samba-3.0.32-CVE-2008-4314.patch) = 7507f46b58c96668a2e4e2c4aefa3244c18fad7d
-Size (samba-3.0.32-CVE-2008-4314.patch) = 1846 bytes
-SHA1 (samba-3.0.32.tar.gz) = bcbcff2c00a7cec07886de184d8761fd8b424810
-RMD160 (samba-3.0.32.tar.gz) = 91bea73b9a799b8cb67d5fadd288d9403f175492
-Size (samba-3.0.32.tar.gz) = 21679285 bytes
+SHA1 (samba-3.0.34.tar.gz) = 18104d1bf509cd3fd3107c09fa6205666e04ac16
+RMD160 (samba-3.0.34.tar.gz) = d79cd544b5ab2b4a7130b8c52c19edcfc89083ea
+Size (samba-3.0.34.tar.gz) = 24835363 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) = 047657002d21420f737a1adb8026ce552f4e8b2a
+SHA1 (patch-at) = 708177043510be725b81ed66ac2f02518a560802
 SHA1 (patch-au) = a3990e7da879e35bc184704547c08311bd8fa05e
 SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
 SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538
 SHA1 (patch-ax) = e528921710514bc2651bfca808c21d608f928a95
 SHA1 (patch-ay) = e6ccc4fb20fa909f5d3cecbc4bf3628ba5b355e9
-SHA1 (patch-ba) = 7a9245427ed21b1dfe846b341f70debca6de2e7c
+SHA1 (patch-ba) = 9ec5be176f8ba502607340dd15277952e0610784
 SHA1 (patch-bc) = d525b9201a5cda85346704ad7b860e2b3a3aeb08
 SHA1 (patch-bd) = faf24c792ecff76972d0a80f5418d8c38ca9ed21
 SHA1 (patch-be) = b3386824969a1a02cf8e5d5a9889ce55f6813f48
@@ -32,7 +29,7 @@ SHA1 (patch-bp) = 08f2387324aaec8161f3114de84d81c815dd8179
 SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
 SHA1 (patch-br) = fc0d4c1f638a534f86e59ed8ebaddbf1978fa64f
 SHA1 (patch-bs) = 1c08caf388e337497464097a11c909ddd5f9a3ff
-SHA1 (patch-bu) = d53281ee030b00fe526e32d96fef94b683ca3550
+SHA1 (patch-bu) = 72c0c5bb830d9f0d231502e622215ba59255914f
 SHA1 (patch-bv) = 2d80f4e24edab32bf4f620f651e70b9e63d28cc5
 SHA1 (patch-bw) = 11f9b3713382a23075ed5980d7b8a2dbd11ecf54
 SHA1 (patch-ca) = 0c2c4c1bdb3348de3e8719cc468a6e0c28a36b73
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index cf3cebbe900..5f3bab9610f 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
+$NetBSD: patch-at,v 1.12 2009/03/21 18:25:34 tron Exp $
 
---- configure.orig	2008-08-25 22:16:26.000000000 +0100
-+++ configure	2009-03-03 16:24:13.000000000 +0000
+--- configure.orig	2009-01-19 11:00:12.000000000 +0000
++++ configure	2009-03-21 14:45:27.000000000 +0000
 @@ -667,6 +667,7 @@
  target_os
  configdir
@@ -10,7 +10,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  piddir
  logfilebase
  privatedir
-@@ -1396,6 +1397,7 @@
+@@ -1399,6 +1400,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.11 2009/03/03 17:50:49 sborrill 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)
-@@ -2137,6 +2139,7 @@
+@@ -2141,6 +2143,7 @@
  
  rootsbindir="\${SBINDIR}"
  lockdir="\${VARDIR}/locks"
@@ -26,7 +26,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  piddir="\${VARDIR}/locks"
  test "${mandir}" || mandir="\${prefix}/man"
  logfilebase="\${VARDIR}"
-@@ -2151,7 +2154,8 @@
+@@ -2155,7 +2158,8 @@
  if test "${with_fhs+set}" = set; then
    withval=$with_fhs;  case "$withval" in
    yes)
@@ -36,7 +36,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
      piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
-@@ -2225,6 +2229,26 @@
+@@ -2229,6 +2233,26 @@
  
  
  #################################################
@@ -63,7 +63,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  # set pid directory location
  
  # Check whether --with-piddir was given.
-@@ -2462,6 +2486,7 @@
+@@ -2469,6 +2493,7 @@
  
  
  
@@ -71,7 +71,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill 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.
-@@ -31343,7 +31368,8 @@
+@@ -31354,7 +31379,8 @@
  
  
  
@@ -81,7 +81,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -46809,6 +46835,74 @@
+@@ -46820,6 +46846,74 @@
  ##################
  # look for a method of finding the list of network interfaces
  iface=no;
@@ -156,7 +156,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  { echo "$as_me:$LINENO: checking for iface AIX" >&5
  echo $ECHO_N "checking for iface AIX... $ECHO_C" >&6; }
  if test "${samba_cv_HAVE_IFACE_AIX+set}" = set; then
-@@ -46876,6 +46970,7 @@
+@@ -46887,6 +46981,7 @@
  _ACEOF
  
  fi
@@ -164,7 +164,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  
  if test $iface = no; then
  { echo "$as_me:$LINENO: checking for iface ifconf" >&5
-@@ -50253,9 +50348,9 @@
+@@ -50266,9 +50361,9 @@
  
  
  
@@ -177,7 +177,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -50271,11 +50366,11 @@
+@@ -50284,11 +50379,11 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -191,7 +191,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
    ;
    return 0;
  }
-@@ -50298,13 +50393,13 @@
+@@ -50311,13 +50406,13 @@
  	 test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -207,7 +207,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  		  ac_cv_lib_ext_crypto=no
  fi
  
-@@ -50312,11 +50407,11 @@
+@@ -50325,11 +50420,11 @@
        conftest$ac_exeext conftest.$ac_ext
  
  fi
@@ -223,7 +223,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  _ACEOF
  
  fi
-@@ -63340,31 +63435,39 @@
+@@ -63573,31 +63668,39 @@
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;
@@ -285,7 +285,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  		;;
  	*irix*)
  		# IRIX has differently named shared libraries
-@@ -67893,6 +67998,7 @@
+@@ -68126,6 +68229,7 @@
  target_os!$target_os$ac_delim
  configdir!$configdir$ac_delim
  lockdir!$lockdir$ac_delim
@@ -293,7 +293,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  piddir!$piddir$ac_delim
  logfilebase!$logfilebase$ac_delim
  privatedir!$privatedir$ac_delim
-@@ -67936,7 +68042,6 @@
+@@ -68169,7 +68273,6 @@
  KRB5_LIBS!$KRB5_LIBS$ac_delim
  UUID_LIBS!$UUID_LIBS$ac_delim
  LDAP_LIBS!$LDAP_LIBS$ac_delim
@@ -301,7 +301,7 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67978,6 +68083,7 @@
+@@ -68211,6 +68314,7 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -309,12 +309,12 @@ $NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
  INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
  UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
  NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -68062,7 +68168,7 @@
+@@ -68298,7 +68402,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  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
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; 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-ba b/net/samba/patches/patch-ba
index 402cfe5474f..14899880707 100644
--- a/net/samba/patches/patch-ba
+++ b/net/samba/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
+$NetBSD: patch-ba,v 1.8 2009/03/21 18:25:35 tron Exp $
 
---- Makefile.in.orig	2008-03-08 10:56:26.000000000 -0500
-+++ Makefile.in
-@@ -106,6 +106,9 @@ SWATDIR = @swatdir@
+--- Makefile.in.orig	2009-01-19 10:40:09.000000000 +0000
++++ Makefile.in	2009-03-21 14:48:11.000000000 +0000
+@@ -106,6 +106,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  # the directory where pid files go
  PIDDIR = @piddir@
  
-@@ -136,7 +139,7 @@ PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB
+@@ -136,7 +139,7 @@
  PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
  PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\"
  PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
@@ -21,7 +21,7 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
  	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
  PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
-@@ -1052,7 +1055,7 @@ bin/pdbedit@EXEEXT@: proto_exists $(PDBE
+@@ -1059,7 +1062,7 @@
  
  bin/smbget@EXEEXT@: proto_exists $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
@@ -30,7 +30,7 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  
  bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
-@@ -1087,12 +1090,12 @@ bin/msgtest@EXEEXT@: proto_exists $(MSGT
+@@ -1094,12 +1097,12 @@
  bin/smbcacls@EXEEXT@: proto_exists $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
  	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \
@@ -45,7 +45,7 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  
  bin/eventlogadm@EXEEXT@: proto_exists $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
-@@ -1155,7 +1158,7 @@ bin/libaddns.a: proto_exists $(LIBADDNS_
+@@ -1162,7 +1165,7 @@
  bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
  	@echo Linking libsmbclient shared library $@
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
@@ -54,7 +54,7 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
  
  bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
-@@ -1527,11 +1530,11 @@ bin/ntlm_auth@EXEEXT@: proto_exists $(NT
+@@ -1534,11 +1537,11 @@
  	@echo Linking $@
  	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
  		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
@@ -68,16 +68,16 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  
  bin/tdbbackup@EXEEXT@: proto_exists $(TDBBACKUP_OBJ) bin/.dummy
  	@echo Linking $@
-@@ -1566,7 +1569,7 @@ bin/timelimit@EXEEXT@: script/tests/time
+@@ -1573,7 +1576,7 @@
  	@echo Linking $@
  	@$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
  
--install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
-+install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBADDNS@
- 
+-install: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUPCALL@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
++install: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUPCALL@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBADDNS@
  
  install-everything: install installmodules
-@@ -1580,7 +1583,7 @@ install-everything: install installmodul
+ 
+@@ -1586,7 +1589,7 @@
  # is not used
  
  installdirs:
@@ -86,7 +86,7 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  
  installservers: all installdirs
  	@$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
-@@ -1599,7 +1602,9 @@ installmodules: modules installdirs
+@@ -1609,7 +1612,9 @@
  	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
  	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES)
  	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
@@ -97,7 +97,7 @@ $NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
  	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
  	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
  	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ ldapsam_compat.@SHLIBEXT@
-@@ -1705,6 +1710,7 @@ showlayout:
+@@ -1715,6 +1720,7 @@
  	@echo "  privatedir:  $(PRIVATE_DIR)"
  	@echo "  configdir:   $(CONFIGDIR)"
  	@echo "  lockdir:     $(LOCKDIR)"
diff --git a/net/samba/patches/patch-bu b/net/samba/patches/patch-bu
index c64b81d43b5..e00351c7cc4 100644
--- a/net/samba/patches/patch-bu
+++ b/net/samba/patches/patch-bu
@@ -1,9 +1,9 @@
-$NetBSD: patch-bu,v 1.6 2008/06/28 22:51:22 tron Exp $
+$NetBSD: patch-bu,v 1.7 2009/03/21 18:25:35 tron Exp $
 
---- ../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
+--- ../docs/manpages/smb.conf.5.orig	2009-01-19 10:44:00.000000000 +0000
++++ ../docs/manpages/smb.conf.5	2009-03-21 14:50:38.000000000 +0000
+@@ -6152,6 +6152,15 @@
+ \fI\fIpasswd chat timeout\fR\fR\fI = \fR\fI2\fR\fI \fR
  .RE
  
 +passwd expand gecos (G)
@@ -14,10 +14,11 @@ $NetBSD: patch-bu,v 1.6 2008/06/28 22:51:22 tron Exp $
 +Default: \fB\fIpasswd expand gecos\fR = no \fR 
 +.TP 3n
 +.sp
++
  passwd program (G)
  .PP
  .RS 4
-@@ -7990,6 +7998,15 @@
+@@ -8030,6 +8039,15 @@
  \fI\fIstat cache\fR\fR\fI = \fR\fIyes\fR\fI \fR
  .RE