Update to 2.0.7.

PR:		ports/18266
Submitted by:	Anton N. Breusov <antonz@library.ntu-kpi.kiev.ua>
Approved by:	MAINTAINER

2 files changed, 24 insertions, 26 deletions

diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index 3c705946b562..3633f55c7b8f 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,17 +1,15 @@
---- Makefile.in.orig	Wed Jul 21 03:24:31 1999
-+++ Makefile.in	Fri Oct 15 12:04:52 1999
-@@ -23,9 +23,7 @@
- 
- BASEDIR= @prefix@
+--- Makefile.in.orig	Wed Apr 26 02:06:11 2000
++++ Makefile.in	Thu Apr 27 11:08:08 2000
+@@ -25,7 +25,7 @@
  BINDIR = @bindir@
--# we don't use sbindir because we want full compatibility with
--# the previous releases of Samba
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
 -SBINDIR = @bindir@
 +SBINDIR = @sbindir@
  LIBDIR = @libdir@
  VARDIR = @localstatedir@
  MANDIR = @mandir@
-@@ -36,12 +34,13 @@
+@@ -37,12 +37,13 @@
  # 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))
@@ -28,7 +26,7 @@
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -53,6 +52,9 @@
+@@ -54,6 +55,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -38,7 +36,7 @@
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
  
-@@ -70,7 +72,7 @@
+@@ -71,7 +75,7 @@
  PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
  FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab
index b3d798c9f601..40158831ba75 100644
--- a/net/samba3/files/patch-ab
+++ b/net/samba3/files/patch-ab
@@ -1,6 +1,6 @@
---- param/loadparm.c.orig	Fri Jan 15 22:35:00 1999
-+++ param/loadparm.c	Fri Jan 15 22:33:18 1999
-@@ -104,6 +104,7 @@
+--- param/loadparm.c.orig	Wed Apr 26 02:07:00 2000
++++ param/loadparm.c	Thu Apr 27 11:12:03 2000
+@@ -105,6 +105,7 @@
  {
    char *szPrintcapname;
    char *szLockDir;
@@ -8,28 +8,28 @@
    char *szRootdir;
    char *szDefaultService;
    char *szDfree;
-@@ -747,6 +748,8 @@
-   {"auto services",    P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-   {"lock dir",         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
+@@ -820,6 +821,8 @@
+   {"preload",          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
    {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
+   {"lock dir",         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},
-   {"default service",  P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
-   {"default",          P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
-   {"message command",  P_STRING,  P_GLOBAL, &Globals.szMsgCommand,      NULL,   NULL,  0},
-@@ -824,6 +827,7 @@
+ #ifdef WITH_UTMP
+   {"utmp directory",   P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
+   {"utmp dir",         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
+@@ -911,6 +914,7 @@
    string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
    string_set(&Globals.szDriverFile, DRIVERFILE);
    string_set(&Globals.szLockDir, LOCKDIR);
 +  string_set(&Globals.szPidDir, PIDFILEDIR);
    string_set(&Globals.szRootdir, "/");
-   string_set(&Globals.szSmbrun, SMBRUN);
-   string_set(&Globals.szSocketAddress, "0.0.0.0");
-@@ -1100,6 +1104,7 @@
+ #ifdef WITH_UTMP
+   string_set(&Globals.szUtmpDir, "");
+@@ -1185,6 +1189,7 @@
  FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
  FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
  FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
 +FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
- FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
- FN_GLOBAL_STRING(lp_defaultservice,&Globals.szDefaultService)
- FN_GLOBAL_STRING(lp_msg_command,&Globals.szMsgCommand)
+ #ifdef WITH_UTMP
+ FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)