Update samba2 package to 2.2.10

Changes in 2.2.10:
A buffer overrun has been located in the code used to support
the 'mangling method = hash' smb.conf option.   Affected Samba
2.2 installations can avoid this possible security bug by using
the hash2 mangling method.  Server installations requiring
the hash mangling method are encouraged to upgrade to Samba v2.2.10
or v3.0.5.

Changes in 2.2.9:
This is a maintenance release of Samba 2.2.8a to address the
problem with user password changes after applying the Microsoft
hotfix described in KB828741 to Windows NT 4.0/200x/XP clients.

Also updated dependant packages pam-smbpass and winbind.

4 files changed, 147 insertions, 147 deletions

diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index 0b54427f6ca..b4f5d11c3c9 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/06/27 19:44:23 abs Exp $
+# $NetBSD: Makefile,v 1.14 2004/08/07 08:18:38 jdolecek Exp $
 
 .include "Makefile.common"
-PKGREVISION=		8
+PKGREVISION=		# empty
 
 MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.samba.org/
diff --git a/net/samba2/Makefile.common b/net/samba2/Makefile.common
index 37b09ec237e..71c382989ce 100644
--- a/net/samba2/Makefile.common
+++ b/net/samba2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/01/20 21:11:33 snj Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/08/07 08:18:38 jdolecek Exp $
 #
 # NOTE: This file is included by:
 #
@@ -7,7 +7,7 @@
 #	security/winbind/Makefile
 
 DISTNAME=		samba-${SAMBA_DIST_VERS}
-SAMBA_DIST_VERS=	2.2.8a
+SAMBA_DIST_VERS=	2.2.10
 WRKSRC?=		${WRKDIR}/${DISTNAME}/source
 CATEGORIES?=		net
 MASTER_SITES=		ftp://ftp.samba.org/pub/samba/old-versions/ \
@@ -16,7 +16,7 @@ COUNTRY_MIRRORS=	fi ru se us1 us2
 .for COUNTRY in ${COUNTRY_MIRRORS}
 MASTER_SITES+=		ftp://${COUNTRY}.samba.org/pub/samba/old-versions/
 .endfor
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tar.gz
 
 DISTINFO_FILE?=		${.CURDIR}/../../net/samba2/distinfo
 PATCHDIR?=		${.CURDIR}/../../net/samba2/patches
diff --git a/net/samba2/PLIST b/net/samba2/PLIST
index d20cba66321..8aa043d7060 100644
--- a/net/samba2/PLIST
+++ b/net/samba2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/06/27 19:44:23 abs Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/08/07 08:18:38 jdolecek Exp $
 bin/findsmb
 bin/make_printerdef
 bin/make_smbcodepage
@@ -48,131 +48,131 @@ sbin/mksmbpasswd
 sbin/nmbd
 sbin/smbd
 sbin/swat
