(1) Change Samba's "lockdir" from /var/run/samba to /var/db/samba.

(2) Add "piddir" as /var/run and "pidfile dir" and "pidfile directory"
    statement for smb.conf.
(3) Some fix for password synchronization but it isn't tested much and
    it is almost useless under "encrypt passwords = yes" environment.

Changes for INSTALL and part of Makefile are provided by
"Johnny C. Lam" <jlam@netbsd.org> and (2) and (3) are got
from FreeBSD ports.

Bump revision to 1; samba-2.2.3nb1 now.

7 files changed, 242 insertions, 0 deletions

diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
new file mode 100644
index 00000000000..b601a7cae1a
--- /dev/null
+++ b/net/samba/patches/patch-aa
@@ -0,0 +1,52 @@
+$NetBSD: patch-aa,v 1.17 2002/02/05 00:36:26 taca Exp $
+
+--- configure.in.orig	Sun Feb  3 09:46:35 2002
++++ configure.in
+@@ -13,13 +13,15 @@
+     codepagedir="\$(DATADIR)/samba/codepages"
+     configdir="${sysconfdir}/samba"
+     lockdir="\${VARDIR}/cache/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"
+     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
new file mode 100644
index 00000000000..c88fe6eae96
--- /dev/null
+++ b/net/samba/patches/patch-ab
@@ -0,0 +1,65 @@
+$NetBSD: patch-ab,v 1.13 2002/02/05 00:36:26 taca Exp $
+
+--- configure.orig	Sun Feb  3 09:46:35 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 @@
+   codepagedir="\$(DATADIR)/samba/codepages"
+     configdir="${sysconfdir}/samba"
+     lockdir="\${VARDIR}/cache/samba"
++    piddir="\$(VARDIR)/run"
+     logfilebase="\${VARDIR}/log/samba"
+     privatedir="\${CONFIGDIR}/private"
+     swatdir="\${DATADIR}/samba/swat"
+@@ -611,7 +614,8 @@
+   codepagedir="\$(LIBDIR)/codepages"
+     configdir="\$(LIBDIR)"
+     lockdir="\$(VARDIR)/locks"
+-    logfilebase="\$(VARDIR)"
++    piddir="\${VARDIR}/run"
++    logfilebase="\$(VARDIR)/log"
+     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
diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak
new file mode 100644
index 00000000000..41cbcf3c0a2
--- /dev/null
+++ b/net/samba/patches/patch-ak
@@ -0,0 +1,37 @@
+$NetBSD: patch-ak,v 1.1 2002/02/05 00:36:27 taca Exp $
+
+--- Makefile.in.orig	Sun Feb  3 09:46:05 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
+ 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@
+ 
+@@ -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-al b/net/samba/patches/patch-al
new file mode 100644
index 00000000000..3b0f1f65e70
--- /dev/null
+++ b/net/samba/patches/patch-al
@@ -0,0 +1,17 @@
+$NetBSD: patch-al,v 1.1 2002/02/05 00:36:27 taca Exp $
+
+--- include/local.h.orig	Sun Feb  3 09:46:39 2002
++++ include/local.h
+@@ -170,10 +170,10 @@
+  * Default passwd chat script.
+  */
+ 
+-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
++#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
+ 
+ /* Minimum length of allowed password when changing UNIX password. */
+-#define MINPASSWDLENGTH 5
++#define MINPASSWDLENGTH 6
+ 
+ /* maximum ID number used for session control. This cannot be larger
+    than 62*62 for the current code */
diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am
new file mode 100644
index 00000000000..9ea45e24b64
--- /dev/null
+++ b/net/samba/patches/patch-am
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..9e03fd127d9
--- /dev/null
+++ b/net/samba/patches/patch-an
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..b6fd0bfe9e7
--- /dev/null
+++ b/net/samba/patches/patch-ao
@@ -0,0 +1,37 @@
+$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)