Upgrade to samba version 1.9.18p7, from Ty Sarna in PR pkg/5529.

4 files changed, 29 insertions, 14 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 8f4c9b1c7ed..1ce459d27cd 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1998/06/03 13:16:57 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/06/04 13:08:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
 #
 
-DISTNAME=	samba-1.9.18p3
+DISTNAME=	samba-1.9.18p7
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
diff --git a/net/samba/files/md5 b/net/samba/files/md5
index 08a65a0d480..2442bb4c01f 100644
--- a/net/samba/files/md5
+++ b/net/samba/files/md5
@@ -1 +1 @@
-MD5 (samba-1.9.18p3.tar.gz) = b7adc45f05547d0148cc0a722ca557a5
+MD5 (samba-1.9.18p7.tar.gz) = f18aacbf545aed72b1a0097a62b4550d
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index ca5894fa79a..57f60631f16 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 1998/01/12 17:31:16 agc Exp $
+$NetBSD: patch-ab,v 1.2 1998/06/04 13:08:36 agc Exp $
 
 Note: I (tsarna@endicor.com) have submitted the patches in this file 
 plus a more generic Makefile patch (ie, without the pkgsrc changes) to
 the Samba group. I hope this file can be deleted when this package is
 updated for the next version of Samba. 
 
---- includes.h.orig	Fri Jan  9 17:24:10 1998
-+++ includes.h	Fri Jan  9 17:37:08 1998
-@@ -193,7 +193,7 @@
+--- includes.h.orig	Tue May 12 20:46:49 1998
++++ includes.h	Tue Jun  2 15:46:07 1998
+@@ -198,7 +198,7 @@
  #include <pwdadj.h>
  #endif
  
@@ -16,15 +16,25 @@ updated for the next version of Samba.
  #include <shadow.h>
  #endif
  
-@@ -492,16 +492,19 @@
+@@ -506,21 +506,22 @@
  #endif
  
  
--#ifdef NETBSD
+-#ifdef NETBSD 
+-#ifdef NetBSD1_3
+-#include <string.h>
++
 +#ifdef __NetBSD__
 +#include <dirent.h>
- #include <strings.h>
- #include <netinet/tcp.h>
++#include <strings.h>
++#include <netinet/tcp.h>
+ #ifdef ALLOW_CHANGE_PASSWORD
+ #include <termios.h>
+ #endif /* ALLOW_CHANGE_PASSWORD */
+-#else /* NetBSD1_3 */
+-#include <strings.h>
+-#endif /* NetBSD1_3 */
+-#include <netinet/tcp.h>
 -/* you may not need this */
 -#define NO_GETSPNAM
  #define SIGNAL_CAST (void (*)())
@@ -38,10 +48,9 @@ updated for the next version of Samba.
 +#define USE_GETCWD
 +#define USE_SETSID
  #endif 
--
  
  
- #ifdef FreeBSD
+
 --- interface.c.orig	Fri Jan  9 17:22:01 1998
 +++ interface.c	Fri Jan  9 17:22:13 1998
 @@ -161,7 +161,7 @@
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index dad3bc26c91..0544527718e 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1998/02/25 22:33:10 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/06/04 13:08:36 agc Exp $
 bin/addtosmbpass
 bin/make_printerdef
 bin/make_smbcodepage
@@ -18,6 +18,9 @@ lib/codepages/codepage.850
 lib/codepages/codepage.852
 lib/codepages/codepage.866
 lib/codepages/codepage.932
+lib/codepages/codepage.936
+lib/codepages/codepage.949
+lib/codepages/codepage.950
 man/man1/make_smbcodepage.1.gz
 man/man1/smbclient.1.gz
 man/man1/smbrun.1.gz
@@ -58,12 +61,14 @@ share/doc/samba/Application_Serving.txt
 share/doc/samba/BROWSING.txt
 share/doc/samba/BUGS.txt
 share/doc/samba/CVS_ACCESS.txt
+share/doc/samba/DHCP-Server-Configuration.txt
 share/doc/samba/DIAGNOSIS.txt
 share/doc/samba/DNIX.txt
 share/doc/samba/DOMAIN.txt
 share/doc/samba/DOMAIN_CONTROL.txt
 share/doc/samba/ENCRYPTION.txt
 share/doc/samba/Faxing.txt
+share/doc/samba/PROFILES.txt
 share/doc/samba/GOTCHAS.txt
 share/doc/samba/HINTS.txt
 share/doc/samba/MIRRORS.txt
@@ -75,6 +80,7 @@ share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
 share/doc/samba/SCO.txt
 share/doc/samba/Speed.txt
+share/doc/samba/Speed2.txt
 share/doc/samba/Support.txt
 share/doc/samba/Tracing.txt
 share/doc/samba/UNIX-SMB.txt