Update to version 1.9.18, from Ty Sarna (tsarna@endicor.com).

This version unites the samba and the uncommitted samba-des packages,
as it includes a "castrated" DES implementation that is only usable as
a hash function.

Some very minor typos in the description file corrected by myself.

5 files changed, 105 insertions, 50 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 6db889f0dfb..f71575a8cf1 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,29 +1,30 @@
 # New ports collection makefile for:	samba
-# Version required:			1.9.17p4
+# Version required:			1.9.18
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $NetBSD: Makefile,v 1.3 1997/12/24 10:52:31 agc Exp $
-# FreeBSD Id: Makefile,v 1.17 1997/10/23 15:03:20 max Exp
+# $NetBSD: Makefile,v 1.4 1998/01/12 17:19:25 agc Exp $
+# FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
 #
 
-DISTNAME=	samba-1.9.17p4
-PKGNAME=	samba-1.9.17.4
+DISTNAME=	samba-1.9.18
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
-MAINTAINER=	hosokawa@jp.FreeBSD.ORG
+MAINTAINER=	tsarna@endicor.com
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
-MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
+MAN1=		make_smbcodepage.1 smbstatus.1 smbclient.1 smbrun.1 \
+		smbtar.1 testparm.1 testprns.1
 MAN5=		smb.conf.5
 MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8
+MAN8=		smbd.8 nmbd.8 smbpasswd.8 smbmnt.8 smbmount.8 smbumount.8
 
 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_PRIVATE=	${PREFIX}/private
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -51,9 +52,21 @@ post-install:
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && chmod 1777 ${SAMBA_SPOOL}
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
 		${SED} -e 's:__SAMBA_SPOOL__:${SAMBA_SPOOL}:g'		\
-		    -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g' 		\
+		    -e 's:__LOGDIR__:${SAMBA_LOGDIR}:g'			\
 			${FILESDIR}/smb.conf.sample			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
+	${INSTALL} -c -m 755 -o bin -g bin ${WRKSRC}/mksmbpasswd.sh ${PREFIX}/bin
+	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
+		${MKDIR} ${SAMBA_PRIVATE} ;				\
+		chown root.wheel ${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
+	chown root.wheel ${PREFIX}/bin/smbpasswd
+	chmod 4111 ${PREFIX}/bin/smbpasswd
 
 .include <bsd.port.mk>
diff --git a/net/samba/files/md5 b/net/samba/files/md5
index 7029bc83d15..3d176fe5bc7 100644
--- a/net/samba/files/md5
+++ b/net/samba/files/md5
@@ -1 +1 @@
-MD5 (samba-1.9.17p4.tar.gz) = dd8a65242a2bb969a9a5f3d7095df602
+MD5 (samba-1.9.18.tar.gz) = f1ff86c9b41cac82992964168656514f
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 6c07f098047..740de5f2d10 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,5 +1,7 @@
---- Makefile.orig	Sat Sep 27 00:04:52 1997
-+++ Makefile	Wed Oct 15 17:09:58 1997
+$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
 @@ -5,11 +5,11 @@
  ###########################################################################
  
@@ -14,20 +16,20 @@
  
  # The directories to put things in. If you use multiple
  # architectures or share the samba binaries across NFS then
-@@ -18,9 +18,9 @@
+@@ -18,9 +18,10 @@
  #       normally only applies to nmbd and smbd
  #       SBINDIR implies a secure binary directory
  BINDIR = $(BASEDIR)/bin
 -SBINDIR = $(BASEDIR)/bin
--LIBDIR = $(BASEDIR)/lib
--VARDIR = $(BASEDIR)/var
 +SBINDIR = $(BASEDIR)/sbin
+ LIBDIR = $(BASEDIR)/lib
+-VARDIR = $(BASEDIR)/var
 +ETCDIR = $(BASEDIR)/etc
 +LOGDIR = /var/log
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -45,13 +45,13 @@
+@@ -45,17 +46,17 @@
  # 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,30 +37,38 @@
 -NMBLOGFILE = $(VARDIR)/log.nmb
 -CONFIGFILE = $(LIBDIR)/smb.conf
 -LMHOSTSFILE = $(LIBDIR)/lmhosts
+-DRIVERFILE = $(LIBDIR)/printers.def
 +SMBLOGFILE = $(LOGDIR)/smb
 +NMBLOGFILE = $(LOGDIR)/nmb
 +CONFIGFILE = $(ETCDIR)/smb.conf
 +LMHOSTSFILE = $(ETCDIR)/lmhosts
++DRIVERFILE = $(ETCDIR)/printers.def
+ SMB_PASSWD = $(BINDIR)/smbpasswd
+ SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
+ WEB_ROOT = $(BASEDIR)
  
  # the directory where lock files go
 -LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/spool/lock
++LOCKDIR = /var/spool/locks
+ 
+ # The directory where code page definition files go
+ CODEPAGEDIR = $(LIBDIR)/codepages
+@@ -333,10 +334,10 @@
+ # LIBSM =   
  
- # set this to the default group you want your machine to appear in
- # for browsing. This can also be set in nmbd (see nmbd(8))
-@@ -383,8 +383,8 @@
- # This is for FreeBSD
- # contributed by kuku@acds.physik.rwth-aachen.de
- # NOTE: You may need to add -DBSD44 if you have password problems
--# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
+ 
+-# 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 = -DFreeBSD -DFAST_SHARE_MODES
++FLAGSM = -DFAST_SHARE_MODES
 +LIBSM = -lcrypt 
  
  
- # This is for NEXTSTEP Release 2.X
-@@ -684,8 +684,8 @@
- install: installbin installman installscripts
+ # This is for SEQUENT. 
+@@ -795,8 +796,8 @@
+ install: installbin installman installscripts installcp
  
  installbin: all
 -	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@@ -68,3 +78,14 @@
  
  installscripts:
  	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+@@ -818,8 +819,8 @@
+ 	@$(SHELL) $(srcdir)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)
+ 
+ uninstallscripts:
+ 	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba/pkg/DESCR b/net/samba/pkg/DESCR
index 0990f25f1b0..625b6a803be 100644
--- a/net/samba/pkg/DESCR
+++ b/net/samba/pkg/DESCR
@@ -3,14 +3,18 @@ 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 FreeBSD filespace as if it was a local disk drive,
-or FreeBSD printers as if they were local printers.
+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.
 
 Some of the most popular Lan Manager compatible clients include Lan
 Manager itself, Windows for Workgroups, OS/2 and Windows NT.
 
