first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

(This used to be commit 453a822a76780063dff23526c35408866d0c0154)

18 files changed, 251 insertions, 225 deletions

diff --git a/packaging/Digital/package-prep b/packaging/Digital/package-prep
index a1d3827553..2daee8b69e 100755
--- a/packaging/Digital/package-prep
+++ b/packaging/Digital/package-prep
@@ -1,10 +1,10 @@
 tar xvf skeleton.tar
+NOWDIR=`pwd`;
 ( cd /usr/local;
-	mv man man.orig;
-	mv samba samba.orig;
-	DIRNOW=`pwd1`;
-		ln -sf $NOWDIR/usr/local/man man;
-		ln -sf $NOWDIR/usr/local/samba samba; )
+	if [ -x man ]; then mv man man.orig; fi
+	if [ -x samba ]; then mv samba samba.orig; fi
+	ln -sf $NOWDIR/usr/local/man man;
+	ln -sf $NOWDIR/usr/local/samba samba; )
 gunzip samba-2.0.0.tar.gz
 tar xvf samba-2.0.0.tar
 cd samba-2.0.0/source
@@ -24,7 +24,7 @@ tar cvf samba-2.0.0.tar samba-2.0.0
 rm -rf samba-2.0.0
 rm -rf usr var
 cd ..
-find samba-2.0.0 -print | cpio -o > samba-2.0.0-OSF1-v4.0-alpha.cpio
-gzip samba-2.0.0-OSF1-v4.0-alpha.cpio
+find samba-2.0.0 -print | cpio -o > samba-2.0.0-OSF1-v4.0-beta5.cpio
+gzip samba-2.0.0-OSF1-v4.0-beta5.cpio
 cd samba-2.0.0
-tar xcf install.tar
+tar xvf install.tar
diff --git a/packaging/Digital/samba.init b/packaging/Digital/samba.init
index c1d605cda0..6a74244089 100755
--- a/packaging/Digital/samba.init
+++ b/packaging/Digital/samba.init
@@ -19,8 +19,8 @@ case "$1" in
 
 	'start')
 	   echo "Starting Samba"
-	   /usr/local/samba/sbin/smbd
-	   /usr/local/samba/sbin/nmbd
+	   /usr/local/samba/bin/smbd
+	   /usr/local/samba/bin/nmbd
 	   echo "Done."
 	   ;;
 	'stop')
diff --git a/packaging/Example/package-prep b/packaging/Example/package-prep
index 5e5834a6d3..e8f5089a86 100755
--- a/packaging/Example/package-prep
+++ b/packaging/Example/package-prep
@@ -7,7 +7,7 @@ tar xvf skeleton.tar
 ( cd /usr/local;
 	mv man man.orig;
 	mv samba samba.orig;
-	DIRNOW=`pwd1`;
+	NOWDIR=`pwd`;
 		ln -sf $NOWDIR/usr/local/man man;
 		ln -sf $NOWDIR/usr/local/samba samba; )
 
@@ -32,9 +32,8 @@ tar cvf install.tar usr var
 
 # Clean up original sources preserving all configured files
 #        Note: This will allow installers to check build options