-share/doc/samba2/Application_Serving.txt
-share/doc/samba2/BROWSING-Config.txt
-share/doc/samba2/BROWSING.txt
-share/doc/samba2/BUGS.txt
-share/doc/samba2/CUPS-PrintingInfo.txt
-share/doc/samba2/DHCP-Server-Configuration.txt
-share/doc/samba2/DIAGNOSIS.txt
-share/doc/samba2/DNIX.txt
-share/doc/samba2/Faxing.txt
-share/doc/samba2/GOTCHAS.txt
-share/doc/samba2/HINTS.txt
-share/doc/samba2/INSTALL.sambatar
-share/doc/samba2/Imprints.txt
-share/doc/samba2/Macintosh_Clients.txt
-share/doc/samba2/NT4-Locking.reg
-share/doc/samba2/NT4_PlainPassword.reg
-share/doc/samba2/NetBIOS.txt
-share/doc/samba2/PROFILES.txt
-share/doc/samba2/Passwords.txt
-share/doc/samba2/Printing.txt
-share/doc/samba2/README.DCEDFS
-share/doc/samba2/README.NOW
-share/doc/samba2/README.jis
-share/doc/samba2/README.sambatar
-share/doc/samba2/Recent-FAQs.txt
-share/doc/samba2/RoutedNetworks.txt
-share/doc/samba2/SCO.txt
-share/doc/samba2/SMBTAR.notes
-share/doc/samba2/Samba-OpenSSL.txt
-share/doc/samba2/Speed.txt
-share/doc/samba2/Speed2.txt
-share/doc/samba2/Tracing.txt
-share/doc/samba2/UNIX-SMB.txt
-share/doc/samba2/UNIX_SECURITY.txt
-share/doc/samba2/Win2000_PlainPassword.reg
-share/doc/samba2/Win95.txt
-share/doc/samba2/Win95_PlainPassword.reg
-share/doc/samba2/Win98_PlainPassword.reg
-share/doc/samba2/Win9X-CacheHandling.reg
-share/doc/samba2/WinME_PlainPassword.reg
-share/doc/samba2/WinNT.txt
-share/doc/samba2/WinXP_SignOrSeal.reg
-share/doc/samba2/WindowsTerminalServer.reg
-share/doc/samba2/announce
-share/doc/samba2/cifsntdomain.txt
-share/doc/samba2/security_level.txt
-share/examples/samba2/LDAP/README
-share/examples/samba2/LDAP/export_smbpasswd.pl
-share/examples/samba2/LDAP/import_smbpasswd.pl
-share/examples/samba2/LDAP/ldapchpasswd
-share/examples/samba2/LDAP/ldapsync.pl
-share/examples/samba2/LDAP/samba-nds.schema
-share/examples/samba2/LDAP/samba-schema-netscapeds4.x
-share/examples/samba2/LDAP/samba-schema-netscapeds5.x
-share/examples/samba2/LDAP/samba-schema.IBMSecureWay
-share/examples/samba2/LDAP/samba.schema
-share/examples/samba2/LDAP/smbldap-tools/AUTHORS
-share/examples/samba2/LDAP/smbldap-tools/CONTRIBUTORS
-share/examples/samba2/LDAP/smbldap-tools/COPYING
-share/examples/samba2/LDAP/smbldap-tools/ChangeLog
-share/examples/samba2/LDAP/smbldap-tools/FILES
-share/examples/samba2/LDAP/smbldap-tools/INFRASTRUCTURE
-share/examples/samba2/LDAP/smbldap-tools/INSTALL
-share/examples/samba2/LDAP/smbldap-tools/Makefile
-share/examples/samba2/LDAP/smbldap-tools/NEWS
-share/examples/samba2/LDAP/smbldap-tools/README
-share/examples/samba2/LDAP/smbldap-tools/TODO
-share/examples/samba2/LDAP/smbldap-tools/cgi/README
-share/examples/samba2/LDAP/smbldap-tools/cgi/ldappass.cgi
-share/examples/samba2/LDAP/smbldap-tools/mkntpwd/Makefile
-share/examples/samba2/LDAP/smbldap-tools/mkntpwd/getopt.c
-share/examples/samba2/LDAP/smbldap-tools/mkntpwd/getopt.h
-share/examples/samba2/LDAP/smbldap-tools/mkntpwd/md4.c
-share/examples/samba2/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
-share/examples/samba2/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
-share/examples/samba2/LDAP/smbldap-tools/mkntpwd/smbdes.c
-share/examples/samba2/LDAP/smbldap-tools/smbldap-groupadd.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-groupdel.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-groupmod.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-groupshow.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-migrate-groups.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-passwd.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-populate.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-tools.spec
-share/examples/samba2/LDAP/smbldap-tools/smbldap-useradd.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-userdel.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-usermod.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap-usershow.pl
-share/examples/samba2/LDAP/smbldap-tools/smbldap_conf.pm
-share/examples/samba2/LDAP/smbldap-tools/smbldap_tools.pm
-share/examples/samba2/README
-share/examples/samba2/adduser.sh
-share/examples/samba2/deluser.sh
-share/examples/samba2/misc/convert_smbpasswd
-share/examples/samba2/misc/extra_smbstatus
-share/examples/samba2/misc/modify_samba_config.pl
-share/examples/samba2/misc/swat.pl
-share/examples/samba2/misc/wall.perl
-share/examples/samba2/printer-accounting/README
-share/examples/samba2/printer-accounting/acct-all
-share/examples/samba2/printer-accounting/acct-sum
-share/examples/samba2/printer-accounting/hp5-redir
-share/examples/samba2/printer-accounting/lp-acct
-share/examples/samba2/printer-accounting/printcap
-share/examples/samba2/printing/smbprint
-share/examples/samba2/printing/smbprint.newer
-share/examples/samba2/printing/smbprint.old
-share/examples/samba2/printing/smbprint.safer
-share/examples/samba2/printing/smbprint.sysv
-share/examples/samba2/simple/README
-share/examples/samba2/simple/smb.conf
-share/examples/samba2/smb.conf.default
-share/examples/samba2/thoralf/smb.conf
-share/examples/samba2/tridge/README
-share/examples/samba2/tridge/smb.conf
-share/examples/samba2/tridge/smb.conf.WinNT
-share/examples/samba2/tridge/smb.conf.fjall
-share/examples/samba2/tridge/smb.conf.lapland
-share/examples/samba2/tridge/smb.conf.vittjokk
-share/examples/samba2/validchars/msdos70.out
-share/examples/samba2/validchars/nwdos70.out
-share/examples/samba2/validchars/readme
-share/examples/samba2/validchars/validchr.c
-share/examples/samba2/validchars/validchr.com
+share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING-Config.txt
+share/doc/samba/BROWSING.txt
+share/doc/samba/BUGS.txt
+share/doc/samba/CUPS-PrintingInfo.txt
+share/doc/samba/DHCP-Server-Configuration.txt
+share/doc/samba/DIAGNOSIS.txt
+share/doc/samba/DNIX.txt
+share/doc/samba/Faxing.txt
+share/doc/samba/GOTCHAS.txt
+share/doc/samba/HINTS.txt
+share/doc/samba/INSTALL.sambatar
+share/doc/samba/Imprints.txt
+share/doc/samba/Macintosh_Clients.txt
+share/doc/samba/NT4-Locking.reg
+share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/NetBIOS.txt
+share/doc/samba/PROFILES.txt
+share/doc/samba/Passwords.txt
+share/doc/samba/Printing.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.NOW
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+share/doc/samba/Recent-FAQs.txt
+share/doc/samba/RoutedNetworks.txt
+share/doc/samba/SCO.txt
+share/doc/samba/SMBTAR.notes
+share/doc/samba/Samba-OpenSSL.txt
+share/doc/samba/Speed.txt
+share/doc/samba/Speed2.txt
+share/doc/samba/Tracing.txt
+share/doc/samba/UNIX-SMB.txt
+share/doc/samba/UNIX_SECURITY.txt
+share/doc/samba/Win2000_PlainPassword.reg
+share/doc/samba/Win95.txt
+share/doc/samba/Win95_PlainPassword.reg
+share/doc/samba/Win98_PlainPassword.reg
+share/doc/samba/Win9X-CacheHandling.reg
+share/doc/samba/WinME_PlainPassword.reg
+share/doc/samba/WinNT.txt
+share/doc/samba/WinXP_SignOrSeal.reg
+share/doc/samba/WindowsTerminalServer.reg
+share/doc/samba/announce
+share/doc/samba/cifsntdomain.txt
+share/doc/samba/security_level.txt
+share/examples/samba/LDAP/README
+share/examples/samba/LDAP/export_smbpasswd.pl
+share/examples/samba/LDAP/import_smbpasswd.pl
+share/examples/samba/LDAP/ldapchpasswd
+share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba-nds.schema
+share/examples/samba/LDAP/samba-schema-netscapeds4.x
+share/examples/samba/LDAP/samba-schema-netscapeds5.x
+share/examples/samba/LDAP/samba-schema.IBMSecureWay
+share/examples/samba/LDAP/samba.schema
+share/examples/samba/LDAP/smbldap-tools/AUTHORS
+share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS
+share/examples/samba/LDAP/smbldap-tools/COPYING
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
+share/examples/samba/LDAP/smbldap-tools/FILES
+share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE
+share/examples/samba/LDAP/smbldap-tools/INSTALL
+share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/NEWS
+share/examples/samba/LDAP/smbldap-tools/README
+share/examples/samba/LDAP/smbldap-tools/TODO
+share/examples/samba/LDAP/smbldap-tools/cgi/README
+share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/md4.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/smbdes.c
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupshow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-groups.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-passwd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-populate.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-tools.spec
+share/examples/samba/LDAP/smbldap-tools/smbldap-useradd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-userdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usermod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usershow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm
+share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm
+share/examples/samba/README
+share/examples/samba/adduser.sh
+share/examples/samba/deluser.sh
+share/examples/samba/misc/convert_smbpasswd
+share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/modify_samba_config.pl
+share/examples/samba/misc/swat.pl
+share/examples/samba/misc/wall.perl
+share/examples/samba/printer-accounting/README
+share/examples/samba/printer-accounting/acct-all
+share/examples/samba/printer-accounting/acct-sum
+share/examples/samba/printer-accounting/hp5-redir
+share/examples/samba/printer-accounting/lp-acct
+share/examples/samba/printer-accounting/printcap
+share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.newer
+share/examples/samba/printing/smbprint.old
+share/examples/samba/printing/smbprint.safer
+share/examples/samba/printing/smbprint.sysv
+share/examples/samba/simple/README
+share/examples/samba/simple/smb.conf
+share/examples/samba/smb.conf.default
+share/examples/samba/thoralf/smb.conf
+share/examples/samba/tridge/README
+share/examples/samba/tridge/smb.conf
+share/examples/samba/tridge/smb.conf.WinNT
+share/examples/samba/tridge/smb.conf.fjall
+share/examples/samba/tridge/smb.conf.lapland
+share/examples/samba/tridge/smb.conf.vittjokk
+share/examples/samba/validchars/msdos70.out
+share/examples/samba/validchars/nwdos70.out
+share/examples/samba/validchars/readme
+share/examples/samba/validchars/validchr.c
+share/examples/samba/validchars/validchr.com
 share/samba/codepages/codepage.1125
 share/samba/codepages/codepage.1251
 share/samba/codepages/codepage.437
