Update to 2.0.5a. Supplied by mcmahill@mtl.mit.edu with minor corrections by

me.

5 files changed, 22 insertions, 27 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index afa0e0c2b3b..16927b261dd 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 1999/04/13 15:31:06 agc Exp $
+# $NetBSD: Makefile,v 1.27 1999/08/10 16:38:08 bouyer Exp $
 
-DISTNAME=	samba-2.0.3
+DISTNAME=	samba-2.0.5a
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/
 
diff --git a/net/samba/files/md5 b/net/samba/files/md5
index 7e9fd539fba..a9bff4d9638 100644
--- a/net/samba/files/md5
+++ b/net/samba/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.10 1999/03/29 16:15:34 bouyer Exp $
+$NetBSD: md5,v 1.11 1999/08/10 16:38:09 bouyer Exp $
 
-MD5 (samba-2.0.3.tar.gz) = 1c316bb482a95e6c3faaf04cde6d1503
+MD5 (samba-2.0.5a.tar.gz) = 497e5f98ed9b520b18e926ff2f7307ba
diff --git a/net/samba/files/patch-sum b/net/samba/files/patch-sum
index 6696bfc8e49..5f5d7044bdd 100644
--- a/net/samba/files/patch-sum
+++ b/net/samba/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:28 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/10 16:38:09 bouyer Exp $
 
-MD5 (patch-aa) = e4eb68f8d23f73a3c372c2af60f98199
+MD5 (patch-aa) = fcaa48677643b782d79f3b48dd9442c1
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 28e4c0fdf54..824b9c49f83 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,12 +1,10 @@
-$NetBSD: patch-aa,v 1.7 1999/02/18 11:50:07 bouyer Exp $
---- Makefile.in.orig	Sat Feb  6 22:51:43 1999
-+++ Makefile.in	Thu Feb 11 14:29:47 1999
-@@ -23,12 +23,11 @@
- 
- BASEDIR= @prefix@
- BINDIR = @bindir@
--# we don't use sbindir because we want full compatibility with
--# the previous releases of Samba
+$NetBSD: patch-aa,v 1.8 1999/08/10 16:38:09 bouyer Exp $
+
+--- Makefile.in.orig	Tue Jul 20 21:24:31 1999
++++ Makefile.in	Sun Aug  8 21:31:11 1999
+@@ -26,8 +26,9 @@
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
 -SBINDIR = @bindir@
 +SBINDIR = @sbindir@
  LIBDIR = @libdir@
@@ -16,9 +14,7 @@ $NetBSD: patch-aa,v 1.7 1999/02/18 11:50:07 bouyer Exp $
 +LOGDIR?= $(BASEDIR)/log
  
  # The permissions to give the executables
- INSTALLPERMS = 0755
-@@ -36,12 +35,12 @@
- # set these to where to find various files
+@@ -37,10 +38,10 @@
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
 -SMBLOGFILE = $(VARDIR)/log.smb
@@ -35,9 +31,7 @@ $NetBSD: patch-aa,v 1.7 1999/02/18 11:50:07 bouyer Exp $
 +PASSWD_PROGRAM = /usr/bin/passwd
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
- 
-@@ -430,8 +429,8 @@
- 	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
+@@ -443,6 +444,6 @@
  
  installbin: all installdirs
 -	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@@ -46,9 +40,7 @@ $NetBSD: patch-aa,v 1.7 1999/02/18 11:50:07 bouyer Exp $
 +	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
  
  installscripts: installdirs
- 	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -456,8 +455,8 @@
- 	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
+@@ -469,6 +470,6 @@
  
  uninstallbin:
 -	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@@ -57,4 +49,3 @@ $NetBSD: patch-aa,v 1.7 1999/02/18 11:50:07 bouyer Exp $
 +	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
  
  uninstallscripts:
- 	@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index 9cf9417e225..d1c7b038331 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 1999/03/29 16:15:34 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.12 1999/08/10 16:38:10 bouyer Exp $
 bin/mksmbpasswd.sh
 bin/addtosmbpass
 bin/convert_smbpasswd
@@ -26,6 +26,7 @@ man/man1/make_smbcodepage.1
 man/man1/nmblookup.1
 man/man1/smbclient.1
 man/man1/smbrun.1
+man/man1/smbsh.1
 man/man1/smbstatus.1
 man/man1/smbtar.1
 man/man1/testparm.1
@@ -46,6 +47,7 @@ share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/NT_Security.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
 share/swat/help/smbclient.1.html
@@ -53,6 +55,7 @@ share/swat/help/smbd.8.html
 share/swat/help/smbpasswd.5.html
 share/swat/help/smbpasswd.8.html
 share/swat/help/smbrun.1.html
+share/swat/help/smbsh.1.html
 share/swat/help/smbstatus.1.html
 share/swat/help/smbtar.1.html
 share/swat/help/swat.8.html
@@ -114,7 +117,7 @@ share/doc/samba/textdocs/INSTALL.sambatar
 share/doc/samba/textdocs/MIRRORS.txt
 share/doc/samba/textdocs/Macintosh_Clients.txt
 share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NT-Guest-Access.txt
+share/doc/samba/textdocs/NT_Security.txt
 share/doc/samba/textdocs/NetBIOS.txt
 share/doc/samba/textdocs/OS2-Client-HOWTO.txt
 share/doc/samba/textdocs/PRINTER_DRIVER.txt
@@ -125,6 +128,7 @@ share/doc/samba/textdocs/Printing.txt
 share/doc/samba/textdocs/README.DCEDFS
 share/doc/samba/textdocs/README.jis
 share/doc/samba/textdocs/README.sambatar
+share/doc/samba/textdocs/README.smbmount
 share/doc/samba/textdocs/Recent-FAQs.txt
 share/doc/samba/textdocs/RoutedNetworks.txt
 share/doc/samba/textdocs/SCO.txt