Update to samba-1.9.18p10.

While here clean up the package somewhat:
- Remove confusion about where the SAMBA_PRIVATE directory is.
- Don't gratitously create yet another world writeable directory.
- Don't use $PREFIX as the WEB_ROOT, use the htdocs directory from the
  Apache pkg instead.
- Enable use of netgroups, checking of disk quotas and the password
  changing feature.
- Use /var/run/samba for runtime status files.
- Always install the example startup file.
- Misc. minor modification for better maintainability.

6 files changed, 76 insertions, 71 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index c60db147f03..945663ae18a 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 1998/08/20 15:17:18 tsarna Exp $
+# $NetBSD: Makefile,v 1.14 1998/09/04 19:17:18 bad Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
 #
 
-DISTNAME=	samba-1.9.18p8
+DISTNAME=	samba-1.9.18p10
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
@@ -13,15 +13,17 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.sample
-SAMBA_SPOOL=	/var/spool/samba
 SAMBA_LOGDIR=	/var/log
+SAMBA_LOCKDIR=	/var/run/samba
 SAMBA_ETCDIR?=	/etc/samba
 SAMBA_PRIVATE?=	${SAMBA_ETCDIR}/private
 
-MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR} PRIVDIR=${SAMBA_PRIVATE}
+MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR} PRIVDIR=${SAMBA_PRIVATE} LOGDIR=${SAMBA_LOGDIR} LOCKDIR=${SAMBA_LOCKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SRC= ${WRKDIR}/.PLIST-src
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba/faq
@@ -32,27 +34,24 @@ post-install:
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/faq ; \
 	done
 .endif
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
-		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT} ;		\
-		${ECHO} 'smbd=${PREFIX}/sbin/smbd' >> ${STARTUP_SCRIPT} ;\
-		${ECHO} 'nmbd=${PREFIX}/sbin/nmbd' >> ${STARTUP_SCRIPT} ;\
-		${ECHO} 'if [ -f $$smbd ]; then' >> ${STARTUP_SCRIPT}	;\
-		${ECHO} "	${ECHO} -n ' Samba'" >> ${STARTUP_SCRIPT} ;\
-		${ECHO} '	$$smbd -D' >> ${STARTUP_SCRIPT} ;	\
-		${ECHO} '	$$nmbd -D' >> ${STARTUP_SCRIPT} ;	\
-		${ECHO} "fi" >> ${STARTUP_SCRIPT} ;			\
-		chmod 755 ${STARTUP_SCRIPT} ;				\
-		chown bin.bin ${STARTUP_SCRIPT};			\
-	fi
-	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && chmod 1777 ${SAMBA_SPOOL}
+	${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
+	${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT} ;		\
+	${ECHO} 'smbd=${PREFIX}/sbin/smbd' >> ${STARTUP_SCRIPT} ;\
+	${ECHO} 'nmbd=${PREFIX}/sbin/nmbd' >> ${STARTUP_SCRIPT} ;\
+	${ECHO} 'if [ -f $$smbd ]; then' >> ${STARTUP_SCRIPT}	;\
+	${ECHO} "	${ECHO} -n ' Samba'" >> ${STARTUP_SCRIPT} ;\
+	${ECHO} '	$$smbd -D' >> ${STARTUP_SCRIPT} ;	\
+	${ECHO} '	$$nmbd -D' >> ${STARTUP_SCRIPT} ;	\
+	${ECHO} "fi" >> ${STARTUP_SCRIPT} ;			\
+	chmod 755 ${STARTUP_SCRIPT} ;				\
+	chown bin.bin ${STARTUP_SCRIPT};
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
-		${SED} -e 's:__SAMBA_SPOOL__:${SAMBA_SPOOL}:g'		\
-		    -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g'			\
+		${SED} -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g'		\
+		    -e 's:__SAMBA_LOCKDIR__:${SAMBA_LOCKDIR}:g'		\
 			${FILESDIR}/smb.conf.sample			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
-	${INSTALL} -c -m 755 -o bin -g bin ${WRKSRC}/mksmbpasswd.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/mksmbpasswd.sh ${PREFIX}/bin
 	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
 		${MKDIR} ${SAMBA_PRIVATE} ;				\
 		chown root.wheel ${SAMBA_PRIVATE} ;			\
@@ -64,5 +63,6 @@ post-install:
 	fi
 	chown root.wheel ${PREFIX}/bin/smbpasswd
 	chmod 4111 ${PREFIX}/bin/smbpasswd
+	sed -e 's:__SAMBA_PRIVATE__:${SAMBA_PRIVATE}:g' ${PKGDIR}/PLIST > ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/files/md5 b/net/samba/files/md5
index 8bab93a0b9b..27e5c4d95b6 100644
--- a/net/samba/files/md5
+++ b/net/samba/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 1998/08/07 13:25:11 agc Exp $
+$NetBSD: md5,v 1.8 1998/09/04 19:17:18 bad Exp $
 
-MD5 (samba-1.9.18p8.tar.gz) = d7be22781a48f51e98cd10df77c4a79c
+MD5 (samba-1.9.18p10.tar.gz) = 31535614d61ccefd9dd6881685201d24
diff --git a/net/samba/files/smb.conf.sample b/net/samba/files/smb.conf.sample
index 7ec48600cb2..e1edcca4acf 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.2 1998/08/07 11:10:53 agc Exp $
+; $NetBSD: smb.conf.sample,v 1.3 1998/09/04 19:17:18 bad Exp $
 ; Configuration file for smbd.
 ; ============================================================================
 ; For the format of this file and comprehensive descriptions of all the
@@ -59,15 +59,15 @@
    printcap name = /etc/printcap
    load printers = yes
    guest account = nobody
-;  This next option sets a separate log file for each client. Remove
+;  This next option sets a separate log file for each client. Uncomment
 ;  it if you want a combined log file.
-   log file = __LOGDIR__/sambalog.%m
+;   log file = __LOGDIR__/sambalog.%m
    dont descend = /dev,/proc,/root,/stand
 
 ;  You will need a world readable lock directory and "share modes=yes"
 ;  if you want to support the file sharing modes for multiple users
 ;  of the same files
-;  lock directory = /usr/local/samba/var/locks
+;  lock directory = __SAMBA_LOCKDIR__
 ;  share modes = yes
 
    map archive = no
@@ -87,7 +87,7 @@
 
 [printers]
    comment = All Printers
-   path = __SAMBA_SPOOL__
+   path = /tmp
    browseable = no
    printable = yes
    public = no
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 48a7daaeaed..c95e583e0bd 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 1998/08/09 16:14:08 kim Exp $
+$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
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.5 1998/08/09 16:14:08 kim Exp $
  LIBDIR = $(BASEDIR)/lib
 -VARDIR = $(BASEDIR)/var
 +ETCDIR?= $(BASEDIR)/etc
-+LOGDIR = /var/log
++LOGDIR?= $(BASEDIR)/log
 +PRIVDIR?= $(BASEDIR)/private
  
  # The permissions to give the executables
@@ -47,11 +47,12 @@ $NetBSD: patch-aa,v 1.5 1998/08/09 16:14:08 kim Exp $
  SMB_PASSWD = $(BINDIR)/smbpasswd
 -SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
 +SMB_PASSWD_FILE = $(PRIVDIR)/smbpasswd
- WEB_ROOT = $(BASEDIR)
+-WEB_ROOT = $(BASEDIR)
++WEB_ROOT = $(BASEDIR)/http/htdocs
  
  # the directory where lock files go
 -LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/spool/locks
++LOCKDIR?= $(VARDIR)/locks
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
@@ -64,7 +65,7 @@ $NetBSD: patch-aa,v 1.5 1998/08/09 16:14:08 kim Exp $
  # contributed by noses@oink.rhein.de
 -# FLAGSM = -DNETBSD -DSHADOW_PWD
 -# LIBSM = -lcrypt 
-+FLAGSM = -DFAST_SHARE_MODES
++FLAGSM = -DFAST_SHARE_MODES -DSHADOW_PWD -DNETGROUP -DALLOW_CHANGE_PASSWORD -DQUOTAS
 +LIBSM = -lcrypt 
  
  # This is for NetBSD 1.3  
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index 3f7eca6ab1f..d9c935d0948 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:10:54 agc Exp $
+$NetBSD: patch-ab,v 1.5 1998/09/04 19:17:19 bad Exp $
 
---- includes.h.orig	Sat Jun 13 03:44:19 1998
-+++ includes.h	Wed Jun 17 15:03:22 1998
-@@ -198,7 +198,7 @@
+--- 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)
++#if defined(SHADOW_PWD) && !defined(CONVEX)  && !defined(__NetBSD__)
  #include <shadow.h>
  #endif
  
