9 files changed, 38 insertions, 202 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 90a023797b8..361eb905891 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2002/02/07 09:57:19 taca Exp $
+# $NetBSD: Makefile,v 1.82 2002/05/05 16:57:10 taca Exp $
 
-DISTNAME=		samba-2.2.3a
-PKGNAME=		samba-2.2.3.1
+DISTNAME=		samba-2.2.4
+PKGNAME=		samba-2.2.4
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 3a639fb2ab6..885442d5813 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/02/05 00:36:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/05/05 16:57:11 taca Exp $
 bin/make_printerdef
 bin/make_smbcodepage
 bin/make_unicodemap
@@ -12,6 +12,7 @@ bin/smbpasswd
 bin/smbspool
 bin/smbstatus
 bin/smbtar
+bin/tdbbackup
 bin/testparm
 bin/testprns
 etc/rc.d/nmbd
@@ -86,14 +87,15 @@ share/doc/samba/PROFILES.txt
 share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
 share/doc/samba/README.DCEDFS
-share/doc/samba/README.jis
 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/Solaris-Winbind-HOWTO.txt
 share/doc/samba/Speed.txt
 share/doc/samba/Speed2.txt
 share/doc/samba/Tracing.txt
@@ -110,9 +112,6 @@ share/doc/samba/WinXP_SignOrSeal.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/doc/samba/announce
 share/doc/samba/cifsntdomain.txt
-share/doc/samba/kurs.pdf
-share/doc/samba/kurs.tex
-share/doc/samba/logo.ps
 share/doc/samba/security_level.txt
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/export2_smbpasswd.pl
@@ -121,6 +120,9 @@ share/examples/samba/LDAP/import2_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-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/README
 share/examples/samba/VFS/Makefile
@@ -130,6 +132,7 @@ share/examples/samba/VFS/block/Makefile
 share/examples/samba/VFS/block/block.c
 share/examples/samba/VFS/block/samba-block.conf
 share/examples/samba/VFS/block/smb.conf
+share/examples/samba/VFS/recycle.c
 share/examples/samba/VFS/skel.c
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/README
@@ -152,8 +155,9 @@ 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-new.sh
 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
diff --git a/net/samba/distinfo b/net/samba/distinfo
index d1686642ade..43bc1eb7727 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.16 2002/02/07 09:57:19 taca Exp $
+$NetBSD: distinfo,v 1.17 2002/05/05 16:57:11 taca Exp $
 
-SHA1 (samba-2.2.3a.tar.gz) = cbcb16419fc83e1b17f97c971d8f41962ff49d5b
-Size (samba-2.2.3a.tar.gz) = 5460531 bytes
-SHA1 (patch-aa) = 10a0f8f0f92b2ceae89eb4307ea5e60b6364b425
-SHA1 (patch-ab) = 92e8d3721ff137d90ae2e2fcf6d5c6820a90273e
+SHA1 (samba-2.2.4.tar.gz) = 0c2613e709f6f89e7986d7a7324263498e5b7d8c
+Size (samba-2.2.4.tar.gz) = 5205845 bytes
+SHA1 (patch-aa) = 8edea648581741845067097a3f82c973cd89a846
+SHA1 (patch-ab) = f2b84b6764cb960dcebd34df83c1b395021bf07a
 SHA1 (patch-ac) = a055bcc69e1a40124ada075ac836d1061ecfcd15
 SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c
 SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa
 SHA1 (patch-ai) = cc31eb9cfb2ee650400c18ceaaa9ec1a3626260f
 SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb
-SHA1 (patch-ak) = 110a676a911867b64bc319fceaf5e1dc1d7ecb26
+SHA1 (patch-ak) = a6f5c68e47f2251f8d697de14f4252c4c5f52f62
 SHA1 (patch-al) = 368c7f88c5538fcaa32d7263ba98d138ba179859