-cd samba-X.X.X/source/bin
-rm -f *
-cd ..
+cd samba-X.X.X/source
+rm -f ../source/bin/*
 make clean
 cd ../..
 tar cvf samba-X.X.X.tar samba-X.X.X
diff --git a/packaging/PHT/TurboLinux/makefile-path.patch b/packaging/PHT/TurboLinux/makefile-path.patch
index 5fddb7cbfb..88d5222e09 100644
--- a/packaging/PHT/TurboLinux/makefile-path.patch
+++ b/packaging/PHT/TurboLinux/makefile-path.patch
@@ -1,44 +1,12 @@
-diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
---- samba-PVERSION/source/Makefile.in	Wed Dec  2 14:35:18 1998
-+++ samba-kgc/source/Makefile.in	Wed Dec  2 15:06:02 1998
-@@ -27,7 +27,7 @@
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
+@@ -25,9 +25,9 @@
+ BINDIR = @bindir@
+ # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
- SBINDIR = @bindir@
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
  LIBDIR = @libdir@
--VARDIR = $(BASEDIR)/var
-+VARDIR = /var
+-VARDIR = @localstatedir@
++VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -36,23 +36,23 @@
- # 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))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
-+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
--SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
--SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
--SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
-+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
-+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
-+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
-+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
- SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
- 
- # This is where SWAT images and help files go
--SWATDIR = $(BASEDIR)/swat
-+SWATDIR = $(BASEDIR)/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
diff --git a/packaging/PHT/TurboLinux/smb.conf b/packaging/PHT/TurboLinux/smb.conf
index bd9a8e15bc..e07d15c93e 100644
--- a/packaging/PHT/TurboLinux/smb.conf
+++ b/packaging/PHT/TurboLinux/smb.conf
@@ -85,7 +85,7 @@
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY 
+   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them
diff --git a/packaging/RedHat/makefile-path.patch b/packaging/RedHat/makefile-path.patch
index 5fddb7cbfb..88d5222e09 100644
--- a/packaging/RedHat/makefile-path.patch
+++ b/packaging/RedHat/makefile-path.patch
@@ -1,44 +1,12 @@
-diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
---- samba-PVERSION/source/Makefile.in	Wed Dec  2 14:35:18 1998
-+++ samba-kgc/source/Makefile.in	Wed Dec  2 15:06:02 1998
-@@ -27,7 +27,7 @@
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
+@@ -25,9 +25,9 @@
+ BINDIR = @bindir@
+ # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
- SBINDIR = @bindir@
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
  LIBDIR = @libdir@
--VARDIR = $(BASEDIR)/var
-+VARDIR = /var
+-VARDIR = @localstatedir@
++VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -36,23 +36,23 @@
- # 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))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
-+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
--SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
--SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
--SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
-+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
-+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
-+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
-+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
- SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
- 
- # This is where SWAT images and help files go
--SWATDIR = $(BASEDIR)/swat
-+SWATDIR = $(BASEDIR)/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl
index fa69370dff..1767176a1f 100644
--- a/packaging/RedHat/makerpms.sh.tmpl
+++ b/packaging/RedHat/makerpms.sh.tmpl
@@ -1,14 +1,47 @@
 #!/bin/sh
 # Copyright (C) John H Terpstra 1998
+# Updated for RPM 3 by Jochen Wiedmann, joe@ispsoft.de
 #
-RPMDIR=`rpm --showrc | awk '/^rpmdir/ { print $3}'`
-SPECDIR=`rpm --showrc | awk '/^specdir/ { print $3}'`
-SRCDIR=`rpm --showrc | awk '/^sourcedir/ { print $3}'`
+USERID=`id -u`
+GRPID=`id -g`
 
+rpm3var () {
+    echo "rpm3var start $1" >>/tmp/log
+    var=`rpm --showrc \
+         | awk "/-[0-9]+[:=][[:blank:]]+$1[[:blank:]]/ {print \\$3}"`
+    echo "var=$var" >>/tmp/log
+    while test -n "`echo $var | egrep '%{[_a-zA-Z]+}'`"; do
+       v=`echo $var | sed 's/.*%{\([_a-zA-Z]\+\)}.*/\1/'`
+       echo "Loop: v=$v" >>/tmp/log
+       w="`rpm3var $v`"
+       var=`echo $var | sed "s,%{\\([_a-zA-Z]\\+\\)},$w,g"`
+       echo "Loop: var=$var" >>/tmp/log
+    done
+    echo "rpm3var stop $1 $var" >>/tmp/log
+    echo $var
+}
+
+case `rpm --version | awk '{print $3}'` in
+    2.*)
+       RPMDIR=`rpm --showrc | awk '/^rpmdir/ { print $3}'`
+       SPECDIR=`rpm --showrc | awk '/^specdir/ { print $3}'`
+       SRCDIR=`rpm --showrc | awk '/^sourcedir/ { print $3}'`
+       ;;
+    3.*)
+       RPMDIR=`rpm3var _rpmdir`
+       SPECDIR=`rpm3var _specdir`
+       SRCDIR=`rpm3var _sourcedir`
+       ;;
+    *)
+       echo "Unknown RPM version: `rpm --version`"
+       exit 1
+       ;;
+esac
+
+( cd ../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-PVERSION )
 ( cd ../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION )
+
 cp -a *.spec $SPECDIR
 cp -a *.patch smb.* samba.log $SRCDIR
-cd $SRCDIR
-chown -R root.root samba-PVERSION
 cd $SPECDIR
 rpm -ba -v samba2.spec
