Updated samba to 2.0.7. Major changes from version 2.0.6 are below. A

complete list of changes can be found at http://www.samba.org/.

New Documentation in 2.0.7
--------------------------

O'Reilly and Associates have donated their book "Using Samba"
to the Samba community to be updated in a collaberative way
along with the Samba software. Starting with this release the
html of "Using Samba" will be distributed with the Samba software
as the online documentation for Samba. Bug fixes for the book
are encouraged as is new material. Please help us make this
documentation the best it can be for Samba !

Windows 2000 Issues
-------------------

This version of Samba has been tested with Windows 2000 and
the five known incompatibilities with Windows 2000 have been
fixed. See the "Changes in 2.0.7" list below for details.

New/Changed parameters in 2.0.7
-------------------------------

There are 5 new parameters in the smb.conf file.

utmp
utmp dir
utmp hostname
utmp consolidate
wtmp directory

These parameters are only available if the "--with-utmp"
option was selected at configure time. The yes/no option "utmp"
specifies whether utmp records should be recorded on user
logon/logoff. It defaults to "no". The "utmp dir" and "wtmp dir"
are string parameters specifying pathnames to the directories containing
the utmp/wtmp file databases. See the smb.conf man page for more details.

inherit permissions

This boolean parameter causes newly created files and directories
to inherit their initial permissions from their parent directory.
This can be very useful in propagating such things as the set-group
bit in directory heirarchies. See the smb.conf man page for more
details.

write cache size

This integer parameter specifies (in bytes) the size of a user level
per-file write cache that smbd will create for an oplocked file. This
can improve performance significantly for writing files by causing
writes to be done in large chunk sizes. If this parameter is set (it
defaults to zero which means no write cache) to the stripe size of
a raid volume then it will cause writes to be much more efficient.
Up to 10 write caches can be active simultaneously per smbd (allocated
for the first 10 oplocked file opens). All normal warnings about the
dangers of user level caching of data apply. See the smb.conf man page
for more details.

source environment

This pathname parameter causes Samba to read a list of environment
variables from a named file on startup. This can be useful in setting
up Samba in a clustered environment. See the smb.conf man page for more
details.

Ability to delete users added
-----------------------------

SWAT and smbpasswd can now delete users from the Samba smbpasswd file.
See the man page for smbpasswd for details.

Roving profile behavior finalized
---------------------------------

The change in behavior with roving profiles (using the "logon home"
parameter instead of the "logon path" parameter) introduced in 2.0.6
has been discovered to be consistant with the way Windows NT behaves,
and has been left as the default action. Please see the additional
notes in the "logon home" parameter description in the smb.conf man
page for more details.

13 files changed, 344 insertions, 144 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index e13d3a99403..9aaacff0ef6 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,88 +1,92 @@
-# $NetBSD: Makefile,v 1.31 2000/01/19 00:42:41 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2000/05/02 15:24:08 jlam Exp $
 
-DISTNAME=	samba-2.0.6
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.samba.org/pub/samba/
+DISTNAME=		samba-2.0.7
+WRKSRC=			${WRKDIR}/${DISTNAME}/source
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
+			http://us1.samba.org/samba/ftp/ \
+			ftp://us3.samba.org/pub/mirrors/sambaftp/
 
-MAINTAINER=	bouyer@netbsd.org
-HOMEPAGE=	http://www.samba.org/
+MAINTAINER=		bouyer@netbsd.org
+HOMEPAGE=		http://www.samba.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
 
 .if !exists(/usr/include/readline.h)
-DEPENDS+=	readline-4.0:../../devel/readline
+DEPENDS+=		readline-4.0:../../devel/readline
 .endif
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
-SAMPLE_CONFIG=	${PREFIX}/share/examples/samba/smb.conf.sample
-SAMBA_LOGDIR=	/var/log
-SAMBA_LOCKDIR=	/var/run/samba
-SAMBA_ETCDIR?=	/etc/samba
-SAMBA_PRIVATE?=	${SAMBA_ETCDIR}/private
+STARTUP_SCRIPT=		${PREFIX}/etc/rc.d/samba.sh.sample
+SAMPLE_CONFIG=		${PREFIX}/share/examples/samba/smb.conf.sample
+SAMBA_LOGDIR=		/var/log
+SAMBA_LOCKDIR=		/var/run/samba
+SAMBA_ETCDIR?=		/etc/samba
+SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
 
-MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR}
-MAKE_ENV+=	LOGDIR=${SAMBA_LOGDIR}
+MAKE_ENV+=		ETCDIR=${SAMBA_ETCDIR}
+MAKE_ENV+=		LOGDIR=${SAMBA_LOGDIR}
 