-@@ -510,23 +510,21 @@
+@@ -518,23 +518,22 @@
  #endif
  
  
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 11:10:54 agc Exp $
 -#include <netinet/in_systm.h> 
 -#include <netinet/ip.h> 
 -/* you may not need this */
--#define NO_GETSPNAM
+ #define NO_GETSPNAM
  #define SIGNAL_CAST (void (*)())
 -#define USE_DIRECT
 -#define REPLACE_INNETGR
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index f76dcafe52e..ee62cd44fa5 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,43 +1,43 @@
-@comment $NetBSD: PLIST,v 1.6 1998/06/17 17:07:14 bouyer Exp $
-bin/addtosmbpass
-bin/make_printerdef
-bin/make_smbcodepage
-bin/mksmbpasswd.sh
-bin/nmblookup
+@comment $NetBSD: PLIST,v 1.7 1998/09/04 19:17:19 bad Exp $
 bin/smbclient
-bin/smbpasswd
+bin/testparm
+bin/testprns
 bin/smbrun
 bin/smbstatus
+bin/smbpasswd
+bin/make_smbcodepage
+bin/nmblookup
+bin/make_printerdef
 bin/smbtar
-bin/testparm
-bin/testprns
-sbin/nmbd
-sbin/smbd
+bin/addtosmbpass
+bin/mksmbpasswd.sh
 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.866
 lib/codepages/codepage.949
 lib/codepages/codepage.950