-SHA1 (patch-am) = 82ea8411d7988aa4b49bf98825d368339bbc25ec
-SHA1 (patch-an) = 74ce033913cc6ba19b1d98640a9f1a554286a9d7
-SHA1 (patch-ao) = b1fd0c8c73d88a4d53ca4f0f8b969f0744301ce7
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index b601a7cae1a..7eab2532cfc 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,52 +1,23 @@
-$NetBSD: patch-aa,v 1.17 2002/02/05 00:36:26 taca Exp $
+$NetBSD: patch-aa,v 1.18 2002/05/05 16:57:11 taca Exp $
 
---- configure.in.orig	Sun Feb  3 09:46:35 2002
+--- configure.in.orig	Fri May  3 10:02:46 2002
 +++ configure.in
-@@ -13,13 +13,15 @@
+@@ -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)"
-     lockdir="\$(VARDIR)/locks"
 -    logfilebase="\$(VARDIR)"
-+    piddir="\${VARDIR}/run"
 +    logfilebase="\$(VARDIR)/log"
+     lockdir="\${VARDIR}/locks"
+-    piddir="\$(VARDIR)/locks"
++    piddir="\$(VARDIR)/run"
      privatedir="\${prefix}/private"
      swatdir="\${prefix}/swat")
  
-@@ -56,6 +58,22 @@
-   esac])
- 
- #################################################
-+# set pid directory location
-+AC_ARG_WITH(piddir,
-+[  --with-piddir=DIR      Where to put lock files (\${VARDIR}/run)],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-piddir called without argument - will use default])
-+  ;;
-+  * )
-+    piddir="$withval"
-+    ;;
-+  esac])
-+
-+#################################################
- # set SWAT directory location
- AC_ARG_WITH(swatdir,
- [  --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)],
-@@ -123,6 +141,7 @@
- AC_SUBST(configdir)
- AC_SUBST(lockdir)
- AC_SUBST(logfilebase)
-+AC_SUBST(piddir)
- AC_SUBST(privatedir)
- AC_SUBST(swatdir)
- AC_SUBST(bindir)
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index c88fe6eae96..7db57937c10 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,65 +1,24 @@
-$NetBSD: patch-ab,v 1.13 2002/02/05 00:36:26 taca Exp $
+$NetBSD: patch-ab,v 1.14 2002/05/05 16:57:12 taca Exp $
 
---- configure.orig	Sun Feb  3 09:46:35 2002
+--- configure.orig	Fri May  3 10:02:45 2002
 +++ configure
-@@ -19,6 +19,8 @@
- ac_help="$ac_help
-   --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)"
- ac_help="$ac_help
-+  --with-piddir=DIR      Where to put lock files (\${VARDIR}/run)"
-+ac_help="$ac_help
-   --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)"
- ac_help="$ac_help
-   --with-configdir=DIR    Where to put configuration files (\$libdir)"
-@@ -604,6 +606,7 @@
+@@ -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"
-@@ -611,7 +614,8 @@
+ else
    codepagedir="\$(LIBDIR)/codepages"
      configdir="\$(LIBDIR)"
-     lockdir="\$(VARDIR)/locks"
 -    logfilebase="\$(VARDIR)"
-+    piddir="\${VARDIR}/run"
 +    logfilebase="\$(VARDIR)/log"
+     lockdir="\${VARDIR}/locks"
+-    piddir="\$(VARDIR)/locks"
++    piddir="\$(VARDIR)/run"
      privatedir="\${prefix}/private"
      swatdir="\${prefix}/swat"
- fi
-@@ -656,6 +660,25 @@
- 
- 
- #################################################
-+# set pid directory location
-+# Check whether --with-piddir or --without-piddir was given.
-+if test "${with_piddir+set}" = set; then
-+  withval="$with_piddir"
-+   case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    echo "configure: warning: --with-piddir called without argument - will use default" 1>&2
-+  ;;
-+  * )
-+    piddir="$withval"
-+    ;;
-+  esac
-+fi
-+
-+
-+#################################################
- # set SWAT directory location
- # Check whether --with-swatdir or --without-swatdir was given.
- if test "${with_swatdir+set}" = set; then
-@@ -13167,6 +13190,7 @@
- s%@configdir@%$configdir%g
- s%@lockdir@%$lockdir%g
- s%@logfilebase@%$logfilebase%g
-+s%@piddir@%$piddir%g
- s%@privatedir@%$privatedir%g
- s%@swatdir@%$swatdir%g
- s%@RUNPROG@%$RUNPROG%g
+ fi;
diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak
index 41cbcf3c0a2..c9f7c7730c8 100644
--- a/net/samba/patches/patch-ak
+++ b/net/samba/patches/patch-ak
@@ -1,13 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2002/02/05 00:36:27 taca Exp $
+$NetBSD: patch-ak,v 1.2 2002/05/05 16:57:12 taca Exp $
 