diff --git a/packaging/RedHat/samba.log b/packaging/RedHat/samba.log
index c5f2a5b45b..c8ab3852e2 100644
--- a/packaging/RedHat/samba.log
+++ b/packaging/RedHat/samba.log
@@ -1,11 +1,11 @@
 /var/log/samba/log.nmb {
     postrotate
 	/usr/bin/killall -HUP nmbd
-    endrotate
+    endscript
 }
 
 /var/log/samba/log.smb {
     postrotate
 	/usr/bin/killall -HUP smbd
-    endrotate
+    endscript
 }
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index c7d665c672..92ea52527b 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -11,6 +11,7 @@ Packager: John H Terpstra [Samba-Team] <jht@samba.org>
 Requires: pam >= 0.64
 Prereq: chkconfig fileutils
 BuildRoot: /var/tmp/samba
+Prefix: /usr
 
 %description
 Samba provides an SMB server which can be used to provide
@@ -38,6 +39,25 @@ for Shadow passwords. Do NOT recompile with the SHADOW_PWD option
 enabled. Red Hat Linux has built in support for quotas in PAM.
 
 %changelog
+* Sat Nov 29 1999 Matthew Vanecek <mev0003@unt.edu>
+ - Added a Prefix and changed "/usr" to "%{prefix}"
+
+* Sat Nov 11 1999 Tridge <tridge@linuxcare.com>
+ - changed from mount.smb to mount.smbfs
+
+* Sat Oct 9 1999 Tridge <tridge@linuxcare.com>
+ - removed smbwrapper
+ - added smbmnt and smbmount
+
+* Sun Apr 25 1999 John H Terpstra <jht@samba.org>
+ - added smbsh.1 man page
+
+* Fri Mar 26 1999 Andrew Tridgell <tridge@samba.org>
+ - added --with-pam as pam is no longer used by default
+
+* Sat Jan 27 1999 Jeremy Allison <jra@samba.org>
+ - Removed smbrun binary and tidied up some loose ends
+
 * Sun Oct 25 1998 John H Terpstra <jht@samba.org>
  - Added parameters to /config to ensure smb.conf, lmhosts, 
 	and smbusers never gets over-written.
@@ -75,7 +95,7 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
  - Updated spec file
  - Included new codepage.936
 
-* Sat Mar 20 1998 John H Terpstra <jht@samba.anu.edu/au>
+* Sat Mar 20 1998 John H Terpstra <jht@samba.org>
  - Added swat facility
 
 * Sat Jan 24 1998 John H Terpstra <jht@samba.org>
@@ -97,8 +117,8 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
 
 %build
 cd source
-./configure --prefix=/usr --libdir=/etc --with-smbwrapper
-make all smbwrapper
+./configure --prefix=%{prefix} --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=%{prefix}/share/swat --with-smbmount --with-automount --with-quotas --with-pam
+make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,34 +127,38 @@ mkdir -p $RPM_BUILD_ROOT/etc/codepages/src
 mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/{init.d,rc0.d,rc1.d,rc2.d,rc3.d,rc5.d,rc6.d}
 mkdir -p $RPM_BUILD_ROOT/home/samba
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT/usr/share/swat/{images,help,include}
-mkdir -p $RPM_BUILD_ROOT/usr/man/{man1,man5,man7,man8}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
+mkdir -p $RPM_BUILD_ROOT/sbin
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/man/{man1,man5,man7,man8}
 mkdir -p $RPM_BUILD_ROOT/var/lock/samba
 mkdir -p $RPM_BUILD_ROOT/var/log/samba
 mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 
 # Install standard binary files
-for i in nmblookup smbclient smbpasswd smbrun smbstatus testparm testprns \
-      make_smbcodepage make_printerdef rpcclient smbsh smbwrapper.so
+for i in nmblookup smbclient smbspool smbpasswd smbstatus testparm testprns \
+      make_smbcodepage make_printerdef rpcclient
 do
-install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/bin
+install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
 for i in addtosmbpass mksmbpasswd.sh smbtar 
 do
-install -m755 source/script/$i $RPM_BUILD_ROOT/usr/bin
+install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
 
 # Install secure binary files
-for i in smbd nmbd swat
+for i in smbd nmbd swat smbmount smbmnt smbumount
 do
-install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/sbin
+install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin
 done
 
+# we need a symlink for mount to recognise the smb filesystem type
+ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
+
 # Install level 1 man pages
 for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1 make_smbcodepage.1 nmblookup.1
 do
-install -m644 docs/manpages/$i $RPM_BUILD_ROOT/usr/man/man1
+install -m644 docs/manpages/$i $RPM_BUILD_ROOT%{prefix}/man/man1
 done
 
 # Install codepage source files