-Please note that if you want to use Windows NT 4.0 + Service Pack 3
-or above as clients, you have to use -des version of samba ports.
--des version is not redistributable as a binary package because of 
-the export control of US.  Please type make install at net/samba-des 
-in ports collection.
+*Security Notes*
+The users' encrypted passwords stored in ${PREFIX}/private/smbpasswd 
+(default: /usr/local/private/smbpasswd) file *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.
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index 276860e7cc4..7fbd8118573 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,26 +1,36 @@
-@comment $NetBSD: PLIST,v 1.2 1997/12/24 10:35:29 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/01/12 17:19:31 agc Exp $
 bin/smbclient
+bin/testparm
+bin/testprns
 bin/smbrun
 bin/smbstatus
 bin/smbpasswd
+bin/make_smbcodepage
 bin/nmblookup
+bin/make_printerdef
 bin/smbtar
 bin/addtosmbpass
-bin/testparm
-bin/testprns
 sbin/smbd
 sbin/nmbd
-man/man1/smbstatus.1.gz
-man/man1/smbclient.1.gz
-man/man1/smbrun.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/smbd.8.gz
-man/man8/nmbd.8.gz
-man/man8/smbpasswd.8.gz
+lib/codepages/codepage.437
+lib/codepages/codepage.850
+lib/codepages/codepage.852
+lib/codepages/codepage.932
+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
 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
@@ -45,6 +55,7 @@ share/doc/samba/faq/sambafaq.txt
 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/DIAGNOSIS.txt
 share/doc/samba/DNIX.txt
 share/doc/samba/DOMAIN.txt
@@ -54,8 +65,10 @@ share/doc/samba/Faxing.txt
 share/doc/samba/GOTCHAS.txt
 share/doc/samba/HINTS.txt
 share/doc/samba/MIRRORS.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/Passwords.txt
 share/doc/samba/Printing.txt
 share/doc/samba/SCO.txt
@@ -63,9 +76,10 @@ share/doc/samba/Speed.txt
 share/doc/samba/Support.txt
 share/doc/samba/Tracing.txt
 share/doc/samba/UNIX-SMB.txt
-share/doc/samba/Win95.txt
 share/doc/samba/UNIX_INSTALL.txt
+share/doc/samba/Win95.txt
 share/doc/samba/WinNT.txt
+share/doc/samba/cifsntdomain.txt
 share/doc/samba/security_level.txt
 share/doc/samba/README.DCEDFS
 share/doc/samba/README.jis
@@ -74,3 +88,6 @@ etc/rc.d/samba.sh.sample
 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."