---- Makefile.in.orig	Sun Feb  3 09:46:05 2002
+--- Makefile.in.orig	Fri May  3 10:02:26 2002
 +++ Makefile.in
-@@ -46,11 +46,11 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--LOGFILEBASE = @logfilebase@
-+LOGFILEBASE = $(VARDIR)/log
+@@ -51,7 +51,7 @@
  CONFIGFILE = $(CONFIGDIR)/smb.conf
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  DRIVERFILE = $(CONFIGDIR)/printers.def
@@ -16,22 +11,3 @@ $NetBSD: patch-ak,v 1.1 2002/02/05 00:36:27 taca Exp $
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -63,6 +63,9 @@
- # the directory where lock files go
- LOCKDIR = @lockdir@
- 
-+# the directory where pid files go
-+PIDFILEDIR = /var/run
-+
- # libsmbclient support here
- BLDSHARED = @BLDSHARED@
- LIBSMBCLIENT_MAJOR=0
-@@ -78,7 +81,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
- FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
- FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am
deleted file mode 100644
index 9ea45e24b64..00000000000
--- a/net/samba/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/02/05 00:36:27 taca Exp $
-
---- include/proto.h.orig	Sun Feb  3 09:46:40 2002
-+++ include/proto.h
-@@ -1813,6 +1813,7 @@
- char *lp_deleteprinter_cmd(void);
- char *lp_os2_driver_map(void);
- char *lp_lockdir(void);
-+char *lp_piddir(void);
- char *lp_utmpdir(void);
- char *lp_wtmpdir(void);
- BOOL lp_utmp(void);
diff --git a/net/samba/patches/patch-an b/net/samba/patches/patch-an
deleted file mode 100644
index 9e03fd127d9..00000000000
--- a/net/samba/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/02/05 00:36:27 taca Exp $
-
---- lib/pidfile.c.orig	Sun Feb  3 09:46:42 2002
-+++ lib/pidfile.c
-@@ -37,7 +37,7 @@
- 	unsigned ret;
- 	pstring pidFile;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
- 	if (fd == -1) {
-@@ -78,7 +78,7 @@
- 	pstring pidFile;
- 	pid_t pid;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	pid = pidfile_pid(name);
- 	if (pid != 0) {
diff --git a/net/samba/patches/patch-ao b/net/samba/patches/patch-ao
deleted file mode 100644
index b6fd0bfe9e7..00000000000
--- a/net/samba/patches/patch-ao
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/02/05 00:36:27 taca Exp $
-
---- param/loadparm.c.orig	Sun Feb  3 09:46:46 2002
-+++ param/loadparm.c
-@@ -108,6 +108,7 @@
- 	char *szDeletePrinterCommand;
- 	char *szOs2DriverMap;
- 	char *szLockDir;
-+	char *szPidDir;
- 	char *szRootdir;
- 	char *szDefaultService;
- 	char *szDfree;
-@@ -997,6 +998,8 @@
- 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
- 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
- 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
-+	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
-+	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
- #ifdef WITH_UTMP
- 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
- 	{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
-@@ -1231,6 +1234,7 @@
- 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
- 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
- 	string_set(&Globals.szLockDir, LOCKDIR);
-+	string_set(&Globals.szPidDir, PIDFILEDIR);
- #ifdef WITH_UTMP
- 	string_set(&Globals.szUtmpDir, "");
- 	string_set(&Globals.szWtmpDir, "");
-@@ -1481,6 +1485,7 @@
- FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
- FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
- FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
- #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)