Update to 1.9.18p8.

2 files changed, 25 insertions, 34 deletions

diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 740de5f2d10..75fb08306e9 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.2 1998/01/12 17:19:28 agc Exp $
-
---- Makefile.orig	Wed Jan  7 12:29:04 1998
-+++ Makefile	Fri Jan  9 17:48:49 1998
+--- Makefile.orig	Mon Jun  1 08:29:04 1998
++++ Makefile	Wed Jun 17 14:57:00 1998
 @@ -5,11 +5,11 @@
  ###########################################################################
  
@@ -53,7 +51,7 @@ $NetBSD: patch-aa,v 1.2 1998/01/12 17:19:28 agc Exp $
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -333,10 +334,10 @@
+@@ -352,10 +353,10 @@
  # LIBSM =   
  
  
@@ -65,9 +63,9 @@ $NetBSD: patch-aa,v 1.2 1998/01/12 17:19:28 agc Exp $
 +FLAGSM = -DFAST_SHARE_MODES
 +LIBSM = -lcrypt 
  
- 
- # This is for SEQUENT. 
-@@ -795,8 +796,8 @@
+ # This is for NetBSD 1.3  
+ # contributed by sean@fuzzymagic.com  
+@@ -824,8 +825,8 @@
  install: installbin installman installscripts installcp
  
  installbin: all
@@ -78,7 +76,7 @@ $NetBSD: patch-aa,v 1.2 1998/01/12 17:19:28 agc Exp $
  
  installscripts:
  	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -818,8 +819,8 @@
+@@ -847,8 +848,8 @@
  	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index 57f60631f16..9d60bfdf379 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,12 +1,5 @@
-$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	Tue May 12 20:46:49 1998
-+++ includes.h	Tue Jun  2 15:46:07 1998
+--- includes.h.orig	Sat Jun 13 03:44:19 1998
++++ includes.h	Wed Jun 17 15:03:22 1998
 @@ -198,7 +198,7 @@
  #include <pwdadj.h>
  #endif
@@ -16,14 +9,13 @@ updated for the next version of Samba.
  #include <shadow.h>
  #endif
  
-@@ -506,21 +506,22 @@
+@@ -510,23 +510,21 @@
  #endif
  
  
 -#ifdef NETBSD 
 -#ifdef NetBSD1_3
 -#include <string.h>
-+
 +#ifdef __NetBSD__
 +#include <dirent.h>
 +#include <strings.h>
@@ -35,6 +27,8 @@ updated for the next version of Samba.
 -#include <strings.h>
 -#endif /* NetBSD1_3 */
 -#include <netinet/tcp.h>
+-#include <netinet/in_systm.h> 
+-#include <netinet/ip.h> 
 -/* you may not need this */
 -#define NO_GETSPNAM
  #define SIGNAL_CAST (void (*)())
@@ -50,9 +44,8 @@ updated for the next version of Samba.
  #endif 
  
  
-
---- interface.c.orig	Fri Jan  9 17:22:01 1998
-+++ interface.c	Fri Jan  9 17:22:13 1998
+--- interface.c.orig	Tue May  5 01:27:35 1998
++++ interface.c	Wed Jun 17 14:57:01 1998
 @@ -161,7 +161,7 @@
        }
      }
@@ -62,9 +55,9 @@ updated for the next version of Samba.
    ifc.ifc_len = sizeof(buff);
    ifc.ifc_buf = buff;
    if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
---- quotas.c.orig	Fri Jan  9 17:27:17 1998
-+++ quotas.c	Fri Jan  9 17:29:13 1998
-@@ -546,7 +546,7 @@
+--- quotas.c.orig	Wed May 13 03:46:55 1998
++++ quotas.c	Wed Jun 17 14:57:01 1998
+@@ -548,7 +548,7 @@
  
  #else
  
@@ -73,7 +66,7 @@ updated for the next version of Samba.
  #include <ufs/ufs/quota.h>
  #include <machine/param.h>
  #elif         AIX
-@@ -556,7 +556,7 @@
+@@ -558,7 +558,7 @@
  #define dqb_curfiles dqb_curinodes
  #define dqb_fhardlimit dqb_ihardlimit
  #define dqb_fsoftlimit dqb_isoftlimit
@@ -82,7 +75,7 @@ updated for the next version of Samba.
  #include <sys/quota.h>
  #include <devnm.h>
  #endif
-@@ -569,7 +569,7 @@
+@@ -571,7 +571,7 @@
    uid_t euser_id;
    int r;
    struct dqblk D;
@@ -91,7 +84,7 @@ updated for the next version of Samba.
    char dev_disk[256];
    struct stat S;
    /* find the block device file */
-@@ -591,7 +591,7 @@
+@@ -593,7 +593,7 @@
        DEBUG(5,("Unable to reset uid to %d\n", user_id));
    }
  #else /* USE_SETRES */
@@ -100,7 +93,7 @@ updated for the next version of Samba.
    {
      /* FreeBSD patches from Marty Moll <martym@arbor.edu> */
      uid_t user_id;
-@@ -615,17 +615,17 @@
+@@ -617,17 +617,17 @@
    /* AIX has both USER and GROUP quotas: 
       Get the USER quota (ohnielse@fysik.dtu.dk) */
    r= quotactl(path,QCMD(Q_GETQUOTA,USRQUOTA),euser_id,(char *) &D);
@@ -123,7 +116,7 @@ updated for the next version of Samba.
  
    if (r)
      {
-@@ -641,7 +641,7 @@
+@@ -643,7 +643,7 @@
      return(False);
    /* Use softlimit to determine disk space, except when it has been exceeded */
    if ((D.dqb_curblocks>D.dqb_bsoftlimit)
@@ -132,9 +125,9 @@ updated for the next version of Samba.
  ||((D.dqb_curfiles>D.dqb_fsoftlimit) && (D.dqb_fsoftlimit != 0))
  #endif
      ) {
---- util.c.orig	Fri Jan  9 17:22:58 1998
-+++ util.c	Fri Jan  9 17:23:05 1998
-@@ -3352,7 +3352,7 @@
+--- util.c.orig	Sat Jun 13 03:44:21 1998
++++ util.c	Wed Jun 17 14:57:01 1998
+@@ -3614,7 +3614,7 @@
    
    bzero((char *)&sock,sizeof(sock));
    memcpy((char *)&sock.sin_addr,(char *)hp->h_addr, hp->h_length);