@@ -146,34 +170,37 @@ done
 # Install SWAT helper files
 for i in swat/help/*.html docs/htmldocs/*.html
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/help
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help
 done
 for i in swat/images/*.gif
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/images
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images
 done
 for i in swat/include/*.html
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/include
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include
 done
 
 # Install the miscellany
-install -m644 swat/README $RPM_BUILD_ROOT/usr/share/swat
-install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT/usr/man/man5
-install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT/usr/man/man5
-install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT/usr/man/man5
-install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT/usr/man/man7
-install -m644 docs/manpages/smbd.8 $RPM_BUILD_ROOT/usr/man/man8
-install -m644 docs/manpages/nmbd.8 $RPM_BUILD_ROOT/usr/man/man8
-install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT/usr/man/man8
-install -m644 docs/manpages/smbpasswd.8 $RPM_BUILD_ROOT/usr/man/man8
+install -m644 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat
+install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT%{prefix}/man/man5
+install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT%{prefix}/man/man5
+install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT%{prefix}/man/man5
+install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT%{prefix}/man/man7
+install -m644 docs/manpages/smbd.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/nmbd.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/smbmnt.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/smbmount.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/smbpasswd.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/smbspool.8 $RPM_BUILD_ROOT%{prefix}/man/man8
 install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/smb.conf
 install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/smbusers
-install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT/usr/bin
-install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT/usr/bin
-install -m755 packaging/RedHat/smbadduser $RPM_BUILD_ROOT/usr/bin
+install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
+install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT%{prefix}/bin
+install -m755 packaging/RedHat/smbadduser $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
-install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/usr/sbin/samba
+install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba
 install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
 install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/lmhosts
@@ -187,7 +214,7 @@ rm -rf $RPM_BUILD_ROOT
 # Build codepage load files
 for i in 437 737 850 852 861 866 932 936 949 950
 do
-/usr/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i
+%{prefix}/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i
 done
 
 # Add swat entry to /etc/services if not already there
@@ -197,7 +224,7 @@ fi
 
 # Add swat entry to /etc/inetd.conf if needed
 if !( grep ^[:space:]*swat /etc/inetd.conf > /dev/null ) then
-	echo 'swat	stream	tcp	nowait.400	root	/usr/sbin/swat swat' >> /etc/inetd.conf
+	echo 'swat	stream	tcp	nowait.400	root	%{prefix}/sbin/swat swat' >> /etc/inetd.conf
 killall -1 inetd || :
 fi
 
@@ -221,9 +248,7 @@ fi
 
 %postun
 # Only delete remnants of samba if this is the final deletion.
-if [ $1 != 0 ] ; then
-    exit 0
-
+if [ $1 = 0 ] ; then
     if [ -x /etc/pam.d/samba ]; then
       rm -f /etc/pam.d/samba
     fi
@@ -255,56 +280,60 @@ fi
 %doc docs
 %doc swat/README
 %doc examples
-%attr(-,root,root) /usr/sbin/smbd
-%attr(-,root,root) /usr/sbin/nmbd
-%attr(-,root,root) /usr/sbin/swat
-%attr(0750,root,root) /usr/sbin/samba
-%attr(-,root,root) /usr/bin/addtosmbpass
-%attr(-,root,root) /usr/bin/mksmbpasswd.sh
-%attr(-,root,root) /usr/bin/smbclient
-%attr(-,root,root) /usr/bin/rpcclient
-%attr(-,root,root) /usr/bin/testparm
-%attr(-,root,root) /usr/bin/testprns
-%attr(-,root,root) /usr/bin/smbrun
-%attr(-,root,root) /usr/bin/findsmb
-%attr(-,root,root) /usr/bin/smbstatus
-%attr(-,root,root) /usr/bin/nmblookup
-%attr(-,root,root) /usr/bin/make_smbcodepage
-%attr(-,root,root) /usr/bin/make_printerdef
-%attr(-,root,root) /usr/bin/smbpasswd
-%attr(-,root,root) /usr/bin/smbtar
-%attr(-,root,root) /usr/bin/smbprint
-%attr(-,root,root) /usr/bin/smbadduser
-%attr(0755,root,root) /usr/bin/smbsh
-%attr(0755,root,root) /usr/bin/smbwrapper.so
-%attr(-,root,root) /usr/share/swat/help/welcome.html
-%attr(-,root,root) /usr/share/swat/help/DOMAIN_MEMBER.html
-%attr(-,root,root) /usr/share/swat/help/lmhosts.5.html
-%attr(-,root,root) /usr/share/swat/help/make_smbcodepage.1.html
-%attr(-,root,root) /usr/share/swat/help/nmbd.8.html
-%attr(-,root,root) /usr/share/swat/help/nmblookup.1.html
-%attr(-,root,root) /usr/share/swat/help/samba.7.html
-%attr(-,root,root) /usr/share/swat/help/smb.conf.5.html
-%attr(-,root,root) /usr/share/swat/help/smbclient.1.html
-%attr(-,root,root) /usr/share/swat/help/smbd.8.html
-%attr(-,root,root) /usr/share/swat/help/smbpasswd.5.html
-%attr(-,root,root) /usr/share/swat/help/smbpasswd.8.html
-%attr(-,root,root) /usr/share/swat/help/smbrun.1.html
-%attr(-,root,root) /usr/share/swat/help/smbstatus.1.html
-%attr(-,root,root) /usr/share/swat/help/smbtar.1.html
-%attr(-,root,root) /usr/share/swat/help/swat.8.html
-%attr(-,root,root) /usr/share/swat/help/testparm.1.html
-%attr(-,root,root) /usr/share/swat/help/testprns.1.html
-%attr(-,root,root) /usr/share/swat/images/globals.gif
-%attr(-,root,root) /usr/share/swat/images/home.gif
-%attr(-,root,root) /usr/share/swat/images/passwd.gif
-%attr(-,root,root) /usr/share/swat/images/printers.gif
-%attr(-,root,root) /usr/share/swat/images/shares.gif
-%attr(-,root,root) /usr/share/swat/images/samba.gif
-%attr(-,root,root) /usr/share/swat/images/status.gif
-%attr(-,root,root) /usr/share/swat/images/viewconfig.gif
-%attr(-,root,root) /usr/share/swat/include/header.html
-%attr(-,root,root) /usr/share/swat/include/footer.html
+%attr(-,root,root) %{prefix}/sbin/smbd
+%attr(-,root,root) %{prefix}/sbin/nmbd
+%attr(-,root,root) %{prefix}/sbin/swat
+%attr(-,root,root) %{prefix}/sbin/smbmnt
+%attr(-,root,root) %{prefix}/sbin/smbmount
+%attr(-,root,root) %{prefix}/sbin/smbumount
+%attr(-,root,root) /sbin/mount.smbfs
+%attr(0750,root,root) %{prefix}/sbin/samba
+%attr(-,root,root) %{prefix}/bin/addtosmbpass
+%attr(-,root,root) %{prefix}/bin/mksmbpasswd.sh
+%attr(-,root,root) %{prefix}/bin/smbclient
+%attr(-,root,root) %{prefix}/bin/smbspool
+%attr(-,root,root) %{prefix}/bin/rpcclient
+%attr(-,root,root) %{prefix}/bin/testparm
+%attr(-,root,root) %{prefix}/bin/testprns
+%attr(-,root,root) %{prefix}/bin/findsmb
+%attr(-,root,root) %{prefix}/bin/smbstatus
+%attr(-,root,root) %{prefix}/bin/nmblookup
+%attr(-,root,root) %{prefix}/bin/make_smbcodepage
+%attr(-,root,root) %{prefix}/bin/make_printerdef
+%attr(-,root,root) %{prefix}/bin/smbpasswd
+%attr(-,root,root) %{prefix}/bin/smbtar
+%attr(-,root,root) %{prefix}/bin/smbprint
+%attr(-,root,root) %{prefix}/bin/smbadduser
+%attr(-,root,root) %{prefix}/share/swat/help/welcome.html
+%attr(-,root,root) %{prefix}/share/swat/help/DOMAIN_MEMBER.html
+%attr(-,root,root) %{prefix}/share/swat/help/NT_Security.html
+%attr(-,root,root) %{prefix}/share/swat/help/lmhosts.5.html
+%attr(-,root,root) %{prefix}/share/swat/help/make_smbcodepage.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/nmbd.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/nmblookup.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/samba.7.html
+%attr(-,root,root) %{prefix}/share/swat/help/smb.conf.5.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbclient.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbspool.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbd.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbpasswd.5.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbpasswd.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbrun.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbstatus.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbtar.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/swat.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/testparm.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/testprns.1.html
+%attr(-,root,root) %{prefix}/share/swat/images/globals.gif
+%attr(-,root,root) %{prefix}/share/swat/images/home.gif
+%attr(-,root,root) %{prefix}/share/swat/images/passwd.gif
+%attr(-,root,root) %{prefix}/share/swat/images/printers.gif
+%attr(-,root,root) %{prefix}/share/swat/images/shares.gif
+%attr(-,root,root) %{prefix}/share/swat/images/samba.gif
+%attr(-,root,root) %{prefix}/share/swat/images/status.gif
+%attr(-,root,root) %{prefix}/share/swat/images/viewconfig.gif
+%attr(-,root,root) %{prefix}/share/swat/include/header.html
+%attr(-,root,root) %{prefix}/share/swat/include/footer.html
 %attr(-,root,root) %config(noreplace) /etc/lmhosts
 %attr(-,root,root) %config(noreplace) /etc/smb.conf
 %attr(-,root,root) %config(noreplace) /etc/smbusers
@@ -321,22 +350,25 @@ fi
 %attr(-,root,root) /etc/codepages/src/codepage_def.936
 %attr(-,root,root) /etc/codepages/src/codepage_def.949
 %attr(-,root,root) /etc/codepages/src/codepage_def.950
-%attr(-,root,root) /usr/man/man1/smbstatus.1
-%attr(-,root,root) /usr/man/man1/smbclient.1
-%attr(-,root,root) /usr/man/man1/make_smbcodepage.1
-%attr(-,root,root) /usr/man/man1/smbrun.1
-%attr(-,root,root) /usr/man/man1/smbtar.1
-%attr(-,root,root) /usr/man/man1/testparm.1
-%attr(-,root,root) /usr/man/man1/testprns.1
-%attr(-,root,root) /usr/man/man1/nmblookup.1
-%attr(-,root,root) /usr/man/man5/smb.conf.5
-%attr(-,root,root) /usr/man/man5/lmhosts.5
-%attr(-,root,root) /usr/man/man5/smbpasswd.5
-%attr(-,root,root) /usr/man/man7/samba.7
-%attr(-,root,root) /usr/man/man8/smbd.8
-%attr(-,root,root) /usr/man/man8/nmbd.8
-%attr(-,root,root) /usr/man/man8/smbpasswd.8
-%attr(-,root,root) /usr/man/man8/swat.8
+%attr(-,root,root) %{prefix}/man/man1/smbstatus.1
+%attr(-,root,root) %{prefix}/man/man1/smbclient.1
+%attr(-,root,root) %{prefix}/man/man1/make_smbcodepage.1
+%attr(-,root,root) %{prefix}/man/man1/smbrun.1
+%attr(-,root,root) %{prefix}/man/man1/smbtar.1
+%attr(-,root,root) %{prefix}/man/man1/testparm.1
+%attr(-,root,root) %{prefix}/man/man1/testprns.1
+%attr(-,root,root) %{prefix}/man/man1/nmblookup.1
+%attr(-,root,root) %{prefix}/man/man5/smb.conf.5
+%attr(-,root,root) %{prefix}/man/man5/lmhosts.5
+%attr(-,root,root) %{prefix}/man/man5/smbpasswd.5
+%attr(-,root,root) %{prefix}/man/man7/samba.7
+%attr(-,root,root) %{prefix}/man/man8/smbd.8
+%attr(-,root,root) %{prefix}/man/man8/nmbd.8
+%attr(-,root,root) %{prefix}/man/man8/smbpasswd.8
+%attr(-,root,root) %{prefix}/man/man8/swat.8
+%attr(-,root,root) %{prefix}/man/man8/smbmnt.8
+%attr(-,root,root) %{prefix}/man/man8/smbmount.8
+%attr(-,root,root) %{prefix}/man/man8/smbspool.8
 %attr(-,root,nobody) %dir /home/samba
 %attr(-,root,root) %dir /etc/codepages
 %attr(-,root,root) %dir /etc/codepages/src
diff --git a/packaging/RedHat/smb.conf b/packaging/RedHat/smb.conf
index bd9a8e15bc..e07d15c93e 100644
--- a/packaging/RedHat/smb.conf
+++ b/packaging/RedHat/smb.conf
@@ -85,7 +85,7 @@
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY 
+   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them
diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl
index cc44627273..a7f3c574a7 100755
--- a/packaging/SGI/idb.pl
+++ b/packaging/SGI/idb.pl
@@ -10,6 +10,15 @@ $curdir = $ENV{"PWD"};
 open(IGNORES,"../../source/.cvsignore") || die "Unable to open .cvsignore file\n";
 while (<IGNORES>) {
   chop;
+  next if /cvs\.log/;
+  $ignores{$_}++;
+}
+close IGNORES;
+
+# We don't want the files listed in .cvsignore in the source/include tree
+open(IGNORES,"../../source/include/.cvsignore") || die "Unable to open include/.cvsignore file\n";
+while (<IGNORES>) {
+  chop;
   $ignores{$_}++;
 }
 close IGNORES;
@@ -32,6 +41,7 @@ if (@sprogs) {
 }
 if (@progs) {
   @progs[0] =~ s/^.*\=//;
+  @progs[0] =~ s/\$\(\S+\)\s//g;
   @progs = split(' ',@progs[0]);
 }
 if (@mprogs) {
@@ -48,6 +58,7 @@ if (@progs2) {
 }
 if (@scripts) {
   @scripts[0] =~ s/^.*\=//;
+  @scripts[0] =~ s/\$\(srcdir\)\///g;
   @scripts = split(' ',@scripts[0]);
 }
 if (@codepage) {
@@ -177,7 +188,7 @@ while (@sorted) {
     print IDB "d 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n";
   }
   else {
-    if (grep((/\.sh$/ | /\.pl$/ | /mkman$/),$nextfile)) {
+    if (grep((/\.sh$/ | /configure$/ | /configure\.developer/ | /config\.guess/ | /config\.sub/ | /\.pl$/ | /mkman$/),$nextfile)) {
 	print IDB "f 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n";
     }
     else {
@@ -210,7 +221,7 @@ while (@catman) {
   $nextfile = shift @catman;
   ($file = $nextfile) =~ s/^packaging\/SGI\/catman\///;
   ($dirnum = $file) =~ s/^[\D]*//;
