Update net/samba to 3.0.2a. Fixes from version 3.0.1 include:

  o Joining a Samba domain from Pre-SP2 Windows 2000 clients.
  o Logging onto a Samba domain from Windows XP clients.
  o Problems with the %U and %u smb.conf variables in relation to
    Windows 9x/ME clients.
  o Kerberos failures due to an invalid in memory keytab detection
    test.
  o Updates to the ntlm_auth tool.
  o Fixes for various SMB signing errors.
  o Better separation of WINS and DNS queries for domain controllers.
  o Issues with nss_winbind FreeBSD and Solaris.
  o Several crash bugs in smbd and winbindd.
  o Output formatting fixes for smbclient for better compatibility
    with scripts based on the 2.2 version.

6 files changed, 26 insertions, 50 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 303ccd76099..c7e6260e395 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2004/02/17 00:09:41 xtraeme Exp $
+# $NetBSD: Makefile,v 1.116 2004/02/17 11:51:54 jlam Exp $
 
-DISTNAME=		samba-3.0.1
-PKGREVISION=		2
+DISTNAME=		samba-3.0.2a
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
 			ftp://ring.asahi-net.or.jp/pub/net/samba/ \
@@ -25,7 +24,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/source
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PERL="${PERL5}"
-PLIST_SRC=		${PKGDIR}/PLIST
+PLIST_SRC=		# empty
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -106,6 +105,8 @@ CONFIGURE_ARGS+=	--without-ldap
 BUILD_DEFS+=		SAMBA_USE_LDAP
 BUILD_DEFS+=		SAMBA_USE_LDAP_COMPAT
 
