Update net/samba to version 2.2.5. The quick summary of changes from

version 2.2.4nb1 is that there are the usual minor bug fixes, plus some
important ones:

        * fix printing with Win2K/XP clients
        * fixes related to using LDAP for the SAM
        * fixes related to changing passwords

Pkgsrc changes:

	* Fetch the .tar.bz2 file -- it's smaller.
	* Use smb.conf.default as the sample config file and get rid of
	  the homegrown files/smb.conf.sample.  smb.conf.default is more
	  informative and is a better resource.
	* Remove irrelevant examples.
	* Move convert_smbpasswd script to the examples/samba/misc
	  directory.  It's pretty much outlived it's usefulness at this
	  point of the Samba release cycle.

5 files changed, 0 insertions, 87 deletions

diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
deleted file mode 100644
index 7eab2532cfc..00000000000
--- a/net/samba/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2002/05/05 16:57:11 taca Exp $
-
---- configure.in.orig	Fri May  3 10:02:46 2002
-+++ configure.in
-@@ -13,15 +13,15 @@
-     codepagedir="\$(DATADIR)/samba/codepages"
-     configdir="${sysconfdir}/samba"
-     lockdir="\${VARDIR}/cache/samba"
--    piddir="\$(VARDIR)/run/samba"
-+    piddir="\$(VARDIR)/run"
-     logfilebase="\${VARDIR}/log/samba"
-     privatedir="\${CONFIGDIR}/private"
-     swatdir="\${DATADIR}/samba/swat",
-     codepagedir="\$(LIBDIR)/codepages"
-     configdir="\$(LIBDIR)"
--    logfilebase="\$(VARDIR)"
-+    logfilebase="\$(VARDIR)/log"
-     lockdir="\${VARDIR}/locks"
--    piddir="\$(VARDIR)/locks"
-+    piddir="\$(VARDIR)/run"
-     privatedir="\${prefix}/private"
-     swatdir="\${prefix}/swat")
- 
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
deleted file mode 100644
index 7db57937c10..00000000000
--- a/net/samba/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2002/05/05 16:57:12 taca Exp $
-
---- configure.orig	Fri May  3 10:02:45 2002
-+++ configure
-@@ -1017,16 +1017,16 @@
-   codepagedir="\$(DATADIR)/samba/codepages"
-     configdir="${sysconfdir}/samba"
-     lockdir="\${VARDIR}/cache/samba"
--    piddir="\$(VARDIR)/run/samba"
-+    piddir="\$(VARDIR)/run"
-     logfilebase="\${VARDIR}/log/samba"
-     privatedir="\${CONFIGDIR}/private"
-     swatdir="\${DATADIR}/samba/swat"
- else
-   codepagedir="\$(LIBDIR)/codepages"
-     configdir="\$(LIBDIR)"
--    logfilebase="\$(VARDIR)"
-+    logfilebase="\$(VARDIR)/log"
-     lockdir="\${VARDIR}/locks"
--    piddir="\$(VARDIR)/locks"
-+    piddir="\$(VARDIR)/run"
-     privatedir="\${prefix}/private"
-     swatdir="\${prefix}/swat"
- fi;
diff --git a/net/samba/patches/patch-ai b/net/samba/patches/patch-ai
deleted file mode 100644
index 3b159958dba..00000000000
--- a/net/samba/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/07/13 16:08:41 taca Exp $
-
---- script/convert_smbpasswd.orig	Thu Nov  5 11:50:17 1998
-+++ script/convert_smbpasswd
-@@ -7,7 +7,7 @@
- # with trying to work out how to get the seconds since 1970
- # in awk or the shell. JRA.
- #
--nawk 'BEGIN {FS=":"} 
-+awk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0
diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak
deleted file mode 100644
index c9f7c7730c8..00000000000
--- a/net/samba/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2002/05/05 16:57:12 taca Exp $
-
---- Makefile.in.orig	Fri May  3 10:02:26 2002
-+++ Makefile.in
-@@ -51,7 +51,7 @@
- CONFIGFILE = $(CONFIGDIR)/smb.conf
- LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- DRIVERFILE = $(CONFIGDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
- 
diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am
deleted file mode 100644
index 1bfb658215a..00000000000
--- a/net/samba/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.3 2002/06/14 17:04:14 taca Exp $
-
---- param/loadparm.c.orig	Fri May  3 10:03:25 2002
-+++ param/loadparm.c
-@@ -655,7 +655,8 @@
- 	{CSC_POLICY_MANUAL, "manual"},
- 	{CSC_POLICY_DOCUMENTS, "documents"},
- 	{CSC_POLICY_PROGRAMS, "programs"},
--	{CSC_POLICY_DISABLE, "disable"}
-+	{CSC_POLICY_DISABLE, "disable"},
-+	{-1, NULL}
- };
- 
- /*