-man/man1/make_smbcodepage.1.gz
-man/man1/smbclient.1.gz
-man/man1/smbrun.1.gz
-man/man1/smbstatus.1.gz
-man/man1/smbtar.1.gz
-man/man1/testparm.1.gz
-man/man1/testprns.1.gz
-man/man5/smb.conf.5.gz
-man/man7/samba.7.gz
-man/man8/nmbd.8.gz
-man/man8/smbd.8.gz
-man/man8/smbmnt.8.gz
-man/man8/smbmount.8.gz
-man/man8/smbpasswd.8.gz
-man/man8/smbumount.8.gz
+lib/codepages/codepage.936
+man/man1/make_smbcodepage.1
+man/man1/smbclient.1
+man/man1/smbrun.1
+man/man1/smbstatus.1
+man/man1/smbtar.1
+man/man1/testparm.1
+man/man1/testprns.1
+man/man5/smb.conf.5
+man/man7/samba.7
+man/man8/nmbd.8
+man/man8/smbd.8
+man/man8/smbmnt.8
+man/man8/smbmount.8
+man/man8/smbpasswd.8
+man/man8/smbumount.8
+sbin/smbd
+sbin/nmbd
 share/doc/samba/faq/Samba-Server-FAQ-1.html
 share/doc/samba/faq/Samba-Server-FAQ-2.html
 share/doc/samba/faq/Samba-Server-FAQ.html
@@ -60,6 +60,7 @@ share/doc/samba/faq/sambafaq.html
 share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
 share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING-Config.txt
 share/doc/samba/BROWSING.txt
 share/doc/samba/BUGS.txt
 share/doc/samba/CVS_ACCESS.txt
@@ -70,16 +71,18 @@ 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
+share/doc/samba/Macintosh_Clients.txt
 share/doc/samba/NTDOMAIN.txt
 share/doc/samba/NetBIOS.txt
 share/doc/samba/OS2-Client-HOWTO.txt
 share/doc/samba/PRINTER_DRIVER.txt
+share/doc/samba/PROFILES.txt
 share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
+share/doc/samba/Recent-FAQs.txt
 share/doc/samba/SCO.txt
 share/doc/samba/Speed.txt
 share/doc/samba/Speed2.txt
@@ -87,6 +90,7 @@ share/doc/samba/Support.txt
 share/doc/samba/Tracing.txt
 share/doc/samba/UNIX-SMB.txt
 share/doc/samba/UNIX_INSTALL.txt
+share/doc/samba/UNIX_SECURITY.txt
 share/doc/samba/Win95.txt
 share/doc/samba/WinNT.txt
 share/doc/samba/cifsntdomain.txt
@@ -99,5 +103,5 @@ etc/smb.conf.sample
 @dirrm share/doc/samba/faq
 @dirrm share/doc/samba
 @dirrm lib/codepages
-@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ;  cat /etc/passwd | %D/bin/mksmbpasswd.sh > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove \${PREFIX}/private/smbpasswd manually."
+@exec mkdir __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."