@@ -434,16 +434,16 @@ share/samba/swat/using_samba/this_edition.html
 @dirrm share/samba/swat
 @dirrm share/samba/codepages
 @dirrm share/samba
-@dirrm share/examples/samba2/validchars
-@dirrm share/examples/samba2/tridge
-@dirrm share/examples/samba2/thoralf
-@dirrm share/examples/samba2/simple
-@dirrm share/examples/samba2/printing
-@dirrm share/examples/samba2/printer-accounting
-@dirrm share/examples/samba2/misc
-@dirrm share/examples/samba2/LDAP/smbldap-tools/mkntpwd
-@dirrm share/examples/samba2/LDAP/smbldap-tools/cgi
-@dirrm share/examples/samba2/LDAP/smbldap-tools
-@dirrm share/examples/samba2/LDAP
-@dirrm share/examples/samba2
-@dirrm share/doc/samba2
+@dirrm share/examples/samba/validchars
+@dirrm share/examples/samba/tridge
+@dirrm share/examples/samba/thoralf
+@dirrm share/examples/samba/simple
+@dirrm share/examples/samba/printing
+@dirrm share/examples/samba/printer-accounting
+@dirrm share/examples/samba/misc
+@dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd
+@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
+@dirrm share/examples/samba/LDAP/smbldap-tools
+@dirrm share/examples/samba/LDAP
+@dirrm share/examples/samba
+@dirrm share/doc/samba
diff --git a/net/samba2/distinfo b/net/samba2/distinfo
index 6897ddf4604..2f8c2fc89b0 100644
--- a/net/samba2/distinfo
+++ b/net/samba2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/11 00:41:13 jlam Exp $
+$NetBSD: distinfo,v 1.2 2004/08/07 08:18:38 jdolecek Exp $
 
-SHA1 (samba-2.2.8a.tar.bz2) = f25ff456bf7ac58d32eb0209c15ce0b2fa6d7450
-Size (samba-2.2.8a.tar.bz2) = 4505672 bytes
+SHA1 (samba-2.2.10.tar.gz) = 583bf9d2b2bb8de44501082285146e1440b1daa6
+Size (samba-2.2.10.tar.gz) = 5503115 bytes
 SHA1 (patch-aa) = 7f85ab121ffbcb67eb1f1c59f49245dda2eff44d
 SHA1 (patch-ab) = 8be47e3f277f191aff18f77d8ed5ef4d8903ec5f
 SHA1 (patch-ac) = cfde267ffe57046de18691f612e73ecdd1158d86