Pullup ticket 2228 - requested by tron

security update for samba

- pkgsrc/net/samba/Makefile				1.175-1.177
- pkgsrc/net/samba/Makefile.patches			1.5-1.6
- pkgsrc/net/samba/PLIST				1.37
- pkgsrc/net/samba/distinfo				1.55-1.57
- pkgsrc/net/samba/options.mk				1.22
- pkgsrc/net/samba/patches/patch-ag			1.7
- pkgsrc/net/samba/patches/patch-ai			removed
- pkgsrc/net/samba/patches/patch-aj			removed
- pkgsrc/net/samba/patches/patch-al			removed
- pkgsrc/net/samba/patches/patch-am			removed
- pkgsrc/net/samba/patches/patch-au			1.7
- pkgsrc/net/samba/patches/patch-au			1.7
- pkgsrc/net/samba/patches/patch-av			1.3
- pkgsrc/net/samba/patches/patch-ay			1.3
- pkgsrc/net/samba/patches/patch-ba			1.5-1.6
- pkgsrc/net/samba/patches/patch-bb			removed
- pkgsrc/net/samba/patches/patch-bc			1.2
- pkgsrc/net/samba/patches/patch-bd			1.3
- pkgsrc/net/samba/patches/patch-be			1.3
- pkgsrc/net/samba/patches/patch-bf			removed
- pkgsrc/net/samba/patches/patch-bh			1.3
- pkgsrc/net/samba/patches/patch-bi			1.5
- pkgsrc/net/samba/patches/patch-bj			removed
- pkgsrc/net/samba/patches/patch-bk			removed
- pkgsrc/net/samba/patches/patch-bo			1.4
- pkgsrc/net/samba/patches/patch-bp			1.4
- pkgsrc/net/samba/patches/patch-br			1.3
- pkgsrc/net/samba/patches/patch-bs			1.4
- pkgsrc/net/samba/patches/patch-bt			1.3
- pkgsrc/net/samba/patches/patch-bu			1.5
- pkgsrc/net/samba/patches/patch-bw			1.4
- pkgsrc/net/samba/patches/patch-bx			removed
- pkgsrc/net/samba/patches/patch-by			removed
- pkgsrc/net/samba/patches/patch-bz			removed
- pkgsrc/net/samba/patches/patch-ca			1.4
- pkgsrc/net/samba/patches/patch-ce			1.1
- pkgsrc/net/samba/patches/patch-cf			1.1
- pkgsrc/net/samba/patches/patch-cg			1.1
- pkgsrc/net/samba/patches/patch-ch			1.1

   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Oct 28 07:28:51 UTC 2007

   Modified Files:
	   pkgsrc/net/samba: Makefile Makefile.patches PLIST distinfo options.mk
	   pkgsrc/net/samba/patches: patch-ag patch-at patch-au patch-av patch-ay
	       patch-ba patch-bc patch-bd patch-be patch-bh patch-bi patch-bo
	       patch-bp patch-br patch-bs patch-bt patch-bu patch-bw patch-ca
   Added Files:
	   pkgsrc/net/samba/patches: patch-ce patch-cf patch-cg patch-ch
   Removed Files:
	   pkgsrc/net/samba/patches: patch-ai patch-aj patch-al patch-am patch-bb
	       patch-bf patch-bj patch-bk patch-bx patch-by patch-bz

   Log Message:
   Update samba to 3.0.26a.

   pkgsrc change: Add support for DESTDIR.

   Changes from 3.0.24 are huge, please refer WHATSNEW.txt.

   <http://viewcvs.samba.org/cgi-bin/viewcvs.cgi/branches/SAMBA_3_0_26/WHATSNEW.txt?rev=22651&view=markup>
---
   Module Name:	pkgsrc
   Committed By:	rillig
   Date:		Tue Nov  6 00:47:53 UTC 2007

   Modified Files:
	   pkgsrc/net/samba: Makefile distinfo
	   pkgsrc/net/samba/patches: patch-ba

   Log Message:
   Fixed an expansion of @mandir@ that accidentally got into patch-ba in
   revision 1.5.

   PKGREVISION++
---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Fri Nov 16 11:41:38 UTC 2007

   Modified Files:
	   pkgsrc/net/samba: Makefile Makefile.patches distinfo

   Log Message:
   Apply security fixes for CVE-2007-4572 and CVE-2007-5398 released by the
   Samba project. Bump package revision.

1 files changed, 56 insertions, 4 deletions

diff --git a/net/samba/PLIST b/net/samba/PLIST
index 0a6ba1c8e85..3ab0c71ae42 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2007/05/22 12:41:04 tron Exp $
+@comment $NetBSD: PLIST,v 1.36.4.1 2007/11/16 15:19:21 ghen Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -34,9 +34,11 @@ lib/samba/charset/CP437.so
 lib/samba/charset/CP850.so
 lib/samba/de.msg
 lib/samba/en.msg
+lib/samba/fi.msg
 lib/samba/fr.msg
 lib/samba/it.msg
 lib/samba/ja.msg
+lib/samba/libsmbsharemodes.so
 lib/samba/libmsrpc.so
 lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}
 lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