-  $dirnum =~ s/\.Z//;
+  $dirnum =~ s/\.z//;
   if ($dirnum ne $olddirnum) {
     print IDB "d 0755 root sys usr/share/catman/u_man/cat$dirnum packaging/SGI samba.man.manpages\n";
     $olddirnum = $dirnum;
diff --git a/packaging/SGI/inst.msg b/packaging/SGI/inst.msg
index c613a09d01..248e990c4a 100755
--- a/packaging/SGI/inst.msg
+++ b/packaging/SGI/inst.msg
@@ -2,7 +2,7 @@
 
 echo
 echo
-echo Samba for IRIX has been installed on your system.
+echo Samba has been installed on your system.
 echo 
 echo Your /etc/services and /etc/inetd.conf files have
 echo been modified to automatically start the
diff --git a/packaging/SGI/mkman b/packaging/SGI/mkman
index 4de437d0ad..a39ed9fdd0 100755
--- a/packaging/SGI/mkman
+++ b/packaging/SGI/mkman
@@ -9,7 +9,10 @@ FILES="*.?"
 
 cd ../../docs/manpages
 for FILE in  $FILES ; do
+   if [ "$FILE" = "smbmnt.8" ]; then continue; fi;
+   if [ "$FILE" = "smbmount.8" -o "$FILE" = "smbumount.8" ]; then continue; fi;
+   if [ "$FILE" = "smbrun.1" ]; then continue; fi;
    neqn $FILE | tbl | nroff -man > ../../packaging/SGI/catman/`basename $FILE`
-   compress -f ../../packaging/SGI/catman/`basename $FILE`
+   pack -f ../../packaging/SGI/catman/`basename $FILE`
 done
 cd ../../packaging/SGI
diff --git a/packaging/SGI/mkrelease.sh b/packaging/SGI/mkrelease.sh
index cfe9c1f6b8..19aa642aad 100755
--- a/packaging/SGI/mkrelease.sh
+++ b/packaging/SGI/mkrelease.sh
@@ -14,6 +14,7 @@
 
 doclean=""
 SGI_ABI=-n32
+ISA=-mips3
 CC=cc
 
 if [ ! -f ../../source/Makefile ]; then
@@ -25,6 +26,7 @@ if [ "$1" = "clean" ]; then
   shift
 elif [ "$1" = "5" ]; then
   SGI_ABI=-32
+  ISA=""
   shift
 fi
 
@@ -35,10 +37,11 @@ if [ "$1" = "clean" ]; then
   shift
 elif [ "$1" = "5" ]; then
   SGI_ABI=-32
+  ISA=""
   shift
 fi
 
-export SGI_ABI CC
+export SGI_ABI ISA CC
 
 if [ "$doclean" = "clean" ]; then
   cd ../../source
@@ -64,11 +67,6 @@ fi
 cd ../../source
 if [ "$doclean" = "clean" ]; then
   echo Create SGI specific Makefile
-  chmod +x configure
-  chmod +x configure.developer
-  chmod +x config.guess
-  chmod +x config.status
-  chmod +x config.sub
   ./configure --prefix=/usr/samba --mandir=/usr/share/catman --with-smbwrapper
   errstat=$?
   if [ $errstat -ne 0 ]; then
diff --git a/packaging/SGI/sambalp b/packaging/SGI/sambalp
index fd0cef8f93..61e62215c9 100644
--- a/packaging/SGI/sambalp
+++ b/packaging/SGI/sambalp
@@ -146,5 +146,12 @@ if ($PSFIX) {			# are we running a "psfix"?
     system("$lpcommand $file");
 }
 
-# Remove the file only if it lives in /usr/tmp, /tmp, or /var/tmp.
-unlink($file) if $file =~ m=^(/(usr|var))?/tmp=;
+if ($file =~ m(^/)) {
+	# $file is a fully specified path
+	# Remove the file only if it lives in a directory ending in /tmp.
+	unlink($file) if ($file =~ m(/tmp/[^/]+$));
+} else {
+	# $file is NOT a fully specified path
+	# Remove the file only if current directory ends in /tmp.
+	unlink($file) if (`pwd` =~ m(/tmp$));
+}
diff --git a/packaging/SGI/smb.conf b/packaging/SGI/smb.conf
index 9a154f8f9b..68187ee288 100644
--- a/packaging/SGI/smb.conf
+++ b/packaging/SGI/smb.conf
@@ -76,6 +76,16 @@
    preserve case = yes
    short preserve case = yes
 
+;  These are the settings required for IRIX password sync
+   passwd program = /usr/bin/passwd %u
+   passwd chat = *ew*password:* %n\n *e-enter*new*password:* %n\n
+
+;  Uncomment the following if you wish to use encrypted passwords.
+;   encrypt passwords = yes
+
+;  Uncomment the following if you wish to sync unix and smbpasswd 
+;   unix password sync = yes
+
 [homes]
    comment = Home Directories
    browseable = no
diff --git a/packaging/Solaris/pkg-specs/pkginfo b/packaging/Solaris/pkg-specs/pkginfo
index ab06b3fffa..d195f177e9 100644
--- a/packaging/Solaris/pkg-specs/pkginfo
+++ b/packaging/Solaris/pkg-specs/pkginfo
@@ -1,12 +1,12 @@
-PSTAMP=Mon Sep 29 17:26:14 BST 1997
 PKG=samba
 NAME=SMB based file/printer sharing
-VERSION=1.9.17p2,REV=1
 ARCH=sparc
+VERSION=2.0.6
 CATEGORY=system
-VENDOR=samba group
+VENDOR=Samba Group
 DESC=File and printer sharing for NT workstations
+HOTLINE=Please contact your local UNIX support group
+EMAIL=samba@samba.org
 CLASSES=none
+BASEDIR=/usr/local
 INTONLY=1
-HOTLINE=Please contact your local UNIX support group
-BASEDIR=/
diff --git a/packaging/SuSE/5.2/samba.spec b/packaging/SuSE/5.2/samba.spec
index 637af1781e..5f20875c9e 100644
--- a/packaging/SuSE/5.2/samba.spec
+++ b/packaging/SuSE/5.2/samba.spec
@@ -67,7 +67,6 @@ fi
 /usr/bin/smbclient
 /usr/bin/smbmount
 /usr/bin/smbpasswd
-/usr/bin/smbrun
 /usr/bin/smbstatus
 /usr/bin/smbtar
 /usr/bin/smbumount
@@ -109,8 +108,6 @@ Samba includes the following programs (in summary):
 * smbd, the SMB server. This handles actual connections from clients.
 * nmbd, the Netbios name server, which helps clients locate servers.
 * smbclient, the Unix-hosted client program.
-* smbrun, a little 'glue' program to help the server run external
-programs. 
 * testprns, a program to test server access to printers.
 * testparm, a program to test the Samba configuration file for correctness.
 * smb.conf, the Samba configuration file.