Samba 1.9.18 is dead, upgrade to samba 2.0.2.

2 files changed, 37 insertions, 211 deletions

diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index c95e583e0bd..28e4c0fdf54 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,36 +1,23 @@
-$NetBSD: patch-aa,v 1.6 1998/09/04 19:17:18 bad Exp $
-
---- Makefile.orig	Mon Jun  1 02:29:04 1998
-+++ Makefile	Sun Aug  2 14:52:27 1998
-@@ -5,11 +5,11 @@
- ###########################################################################
- 
- # The base directory for all samba files
--BASEDIR = /usr/local/samba
-+BASEDIR = $(PREFIX)
- 
- # The base manpages directory to put the man pages in
- # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
--MANDIR = /usr/local/man
-+MANDIR = $(PREFIX)/man
- 
- # The directories to put things in. If you use multiple
- # architectures or share the samba binaries across NFS then
-@@ -18,9 +18,11 @@
- #       normally only applies to nmbd and smbd
- #       SBINDIR implies a secure binary directory
- BINDIR = $(BASEDIR)/bin
--SBINDIR = $(BASEDIR)/bin
-+SBINDIR = $(BASEDIR)/sbin
- LIBDIR = $(BASEDIR)/lib
--VARDIR = $(BASEDIR)/var
+$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
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
+ LIBDIR = @libdir@
+-VARDIR = @localstatedir@
+ MANDIR = @mandir@
 +ETCDIR?= $(BASEDIR)/etc
 +LOGDIR?= $(BASEDIR)/log
-+PRIVDIR?= $(BASEDIR)/private
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -45,17 +47,17 @@
+@@ -36,12 +35,12 @@
  # 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))
@@ -39,56 +26,35 @@ $NetBSD: patch-aa,v 1.6 1998/09/04 19:17:18 bad Exp $
 -CONFIGFILE = $(LIBDIR)/smb.conf
 -LMHOSTSFILE = $(LIBDIR)/lmhosts
 -DRIVERFILE = $(LIBDIR)/printers.def
-+SMBLOGFILE = $(LOGDIR)/smb
-+NMBLOGFILE = $(LOGDIR)/nmb
+-PASSWD_PROGRAM = /bin/passwd
++SMBLOGFILE = $(LOGDIR)/log.smb
++NMBLOGFILE = $(LOGDIR)/log.nmb
 +CONFIGFILE = $(ETCDIR)/smb.conf
 +LMHOSTSFILE = $(ETCDIR)/lmhosts
 +DRIVERFILE = $(ETCDIR)/printers.def
- SMB_PASSWD = $(BINDIR)/smbpasswd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
-+SMB_PASSWD_FILE = $(PRIVDIR)/smbpasswd
--WEB_ROOT = $(BASEDIR)
-+WEB_ROOT = $(BASEDIR)/http/htdocs
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR?= $(VARDIR)/locks
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -352,10 +354,10 @@
- # LIBSM =   
- 
- 
--# This is for NetBSD. Add -DNETBSD_1_0 if you are using 1.0
-+# This is for NetBSD
- # contributed by noses@oink.rhein.de
--# FLAGSM = -DNETBSD -DSHADOW_PWD
--# LIBSM = -lcrypt 
-+FLAGSM = -DFAST_SHARE_MODES -DSHADOW_PWD -DNETGROUP -DALLOW_CHANGE_PASSWORD -DQUOTAS
-+LIBSM = -lcrypt 
++PASSWD_PROGRAM = /usr/bin/passwd
+ # This is where smbpasswd et al go
+ PRIVATEDIR = @privatedir@
  
- # This is for NetBSD 1.3  
- # contributed by sean@fuzzymagic.com  
-@@ -824,8 +826,8 @@
- install: installbin installman installscripts installcp
+@@ -430,8 +429,8 @@
+ 	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
  
- installbin: all
--	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+ installbin: all installdirs
+-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
  
- installscripts:
- 	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -847,8 +849,8 @@
- 	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
+ installscripts: installdirs
+ 	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+@@ -456,8 +455,8 @@
+ 	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+-	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+-	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
  
  uninstallscripts:
- 	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+ 	@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
deleted file mode 100644
index d9c935d0948..00000000000
--- a/net/samba/patches/patch-ab
+++ /dev/null
@@ -1,140 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1998/09/04 19:17:19 bad Exp $
-
---- includes.h.orig	Thu Aug 20 01:41:46 1998
-+++ includes.h	Tue Sep  1 17:35:13 1998
-@@ -200,7 +200,7 @@
- #include <pwdadj.h>
- #endif
- 
--#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(FreeBSD) && !defined(CONVEX) && !defined(__OpenBSD__)
-+#if defined(SHADOW_PWD) && !defined(CONVEX)  && !defined(__NetBSD__)
- #include <shadow.h>
- #endif
- 
-@@ -518,23 +518,22 @@
- #endif
- 
- 
--#ifdef NETBSD 
--#ifdef NetBSD1_3
--#include <string.h>
-+#ifdef __NetBSD__
-+#include <dirent.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>
--#include <netinet/in_systm.h> 
--#include <netinet/ip.h> 
--/* you may not need this */
- #define NO_GETSPNAM
- #define SIGNAL_CAST (void (*)())
--#define USE_DIRECT
--#define REPLACE_INNETGR
-+#define HAVE_BZERO
-+#define HAVE_PATHCONF
-+#define HAVE_GETGRNAM 1
-+#define HAVE_GETTIMEOFDAY
-+#define HAVE_MEMMOVE
-+#define USE_GETCWD
-+#define USE_SETSID
- #endif 
- 
- 
---- interface.c.orig	Tue May  5 01:27:35 1998
-+++ interface.c	Wed Jun 17 14:57:01 1998
-@@ -161,7 +161,7 @@
-       }
-     }
-   }
--#elif defined(__FreeBSD__) || defined(NETBSD) || defined(AMIGA) || defined(_AIX41) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(AMIGA) || defined(_AIX41) || defined(__OpenBSD__)
-   ifc.ifc_len = sizeof(buff);
-   ifc.ifc_buf = buff;
-   if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
---- quotas.c.orig	Wed May 13 03:46:55 1998
-+++ quotas.c	Wed Jun 17 14:57:01 1998
-@@ -548,7 +548,7 @@
- 
- #else
- 
--#if    defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if    defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- #include <ufs/ufs/quota.h>
- #include <machine/param.h>
- #elif         AIX
-@@ -558,7 +558,7 @@
- #define dqb_curfiles dqb_curinodes
- #define dqb_fhardlimit dqb_ihardlimit
- #define dqb_fsoftlimit dqb_isoftlimit
--#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
-+#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
- #include <sys/quota.h>
- #include <devnm.h>
- #endif
-@@ -571,7 +571,7 @@
-   uid_t euser_id;
-   int r;
-   struct dqblk D;
--#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-   char dev_disk[256];
-   struct stat S;
-   /* find the block device file */
-@@ -593,7 +593,7 @@
-       DEBUG(5,("Unable to reset uid to %d\n", user_id));
-   }
- #else /* USE_SETRES */
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-   {
-     /* FreeBSD patches from Marty Moll <martym@arbor.edu> */
-     uid_t user_id;
-@@ -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);
--#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
-+#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
-   r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D);
--#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
-+#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
- #endif /* USE_SETRES */
- 
-   /* Use softlimit to determine disk space, except when it has been exceeded */
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-   *bsize = DEV_BSIZE;
--#else /* !__FreeBSD__ && !__OpenBSD__ */
-+#else /* !__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */
-   *bsize = 1024;
--#endif /*!__FreeBSD__ && !__OpenBSD__ */
-+#endif /*!__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */
- 
-   if (r)
-     {
-@@ -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)
--#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- ||((D.dqb_curfiles>D.dqb_fsoftlimit) && (D.dqb_fsoftlimit != 0))
- #endif
-     ) {
---- 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);
--#if defined(__FreeBSD__) || defined(NETBSD) || defined(__OpenBSD__) /* XXX not the right ifdef */
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) /* XXX not the right ifdef */
-   sock.sin_len = sizeof(sock);
- #endif
-   sock.sin_port = htons( port );