-CONFIGURE_ARGS= --with-swatdir=${PREFIX}/share/swat \
-		--with-lockdir=${SAMBA_LOCKDIR} \
-		--with-privatedir=${SAMBA_PRIVATE}
+CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR} \
+			--with-privatedir=${SAMBA_PRIVATE} \
+			--with-swatdir=${PREFIX}/share/swat \
+			--with-sambabook=${PREFIX}/share/swat/using_samba
 
-PLIST_SUBST+=	SAMBA_PRIVATE=${SAMBA_PRIVATE}
+PLIST_SUBST+=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
+
+INSTALL_FILE=		${WRKDIR}/INSTALL
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 
 pre-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf
 
 post-install:
+	# Install Samba documentation.
+	#	
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/faq
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/textdocs
 	cd ${WRKDIR}/${DISTNAME}/docs; \
-	for file in NT4-Locking.txt NT4_PlainPassword.reg	\
-	    Win2000_PlainPassword.reg Win95_PlainPassword.reg	\
-	    Win98_PlainPassword.reg Win9X-CacheHandling.reg	\
-	    WindowsTerminalServer.reg THANKS announce ; do	\
+	for file in \
+	    NT4-Locking.reg NT4-Locking.txt NT4_PlainPassword.reg \
+	    THANKS Win2000_PlainPassword.reg Win95_PlainPassword.reg \
+	    Win98_PlainPassword.reg Win9X-CacheHandling.reg \
+	    WindowsTerminalServer.reg announce; do \
 		${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba; \
 	done
-	for file in ${WRKDIR}/${DISTNAME}/docs/faq/*.html ; do \
+	for file in ${WRKDIR}/${DISTNAME}/docs/faq/*.html; do \
 		${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba/faq; \
 	done
-	for file in ${WRKDIR}/${DISTNAME}/docs/textdocs/* ; do \
+	for file in ${WRKDIR}/${DISTNAME}/docs/textdocs/*; do \
 		${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba/textdocs; \
 	done
 
+	# Install Samba examples.
+	#	
 	${MKDIR} ${PREFIX}/share/examples/samba
-	cd ${WRKDIR}/${DISTNAME}/examples; \
-	${CP} -R * ${PREFIX}/share/examples/samba
+	${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/samba
 	${CHMOD} -R ugo-w ${PREFIX}/share/examples/samba
 
-	${SED}	-e "s:__PREFIX__:${PREFIX}:g" \
-		-e "s:__ECHO__:${ECHO}:g" \
-		${FILESDIR}/samba.sh \
-		> ${WRKDIR}/samba.sh
+	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
+		-e "s,@ECHO@,${ECHO},g" \
+		< ${FILESDIR}/samba.sh > ${WRKDIR}/samba.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${STARTUP_SCRIPT}
 
-	${SED}	-e 's:__LOGDIR__:${SAMBA_LOGDIR}:g' \
-		-e 's:__ETCDIR__:${SAMBA_ETCDIR}:g' \
-		-e 's:__PREFIX__:${PREFIX}:g' \
-		${FILESDIR}/smb.conf.sample \
-		> ${WRKDIR}/smb.conf.sample
+	${SED}	-e 's,@LOGDIR@,${SAMBA_LOGDIR},g' \
+		-e 's,@ETCDIR@,${SAMBA_ETCDIR},g' \
+		-e 's,@PREFIX@,{PREFIX},g' \
+		< ${FILESDIR}/smb.conf.sample > ${WRKDIR}/smb.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${SAMPLE_CONFIG}
-
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin
-	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
-		${MKDIR} ${SAMBA_PRIVATE} ;				\
-		${CHOWN} root:${BINGRP} ${SAMBA_PRIVATE} ;		\
-		${CHMOD} 700 ${SAMBA_PRIVATE} ;				\
-	fi
-	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then                   \
-		${CAT} /etc/passwd | ${PREFIX}/bin/mksmbpasswd.sh	\
-			> ${SAMBA_PRIVATE}/smbpasswd ;			\
-		${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ;                  \
-	fi
+
+	${SED}	-e "s,@SAMBA_PRIVATE@,${SAMBA_PRIVATE},g" \
+		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	${SED}	-e "s,@SAMBA_PRIVATE@,${SAMBA_PRIVATE},g" \
+		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/files/md5 b/net/samba/files/md5
index 5f342bbf990..2945d44bf02 100644
--- a/net/samba/files/md5
+++ b/net/samba/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.12 1999/11/16 21:01:05 jlam Exp $
+$NetBSD: md5,v 1.13 2000/05/02 15:24:09 jlam Exp $
 
-MD5 (samba-2.0.6.tar.gz) = 87b3a9a2de94fe44b804f32def38266d
+MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0
diff --git a/net/samba/files/patch-sum b/net/samba/files/patch-sum
index e0811a0bacc..845cd5aa706 100644
--- a/net/samba/files/patch-sum
+++ b/net/samba/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.5 2000/02/05 19:55:36 wiz Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/02 15:24:09 jlam Exp $
 
-MD5 (patch-aa) = ec7d06cb6906d123898042ddc1023de6
-MD5 (patch-ac) = 22d4c0e385cfaebeb037880788e2c843
-MD5 (patch-ad) = 71024b4dc45dc0efb20dc8d23f473a62
-MD5 (patch-ae) = b147480c2a01874bb6cb4cbce2b7894c
-MD5 (patch-af) = 971f4a0975fbaa5bc11544248d4c7bfa
+MD5 (patch-aa) = 5f8d85555680d54350fffe200229ce41
+MD5 (patch-ac) = 2c9a7e95317eb7d9d505e01b5165dcc1
+MD5 (patch-ad) = b6b97e8bfeeb31bc2a86018ede0237b0
+MD5 (patch-ae) = 007397b3c2c28b68b23d210979ea4846
+MD5 (patch-af) = f9dab8b4ecc3ef5a15ac24fd0429db3c
diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh
index 44e38beea81..a5d34674320 100644
--- a/net/samba/files/samba.sh
+++ b/net/samba/files/samba.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: samba.sh,v 1.1 1999/11/16 21:01:05 jlam Exp $
+# $NetBSD: samba.sh,v 1.2 2000/05/02 15:24:09 jlam Exp $
 
-smbd=__PREFIX__/sbin/smbd
-nmbd=__PREFIX__/sbin/nmbd
+smbd=@PREFIX@/sbin/smbd
+nmbd=@PREFIX@/sbin/nmbd
 
 if [ -f ${smbd} ]; then
-	__ECHO__ -n ' samba'
+	@ECHO@ -n ' samba'
 	${smbd} -D
 	${nmbd} -D
 fi
diff --git a/net/samba/files/smb.conf.sample b/net/samba/files/smb.conf.sample
index 8db4eda7e37..1db2ca4f5cd 100644
--- a/net/samba/files/smb.conf.sample
+++ b/net/samba/files/smb.conf.sample
@@ -1,4 +1,4 @@
-# $NetBSD: smb.conf.sample,v 1.5 1999/11/16 21:23:05 jlam Exp $
+# $NetBSD: smb.conf.sample,v 1.6 2000/05/02 15:24:09 jlam Exp $
 #
 # This is the main Samba configuration file. You should read the
 # smb.conf(5) manual page in order to understand the options listed
@@ -52,7 +52,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = __LOGDIR__/log.%m
+   log file = @LOGDIR@/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -71,7 +71,7 @@
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
 # of the machine that is connecting
-;   include = __ETCDIR__/smb.conf.%m
+;   include = @ETCDIR@/smb.conf.%m
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
@@ -147,7 +147,7 @@
 # Un-comment the following and create the netlogon directory for Domain Logons
 ; [netlogon]
 ;   comment = Network Logon Service
-;   path = __PREFIX__/lib/netlogon
+;   path = @PREFIX@/lib/netlogon
 ;   guest ok = yes
 ;   writable = no
 ;   share modes = no
@@ -156,7 +156,7 @@
 # Un-comment the following to provide a specific roving profile share
 # the default is to use the user's home directory
 ;[Profiles]
-;    path = __PREFIX__/samba/profiles
+;    path = @PREFIX@/samba/profiles
 ;    browseable = no
 ;    guest ok = yes
 
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 2d6a3b1d14b..411880a5b9c 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.9 1999/11/16 21:01:05 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $
 
---- Makefile.in.orig	Wed Nov 10 21:35:55 1999
-+++ Makefile.in	Tue Nov 16 10:36:48 1999
-@@ -25,10 +25,11 @@
+--- Makefile.in.orig	Tue Apr 25 19:06:11 2000
++++ Makefile.in	Fri Apr 28 16:26:52 2000
+@@ -25,10 +25,12 @@
  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@
+ VARDIR = @localstatedir@
  MANDIR = @mandir@
 +ETCDIR?= $(BASEDIR)/etc
 +LOGDIR?= $(BASEDIR)/log
+ SAMBABOOK = @sambabook@
  
  # The permissions to give the executables
- INSTALLPERMS = 0755
-@@ -36,12 +37,12 @@
+@@ -37,12 +39,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))
@@ -35,8 +35,16 @@ $NetBSD: patch-aa,v 1.9 1999/11/16 21:01:05 jlam Exp $
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -458,8 +459,8 @@
- 	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+@@ -463,14 +465,14 @@
+ 
+ installdirs:
+ 	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
+-	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
++	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR)
+ 
+ installservers: all installdirs
+-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
++	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
  
  installbin: all installdirs
 -	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@@ -46,7 +54,7 @@ $NetBSD: patch-aa,v 1.9 1999/11/16 21:01:05 jlam Exp $
  
  installscripts: installdirs
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -484,8 +485,8 @@
+@@ -495,8 +497,8 @@
  	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac
index 08c696162fa..20339626b91 100644
--- a/net/samba/patches/patch-ac
+++ b/net/samba/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2000/01/19 00:42:43 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2000/05/02 15:24:10 jlam Exp $
 
---- acconfig.h.orig	Wed Oct 13 01:26:21 1999
-+++ acconfig.h	Tue Jan 18 14:12:29 2000
-@@ -78,7 +78,9 @@
+--- acconfig.h.orig	Tue Apr 25 19:06:11 2000
++++ acconfig.h	Fri Apr 28 16:27:20 2000
+@@ -79,7 +79,9 @@
  #undef SIZEOF_INO_T
  #undef SIZEOF_OFF_T
  #undef STAT_STATVFS64
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index 22a2664029e..010053a7ba4 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2000/01/19 00:42:43 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2000/05/02 15:24:10 jlam Exp $
 
---- client/client.c.orig	Wed Nov 10 21:35:59 1999
-+++ client/client.c	Tue Jan 18 15:27:27 2000
-@@ -1588,22 +1588,19 @@
+--- client/client.c.orig	Tue Apr 25 19:06:41 2000
++++ client/client.c	Fri Apr 28 16:29:58 2000
+@@ -1599,22 +1599,19 @@
  	return True;
  }
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.1 2000/01/19 00:42:43 jlam Exp $
  	}
  }
  #  endif 
-@@ -1664,7 +1661,7 @@
+@@ -1675,7 +1672,7 @@
    {"setmode",cmd_setmode,"filename <setmode string> change modes of file",{COMPL_REMOTE,COMPL_NONE}},
    {"help",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}},
    {"?",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}},
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.1 2000/01/19 00:42:43 jlam Exp $
    {"history",cmd_history,"displays the command history",{COMPL_NONE,COMPL_NONE}},
  #endif
    {"!",NULL,"run a shell command on the local system",{COMPL_NONE,COMPL_NONE}},
-@@ -1724,7 +1721,7 @@
+@@ -1735,7 +1732,7 @@
  	}
  }
  
@@ -47,16 +47,16 @@ $NetBSD: patch-ad,v 1.1 2000/01/19 00:42:43 jlam Exp $
  /****************************************************************************
  wait for keyboard activity, swallowing network packets
  ****************************************************************************/
-@@ -1806,7 +1803,7 @@
+@@ -1814,7 +1811,7 @@
  	pstring line;
  	char *ptr;
  
 -#ifdef HAVE_LIBREADLINE
 +#ifdef HAVE_READLINE
  /* Minimal readline support, 29Jun1999, s.xenitellis@rhbnc.ac.uk */
- 	const int PromptSize = 2048;
- 	char prompt_str[PromptSize];	/* This holds the buffer "smb: \dir1\> " */
-@@ -1817,7 +1814,7 @@
+ #ifdef PROMPTSIZE
+ #undef PROMPTSIZE
+@@ -1828,7 +1825,7 @@
  	while (!feof(stdin)) {
  		fstring tok;
  		int i;
@@ -65,7 +65,7 @@ $NetBSD: patch-ad,v 1.1 2000/01/19 00:42:43 jlam Exp $
  		if ( temp != (char *)NULL )
  		{
  			free( temp );	/* Free memory allocated every time by readline() */
-@@ -2197,7 +2194,7 @@
+@@ -2215,7 +2212,7 @@
  
  	DEBUGLEVEL = 2;
  
diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae
index 6896f249e81..2d3ca094b97 100644
--- a/net/samba/patches/patch-ae
+++ b/net/samba/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2000/01/19 00:42:43 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2000/05/02 15:24:10 jlam Exp $
 
---- configure.in.orig	Wed Nov 10 21:35:56 1999
-+++ configure.in	Tue Jan 18 14:12:29 2000
-@@ -220,9 +220,6 @@
+--- configure.in.orig	Tue Apr 25 19:06:39 2000
++++ configure.in	Fri Apr 28 16:33:54 2000
+@@ -234,9 +234,6 @@
  AC_CHECK_TYPE(offset_t,loff_t)
  AC_CHECK_TYPE(ssize_t, int)
  
@@ -12,23 +12,23 @@ $NetBSD: patch-ae,v 1.1 2000/01/19 00:42:43 jlam Exp $
  # we need libdl for PAM and the new VFS code
  AC_CHECK_LIB(dl,main)
  
-@@ -298,7 +295,14 @@
+@@ -312,7 +309,14 @@
  # test for where we get readline() from
  if test "$ac_cv_header_readline_h" = "yes" ||
     test "$ac_cv_header_readline_readline_h" = "yes"; then
 -  AC_CHECK_LIB(readline,readline)
 +    AC_CHECK_LIB(termcap, tputs)
 +    if test "$ac_cv_lib_termcap_tputs" = "yes"; then
-+	AC_CHECK_LIB(edit, readline, , [AC_CHECK_LIB(readline, readline)])
-+	if test "$ac_cv_lib_edit_readline" = "yes" ||
-+	   test "$ac_cv_lib_readline_readline" = "yes"; then
-+	    AC_DEFINE(HAVE_READLINE)
-+	fi
++        AC_CHECK_LIB(edit, readline, , [AC_CHECK_LIB(readline, readline)])
++        if test "$ac_cv_lib_edit_readline" = "yes" ||
++           test "$ac_cv_lib_readline_readline" = "yes"; then
++            AC_DEFINE(HAVE_READLINE)
++       fi
 +    fi
  fi
  
  
-@@ -1036,6 +1040,24 @@
+@@ -1138,6 +1142,24 @@
      AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES)
  fi
  
diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af
index 1a3adec20c8..7f22299d1c7 100644
--- a/net/samba/patches/patch-af
+++ b/net/samba/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2000/01/19 00:42:43 jlam Exp $
+$NetBSD: patch-af,v 1.2 2000/05/02 15:24:10 jlam Exp $
 
---- include/includes.h.orig	Wed Nov 10 21:36:00 1999
-+++ include/includes.h	Tue Jan 18 14:12:29 2000
-@@ -775,20 +775,20 @@
+--- include/includes.h.orig	Tue Apr 25 19:06:46 2000
++++ include/includes.h	Fri Apr 28 16:34:56 2000
+@@ -808,20 +808,20 @@
  #define ULTRIX_AUTH 1
  #endif
  
diff --git a/net/samba/pkg/COMMENT b/net/samba/pkg/COMMENT
index 7fbb96e967f..3e42e0d4905 100644
--- a/net/samba/pkg/COMMENT
+++ b/net/samba/pkg/COMMENT
@@ -1 +1 @@
-LanManager(R)-compatible server suite for Unix
+SMB/CIFS protocol server suite for UNIX
diff --git a/net/samba/pkg/DESCR b/net/samba/pkg/DESCR
index 625b6a803be..9c93e9fb52c 100644
--- a/net/samba/pkg/DESCR
+++ b/net/samba/pkg/DESCR
@@ -1,20 +1,25 @@
-The Samba suite is a set of programs which run under Unix-like
-operating systems. These programs deliver most of the important
-functionality of a Microsoft Lan Manager server. That is, they support
-remote access to Un*x filespace and Un*x printers from Lan Manager
-compatible clients. In practical terms, this means that such clients
-can connect to and use Un*x filespace as if it was a local disk drive,
-or Un*x printers as if they were local printers.
+Samba is a suite of programs which work together to allow clients to
+access to a server's filespace and printers via the SMB (Server
+Message Block) protocol.
 
-Some of the most popular Lan Manager compatible clients include Lan
-Manager itself, Windows for Workgroups, OS/2 and Windows NT.
+In practice, this means that you can redirect disks and printers to
+Unix disks and printers from Lan Manager clients, Windows for
+Workgroups 3.11 clients, Windows NT clients, Linux clients and OS/2
+clients. There is also a generic Unix client program supplied as part
+of the suite which allows Unix users to use an ftp-like interface to
+access filespace and printers on any other SMB servers. This gives the
+capability for these operating systems to behave much like a LAN
+Server or Windows NT Server machine, only with added functionality and
+flexibility designed to make life easier for administrators.
 
-*Security Notes*
-The users' encrypted passwords stored in ${PREFIX}/private/smbpasswd 
-(default: /usr/local/private/smbpasswd) file *ARE PASSWORD EQUIVALENT*
+                    *===* Security Notes *===*
+
+The users' encrypted passwords stored in ${ETCDIR}/private/smbpasswd 
+(default: /etc/samba/private/smbpasswd) *ARE PASSWORD EQUIVALENT*
 from the viewpoint of SMB protocol.  Do not weaken the permission 
-mode of this file (default: root.wheel and rw-------) without any special 
-reasons.  And please note that even if you pkg_delete this port, 
-pkg_delete will *NOT* remove smbpaswd file because pkg_delete can be used 
-for upgrading this package.  If you won't use this package anymore, I 
-strongly recommend you to remove smbpasswd file manually.
+mode of this file (default: root.wheel and rw-------) without any
+special reasons.  And please note that even if you pkg_delete this
+port, pkg_delete will *NOT* remove the smbpasswd file because
+pkg_delete can be used for upgrading this package.  If you won't use
+this package anymore, I strongly recommend that you remove the
+smbpasswd file manually.
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index ffe19dd66b0..8e31d1d6295 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,29 +1,20 @@
-@comment $NetBSD: PLIST,v 1.14 1999/11/16 21:23:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2000/05/02 15:24:10 jlam Exp $
 bin/addtosmbpass
 bin/convert_smbpasswd
 bin/make_printerdef
 bin/make_smbcodepage
-bin/mksmbpasswd.sh
+bin/make_unicodemap
 bin/nmblookup
 bin/rpcclient
 bin/smbclient
 bin/smbpasswd
+bin/smbspool
 bin/smbstatus
 bin/smbtar
 bin/testparm
 bin/testprns
-etc/rc.d/samba.sh.sample
-lib/codepages/codepage.437
-lib/codepages/codepage.737
-lib/codepages/codepage.850
-lib/codepages/codepage.852
-lib/codepages/codepage.861
-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
+man/man1/make_unicodemap.1
 man/man1/nmblookup.1
 man/man1/smbclient.1
 man/man1/smbrun.1
@@ -41,11 +32,40 @@ man/man8/smbd.8
 man/man8/smbmnt.8
 man/man8/smbmount.8
 man/man8/smbpasswd.8
+man/man8/smbspool.8
 man/man8/smbumount.8
 man/man8/swat.8
+lib/codepages/codepage.1251
+lib/codepages/codepage.437
+lib/codepages/codepage.737
+lib/codepages/codepage.775
+lib/codepages/codepage.850
+lib/codepages/codepage.852
+lib/codepages/codepage.861
+lib/codepages/codepage.866
+lib/codepages/codepage.932
+lib/codepages/codepage.936
+lib/codepages/codepage.949
+lib/codepages/codepage.950
+lib/codepages/unicode_map.437
+lib/codepages/unicode_map.737
+lib/codepages/unicode_map.850
+lib/codepages/unicode_map.852
+lib/codepages/unicode_map.861
+lib/codepages/unicode_map.866
+lib/codepages/unicode_map.932
+lib/codepages/unicode_map.936
+lib/codepages/unicode_map.949
+lib/codepages/unicode_map.950
+lib/codepages/unicode_map.ISO8859-1
+lib/codepages/unicode_map.ISO8859-2
+lib/codepages/unicode_map.ISO8859-5
+lib/codepages/unicode_map.ISO8859-7
+lib/codepages/unicode_map.KOI8-R
 sbin/nmbd
 sbin/smbd
 sbin/swat
+share/doc/samba/NT4-Locking.reg
 share/doc/samba/NT4-Locking.txt
 share/doc/samba/NT4_PlainPassword.reg
 share/doc/samba/THANKS
@@ -91,6 +111,7 @@ share/doc/samba/textdocs/HINTS.txt
 share/doc/samba/textdocs/INSTALL.sambatar
 share/doc/samba/textdocs/MIRRORS.txt
 share/doc/samba/textdocs/Macintosh_Clients.txt
+share/doc/samba/textdocs/NT-Guest-Access.txt
 share/doc/samba/textdocs/NTDOMAIN.txt
 share/doc/samba/textdocs/NT_Security.txt
 share/doc/samba/textdocs/NetBIOS.txt
@@ -119,6 +140,7 @@ share/doc/samba/textdocs/Win95.txt
 share/doc/samba/textdocs/WinNT.txt
 share/doc/samba/textdocs/cifsntdomain.txt
 share/doc/samba/textdocs/security_level.txt
+share/doc/samba/textdocs/smbmount.txt
 share/examples/samba/README
 share/examples/samba/autofs/README
 share/examples/samba/autofs/auto.a
@@ -158,6 +180,7 @@ share/swat/help/DOMAIN_MEMBER.html
 share/swat/help/NT_Security.html
 share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
+share/swat/help/make_unicodemap.1.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
 share/swat/help/samba.7.html
@@ -188,6 +211,172 @@ share/swat/images/status.gif
 share/swat/images/viewconfig.gif
 share/swat/include/footer.html
 share/swat/include/header.html
+share/swat/using_samba/appa_01.html
+share/swat/using_samba/appa_02.html
+share/swat/using_samba/appa_03.html
+share/swat/using_samba/appa_04.html
+share/swat/using_samba/appa_05.html
+share/swat/using_samba/appb_01.html
+share/swat/using_samba/appb_02.html
+share/swat/using_samba/appb_03.html
+share/swat/using_samba/appc_01.html
+share/swat/using_samba/appd_01.html
+share/swat/using_samba/appe_01.html
+share/swat/using_samba/appf_01.html
+share/swat/using_samba/ch01_01.html
+share/swat/using_samba/ch01_02.html
+share/swat/using_samba/ch01_03.html
+share/swat/using_samba/ch01_04.html
+share/swat/using_samba/ch01_05.html
+share/swat/using_samba/ch01_06.html
+share/swat/using_samba/ch01_07.html
+share/swat/using_samba/ch01_08.html
+share/swat/using_samba/ch02_01.html
+share/swat/using_samba/ch02_02.html
+share/swat/using_samba/ch02_03.html
+share/swat/using_samba/ch02_04.html
+share/swat/using_samba/ch02_05.html
+share/swat/using_samba/ch02_06.html
+share/swat/using_samba/ch03_01.html
+share/swat/using_samba/ch03_02.html
+share/swat/using_samba/ch03_03.html
+share/swat/using_samba/ch04_01.html
+share/swat/using_samba/ch04_02.html
+share/swat/using_samba/ch04_03.html
+share/swat/using_samba/ch04_04.html
+share/swat/using_samba/ch04_05.html
+share/swat/using_samba/ch04_06.html
+share/swat/using_samba/ch04_07.html
+share/swat/using_samba/ch04_08.html
+share/swat/using_samba/ch05_01.html
+share/swat/using_samba/ch05_02.html
+share/swat/using_samba/ch05_03.html
+share/swat/using_samba/ch05_04.html
+share/swat/using_samba/ch05_05.html
+share/swat/using_samba/ch06_01.html
+share/swat/using_samba/ch06_02.html
+share/swat/using_samba/ch06_03.html
+share/swat/using_samba/ch06_04.html
+share/swat/using_samba/ch06_05.html
+share/swat/using_samba/ch06_06.html
+share/swat/using_samba/ch07_01.html
+share/swat/using_samba/ch07_02.html
+share/swat/using_samba/ch07_03.html
+share/swat/using_samba/ch08_01.html
+share/swat/using_samba/ch08_02.html
+share/swat/using_samba/ch08_03.html
+share/swat/using_samba/ch08_04.html
+share/swat/using_samba/ch08_05.html
+share/swat/using_samba/ch08_06.html
+share/swat/using_samba/ch08_07.html
+share/swat/using_samba/ch09_01.html
+share/swat/using_samba/ch09_02.html
+share/swat/using_samba/ch09_03.html
+share/swat/using_samba/figs/sam.0101.gif
+share/swat/using_samba/figs/sam.0102.gif
+share/swat/using_samba/figs/sam.0103.gif
+share/swat/using_samba/figs/sam.0104.gif
+share/swat/using_samba/figs/sam.0105.gif
+share/swat/using_samba/figs/sam.0106.gif
+share/swat/using_samba/figs/sam.0107.gif
+share/swat/using_samba/figs/sam.0108.gif
+share/swat/using_samba/figs/sam.0109.gif
+share/swat/using_samba/figs/sam.0110.gif
+share/swat/using_samba/figs/sam.0111.gif
+share/swat/using_samba/figs/sam.0112.gif
+share/swat/using_samba/figs/sam.0113.gif
+share/swat/using_samba/figs/sam.0114.gif
+share/swat/using_samba/figs/sam.0201.gif
+share/swat/using_samba/figs/sam.0202.gif
+share/swat/using_samba/figs/sam.0203.gif
+share/swat/using_samba/figs/sam.0204.gif
+share/swat/using_samba/figs/sam.0301.gif
+share/swat/using_samba/figs/sam.0302.gif
+share/swat/using_samba/figs/sam.0303.gif
+share/swat/using_samba/figs/sam.0304.gif
+share/swat/using_samba/figs/sam.0305.gif
+share/swat/using_samba/figs/sam.0306.gif
+share/swat/using_samba/figs/sam.0307.gif
+share/swat/using_samba/figs/sam.0308.gif
+share/swat/using_samba/figs/sam.0309.gif
+share/swat/using_samba/figs/sam.0310.gif
+share/swat/using_samba/figs/sam.0311.gif
+share/swat/using_samba/figs/sam.0312.gif
+share/swat/using_samba/figs/sam.0313.gif
+share/swat/using_samba/figs/sam.0314.gif
+share/swat/using_samba/figs/sam.0315.gif
+share/swat/using_samba/figs/sam.0316.gif
+share/swat/using_samba/figs/sam.0317.gif
+share/swat/using_samba/figs/sam.0318.gif
+share/swat/using_samba/figs/sam.0319.gif
+share/swat/using_samba/figs/sam.0320.gif
+share/swat/using_samba/figs/sam.0321.gif
+share/swat/using_samba/figs/sam.0322.gif
+share/swat/using_samba/figs/sam.0323.gif
+share/swat/using_samba/figs/sam.0324.gif
+share/swat/using_samba/figs/sam.0325.gif
+share/swat/using_samba/figs/sam.0326.gif
+share/swat/using_samba/figs/sam.0327.gif
+share/swat/using_samba/figs/sam.0328.gif
+share/swat/using_samba/figs/sam.0401.gif
+share/swat/using_samba/figs/sam.0402.gif
+share/swat/using_samba/figs/sam.0403.gif
+share/swat/using_samba/figs/sam.0404.gif
+share/swat/using_samba/figs/sam.0405.gif
+share/swat/using_samba/figs/sam.0406.gif
+share/swat/using_samba/figs/sam.0407.gif
+share/swat/using_samba/figs/sam.0501.gif
+share/swat/using_samba/figs/sam.0502.gif
+share/swat/using_samba/figs/sam.0503.gif
+share/swat/using_samba/figs/sam.0504.gif
+share/swat/using_samba/figs/sam.0505.gif
+share/swat/using_samba/figs/sam.0506.gif
+share/swat/using_samba/figs/sam.0507.gif
+share/swat/using_samba/figs/sam.0508.gif
+share/swat/using_samba/figs/sam.0601.gif
+share/swat/using_samba/figs/sam.0602.gif
+share/swat/using_samba/figs/sam.0603.gif
+share/swat/using_samba/figs/sam.0604.gif
+share/swat/using_samba/figs/sam.0605.gif
+share/swat/using_samba/figs/sam.0606.gif
+share/swat/using_samba/figs/sam.0701.gif
+share/swat/using_samba/figs/sam.0702.gif
+share/swat/using_samba/figs/sam.0703.gif
+share/swat/using_samba/figs/sam.0704.gif
+share/swat/using_samba/figs/sam.0705.gif
+share/swat/using_samba/figs/sam.0706.gif
+share/swat/using_samba/figs/sam.0707.gif
+share/swat/using_samba/figs/sam.0708.gif
+share/swat/using_samba/figs/sam.0709.gif
+share/swat/using_samba/figs/sam.0801.gif
+share/swat/using_samba/figs/sam.0802.gif
+share/swat/using_samba/figs/sam.0803.gif
+share/swat/using_samba/figs/sam.0804.gif
+share/swat/using_samba/figs/sam.0805.gif
+share/swat/using_samba/figs/sam.0901.gif
+share/swat/using_samba/figs/sam.0902.gif
+share/swat/using_samba/figs/sam.0903.gif
+share/swat/using_samba/figs/sam.0904.gif
+share/swat/using_samba/figs/sam.0905.gif
+share/swat/using_samba/figs/sam.aa01.gif
+share/swat/using_samba/figs/sam.ab01.gif
+share/swat/using_samba/figs/sam.ab02.gif
+share/swat/using_samba/gifs/index.gif
+share/swat/using_samba/gifs/samba.s.gif
+share/swat/using_samba/gifs/txthome.gif
+share/swat/using_samba/gifs/txtnexta.gif
+share/swat/using_samba/gifs/txtpreva.gif
+share/swat/using_samba/index.html
+share/swat/using_samba/inx.html
+share/swat/using_samba/licenseinfo.html
+share/swat/using_samba/this_edition.html
+@dirrm share/swat/using_samba/gifs
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba
+@dirrm share/swat/include
+@dirrm share/swat/images
+@dirrm share/swat/help
+@dirrm share/swat
 @dirrm share/examples/samba/wins_hook
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
@@ -200,13 +389,7 @@ share/swat/include/header.html
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/autofs
 @dirrm share/examples/samba
-@dirrm share/swat/images
-@dirrm share/swat/include
-@dirrm share/swat/help
-@dirrm share/swat
 @dirrm share/doc/samba/textdocs
 @dirrm share/doc/samba/faq
 @dirrm share/doc/samba
 @dirrm lib/codepages
-@exec mkdir -p ${SAMBA_PRIVATE} ; if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then chown -R root:wheel ${SAMBA_PRIVATE} ;  cat /etc/passwd | %D/bin/mksmbpasswd.sh > ${SAMBA_PRIVATE}/smbpasswd ; chmod 500 ${SAMBA_PRIVATE} ; chmod 600 ${SAMBA_PRIVATE}/smbpasswd ; fi
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/smbpasswd manually."