+PLIST_SRC+=		${PKGDIR}/PLIST
+
 .if !defined(MKTEMP)
 MKTEMP!=	${TYPE} mktemp 2>&1 | \
 		${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
diff --git a/net/samba/PLIST b/net/samba/PLIST
index dfe6d198f5a..8989959317c 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/02/17 00:01:26 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/02/17 11:51:54 jlam Exp $
 bin/findsmb
 bin/net
 bin/nmblookup
@@ -93,10 +93,11 @@ sbin/nmbd
 sbin/smbd
 sbin/swat
 sbin/winbindd
-share/doc/samba/FolderRedir.reg
 share/doc/samba/NT4-Locking.reg
 share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/Win-NT-2K-XP-DeleteRoamingProfile.reg
+share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg
+share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg
+share/doc/samba/Win-NT-DeleteRoamingProfile.reg
 share/doc/samba/Win2000_PlainPassword.reg
 share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/Win98_PlainPassword.reg
@@ -179,6 +180,7 @@ share/samba/swat/help/smbclient.1.html
 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/smbmnt.8.html
 share/samba/swat/help/smbmount.8.html
 share/samba/swat/help/smbpasswd.5.html
@@ -192,6 +194,7 @@ 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
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 6a8179757a1..86e4001cb71 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.31 2004/01/11 02:26:31 jlam Exp $
+$NetBSD: distinfo,v 1.32 2004/02/17 11:51:54 jlam Exp $
 
-SHA1 (samba-3.0.1.tar.bz2) = e390d24beb6c4e30f75995cf3dc75d374f5586d2
-Size (samba-3.0.1.tar.bz2) = 8303432 bytes
-SHA1 (patch-aa) = f38d7cb0a1f33b4e71e5d1fb4aecdbfdb92a8459
-SHA1 (patch-ab) = 8e9a78fe84f0b07571f72715a4d9a639fd9801a8
+SHA1 (samba-3.0.2a.tar.bz2) = dbe0341a97554c78ed024e0122dd5b48fdde10b5
+Size (samba-3.0.2a.tar.bz2) = 9289178 bytes
 SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644
-SHA1 (patch-ad) = 435996c8409b68f34fa731132413ed5e7421921e
+SHA1 (patch-ad) = b75770eb6fc7ff5d26764fced83e26fd6cf153af
 SHA1 (patch-ae) = cf3a040f04142df534abe54b66156a48697b665d
 SHA1 (patch-af) = dce26803c2a9c04d714c0929ae2efeaa1487aeda
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
deleted file mode 100644
index c21b9aaed4c..00000000000
--- a/net/samba/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.25 2004/01/11 02:26:31 jlam Exp $
-
---- configure.in.orig	Sun Dec 14 22:36:25 2003
-+++ configure.in
-@@ -1642,7 +1642,7 @@ dnl Try to find iconv(3)
-     jm_ICONV($i)
- 
-     if test "$ICONV_FOUND" = yes; then
--	LDFLAGS=$save_LDFLAG
-+	LDFLAGS=$save_LDFLAGS
-         LIB_ADD_DIR(LDFLAGS, "$i/lib")
-         CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
-         LIBS="$save_LIBS"
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
deleted file mode 100644
index f42836282d1..00000000000
--- a/net/samba/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.21 2004/01/11 02:26:31 jlam Exp $
-
---- configure.orig	Mon Dec 15 09:55:22 2003
-+++ configure
-@@ -20216,7 +20216,7 @@ echo "${ECHO_T}no" >&6
- 
- 
-     if test "$ICONV_FOUND" = yes; then
--	LDFLAGS=$save_LDFLAG
-+	LDFLAGS=$save_LDFLAGS
- 
- if test ""$i/lib"" != "/usr/lib" ; then
-     LDFLAGS="$LDFLAGS -L"$i/lib""
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index 2b23b392cff..72b2352a7d1 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.13 2004/01/11 02:26:31 jlam Exp $
+$NetBSD: patch-ad,v 1.14 2004/02/17 11:51:54 jlam Exp $
 
---- lib/util_getent.c.orig	Sat Jun  7 13:57:33 2003
+--- lib/util_getent.c.orig	Fri Feb 13 11:02:10 2004
 +++ lib/util_getent.c
 @@ -133,6 +133,11 @@ struct sys_pwent * getpwent_list(void)
  	struct sys_pwent *plist;
  	struct sys_pwent *pent;
  	struct passwd *pwd;
 +#ifdef BSD
-+# define BUFLEN 1024
-+	char *bp, *gecos, *p, buf[BUFLEN];
++# define GECOS_BUFLEN 1024
++	char *bp, *gecos, *p, buf[GECOS_BUFLEN];
 +	int buflen;
 +#endif
  	
@@ -26,24 +26,24 @@ $NetBSD: patch-ad,v 1.13 2004/01/11 02:26:31 jlam Exp $
 +
 +			/* copy gecos, interpolating & to be full name */
 +			for (p = gecos; *p != '\0'; p++) {
-+				if (bp >= &buf[BUFLEN - 1])
++				if (bp >= &buf[GECOS_BUFLEN - 1])
 +					/* buffer overflow */
 +					goto gecos_done;
 +				if (*p == '&') {
 +					/* interpolate full name */
-+					snprintf(bp, BUFLEN - (bp - buf),
++					snprintf(bp, GECOS_BUFLEN - (bp - buf),
 +						 "%s", pwd->pw_name);
 +					*bp = toupper(*bp);
 +					bp += strlen(bp);
-+				}
-+				else
++				} else {
 +					*bp++ = *p;
++				}
 +			}
 +			*bp = '\0';
-+			if ((pent->pw_name = strdup(buf)) == NULL)
++			if ((pent->pw_gecos = strdup(buf)) == NULL)
 +				goto err;
 +#else
- 			if ((pent->pw_name = strdup(pwd->pw_gecos)) == NULL)
+ 			if ((pent->pw_gecos = strdup(pwd->pw_gecos)) == NULL)
  				goto err;
 +#endif
  		}
@@ -51,5 +51,5 @@ $NetBSD: patch-ad,v 1.13 2004/01/11 02:26:31 jlam Exp $
 +  gecos_done:
 +#endif
  		if (pwd->pw_dir) {
- 			if ((pent->pw_name = strdup(pwd->pw_dir)) == NULL)
+ 			if ((pent->pw_dir = strdup(pwd->pw_dir)) == NULL)
  				goto err;