@@ -57,6 +59,7 @@ lib/samba/vfs/extd_audit.so
 lib/samba/vfs/fake_perms.so
 lib/samba/vfs/full_audit.so
 lib/samba/vfs/netatalk.so
+lib/samba/vfs/readahead.so
 lib/samba/vfs/readonly.so
 lib/samba/vfs/recycle.so
 lib/samba/vfs/shadow_copy.so
@@ -87,20 +90,44 @@ man/man5/smbpasswd.5
 man/man7/samba.7
 man/man7/libsmbclient.7
 man/man7/pam_winbind.7
+man/man8/eventlogadm.8
+man/man8/idmap_ad.8
+man/man8/idmap_ldap.8
+man/man8/idmap_nss.8
+man/man8/idmap_rid.8
+man/man8/idmap_tdb.8
 man/man8/mount.cifs.8
 man/man8/net.8
 man/man8/nmbd.8
 man/man8/pdbedit.8
 man/man8/smbd.8
-man/man8/smbmnt.8
-man/man8/smbmount.8
+${SMBMOUNT}man/man8/smbmnt.8
+${SMBMOUNT}man/man8/smbmount.8
 man/man8/smbpasswd.8
 man/man8/smbspool.8
-man/man8/smbumount.8
+${SMBMOUNT}man/man8/smbumount.8
 man/man8/swat.8
 man/man8/tdbbackup.8
 man/man8/tdbdump.8
+man/man8/tdbtool.8
 man/man8/umount.cifs.8
+man/man8/vfs_audit.8
+man/man8/vfs_cacheprime.8
+man/man8/vfs_cap.8
+man/man8/vfs_catia.8
+man/man8/vfs_commit.8
+man/man8/vfs_default_quota.8
+man/man8/vfs_extd_audit.8
+man/man8/vfs_fake_perms.8
+man/man8/vfs_full_audit.8
+man/man8/vfs_gpfs.8
+man/man8/vfs_netatalk.8
+man/man8/vfs_notify_fam.8
+man/man8/vfs_prealloc.8
+man/man8/vfs_readahead.8
+man/man8/vfs_readonly.8
+man/man8/vfs_recycle.8
+man/man8/vfs_shadow_copy.8
 man/man8/winbindd.8
 ${SMBMOUNT}sbin/mount.cifs
 sbin/nmbd
@@ -214,6 +241,7 @@ share/samba/swat/help/Samba3-Developers-Guide/internals.html
 share/samba/swat/help/Samba3-Developers-Guide/modules.html
 share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html
 share/samba/swat/help/Samba3-Developers-Guide/parsing.html
+share/samba/swat/help/Samba3-Developers-Guide/pr01.html
 share/samba/swat/help/Samba3-Developers-Guide/pt01.html
 share/samba/swat/help/Samba3-Developers-Guide/pt02.html
 share/samba/swat/help/Samba3-Developers-Guide/pt03.html
@@ -341,7 +369,13 @@ 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/eventlogadm.8.html
 share/samba/swat/help/manpages/findsmb.1.html
+share/samba/swat/help/manpages/idmap_ad.8.html
+share/samba/swat/help/manpages/idmap_ldap.8.html
+share/samba/swat/help/manpages/idmap_nss.8.html
+share/samba/swat/help/manpages/idmap_rid.8.html
+share/samba/swat/help/manpages/idmap_tdb.8.html
 share/samba/swat/help/manpages/index.html
 share/samba/swat/help/manpages/libsmbclient.7.html
 share/samba/swat/help/manpages/lmhosts.5.html
@@ -377,9 +411,27 @@ share/samba/swat/help/manpages/smbumount.8.html
 share/samba/swat/help/manpages/swat.8.html
 share/samba/swat/help/manpages/tdbbackup.8.html
 share/samba/swat/help/manpages/tdbdump.8.html
+share/samba/swat/help/manpages/tdbtool.8.html
 share/samba/swat/help/manpages/testparm.1.html
 share/samba/swat/help/manpages/umount.cifs.8.html
 share/samba/swat/help/manpages/vfstest.1.html
+share/samba/swat/help/manpages/vfs_audit.8.html
+share/samba/swat/help/manpages/vfs_cacheprime.8.html
+share/samba/swat/help/manpages/vfs_cap.8.html
+share/samba/swat/help/manpages/vfs_catia.8.html
+share/samba/swat/help/manpages/vfs_commit.8.html
+share/samba/swat/help/manpages/vfs_default_quota.8.html
+share/samba/swat/help/manpages/vfs_extd_audit.8.html
+share/samba/swat/help/manpages/vfs_fake_perms.8.html
+share/samba/swat/help/manpages/vfs_full_audit.8.html
+share/samba/swat/help/manpages/vfs_gpfs.8.html
+share/samba/swat/help/manpages/vfs_netatalk.8.html
+share/samba/swat/help/manpages/vfs_notify_fam.8.html
+share/samba/swat/help/manpages/vfs_prealloc.8.html
+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/wbinfo.1.html
 share/samba/swat/help/manpages/winbindd.8.html
 share/samba/swat/help/welcome-no-samba-doc.html