Getting ready for release of 1.9.17.

Please note: These are in my early TODO state - not prime time ready!!

5 files changed, 271 insertions, 32 deletions

diff --git a/examples/redhat/samba-RH303.spec b/examples/redhat/samba-RH303.spec
new file mode 100644
index 00000000000..7c8e3f9f8cb
--- /dev/null
+++ b/examples/redhat/samba-RH303.spec
@@ -0,0 +1,124 @@
+Summary: SMB client and server
+Name: samba
+Version: RH303-1.9.17a3
+Release: 1
+Copyright: GPL
+Group: Networking
+Source: ftp://samba.anu.edu.au/pub/samba/samba-latest.tar.gz
+Patch: samba-make303.patch
+Patch2: samba-axp.patch
+Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au>
+
+%description
+Samba provides an SMB server which can be used to provide network
+services to SMB (sometimes called "Lan Manager") clients, including
+various versions of MS Windows, OS/2, and other Linux machines.
+
+Samba uses NetBIOS over TCP/IP (NetBT) protocols and does NOT need
+NetBEUI (Microsoft Raw NetBIOS frame) protocol.
+
+%prep
+%setup
+%patch -p1
+
+%ifarch axp
+%patch2 -p1
+%endif
+
+%build
+cd source
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+
+%install
+cd source
+cd ..
+for i in nmblookup smbclient smbpasswd smbrun smbstatus testparm testprns
+do
+install -m755 -s -g0 -o0 source/$i /usr/bin
+done
+
+for i in addtosmbpass mksmbpasswd.sh smbtar 
+do
+install -m755 -g0 -o0 source/$i /usr/bin
+done
+
+for i in smbd nmbd
+do
+install -m755 -s -g0 -o0 source/$i /usr/sbin
+done
+
+for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1
+do
+install -m644 -g0 -o0 docs/$i /usr/man/man1
+done
+
+install -m644 -g0 -o0 docs/smb.conf.5 /usr/man/man5
+install -m644 -g0 -o0 docs/samba.7 /usr/man/man7
+install -m644 -g0 -o0 docs/smbd.8 /usr/man/man8
+install -m644 -g0 -o0 docs/nmbd.8 /usr/man/man8
+install -m644 -g0 -o0 examples/simple/smb.conf /etc/smb.conf.sampl
+install -m644 -g0 -o0 examples/redhat/smb.conf /etc/smb.conf
+install -m644 -g0 -o0 examples/redhat/smbprint /usr/bin
+install -m755 -g0 -o0 examples/redhat/smb.init /etc/rc.d/init.d/smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc3.d/S91smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc0.d/K35smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc6.d/K35smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc1.d/K35smb
+mkdir -p /home/samba
+mkdir -p /var/lock/samba
+chown root.nobody /home/samba
+chmod 775 /home/samba
+install -m 644 -g0 -o0 examples/redhat/samba.log /etc/logrotate.d/samba
+
+%post
+/sbin/pamconfig --add --service=samba --password=none --sesslist=none
+
+if [ ! -f /var/log/samba ]; then
+	touch /var/log/samba
+	chmod 600 /var/log/samba
+fi
+
+%postun
+if [ "$1" = 0 ] ; then
+  /sbin/pamconfig --remove --service=samba --password=none --sesslist=none
+fi
+
+%files
+%doc docs/*.txt docs/INSTALL.sambatar docs/MIRRORS docs/PROJECTS 
+%doc docs/README.DCEDFS docs/README.jis docs/README.sambatar 
+%doc docs/SMBTAR.notes docs/THANKS docs/announce docs/history
+%doc docs/samba.faq docs/samba.lsm docs/wfw_slip.htm 
+%doc examples
+/usr/sbin/smbd
+/usr/bin/addtosmbpass
+/usr/bin/mksmbpasswd.sh
+/usr/bin/smbclient
+/usr/sbin/nmbd
+/usr/bin/testparm
+/usr/bin/testprns
+/usr/bin/smbrun
+/usr/bin/smbstatus
+/usr/bin/nmblookup
+/usr/bin/smbpasswd
+/usr/bin/smbtar
+/usr/bin/smbprint
+%config /etc/smb.conf
+%config /etc/smb.conf.sampl
+%config /etc/rc.d/init.d/smb
+%config /etc/rc.d/rc3.d/S91smb
+%config /etc/rc.d/rc0.d/K35smb
+%config /etc/rc.d/rc1.d/K35smb
+%config /etc/rc.d/rc6.d/K35smb
+%config /etc/logrotate.d/samba
+/usr/man/man1/smbstatus.1
+/usr/man/man1/smbclient.1
+/usr/man/man1/smbrun.1
+/usr/man/man1/smbtar.1
+/usr/man/man1/testparm.1
+/usr/man/man1/testprns.1
+/usr/man/man5/smb.conf.5
+/usr/man/man7/samba.7
+/usr/man/man8/smbd.8
+/usr/man/man8/nmbd.8
+%dir /home/samba
+%dir /var/lock/samba
diff --git a/examples/redhat/samba-1.9.17a1.spec b/examples/redhat/samba-RH40.spec
index f493027e00b..40b6a70ebfe 100644
--- a/examples/redhat/samba-1.9.17a1.spec
+++ b/examples/redhat/samba-RH40.spec
@@ -1,10 +1,10 @@
 Summary: SMB client and server
 Name: samba
-Version: 1.9.17a1
+Version: RH303-1.9.17a3
 Release: 1
 Copyright: GPL
 Group: Networking
-Source: ftp://samba.anu.edu.au/pub/samba/samba-1.9.17a1.tar.gz
+Source: ftp://samba.anu.edu.au/pub/samba/samba-latest.tar.gz
 Patch: samba-make.patch
 Patch2: samba-axp.patch
 Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au>
@@ -61,7 +61,7 @@ install -m644 -g0 -o0 docs/smbd.8 /usr/man/man8
 install -m644 -g0 -o0 docs/nmbd.8 /usr/man/man8
 install -m644 -g0 -o0 examples/simple/smb.conf /etc/smb.conf.sampl
 install -m644 -g0 -o0 examples/redhat/smb.conf /etc/smb.conf
-install -m644 -g0 -o0 examples/printing/smbprint /usr/bin
+install -m644 -g0 -o0 examples/redhat/smbprint /usr/bin
 install -m755 -g0 -o0 examples/redhat/smb.init /etc/rc.d/init.d/smb
 ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc3.d/S91smb
 ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc0.d/K35smb
diff --git a/examples/redhat/samba-1.9.17a1.spec.new b/examples/redhat/samba-RH41.spec
index 5f2d0651958..40b6a70ebfe 100644
--- a/examples/redhat/samba-1.9.17a1.spec.new
+++ b/examples/redhat/samba-RH41.spec
@@ -1,10 +1,10 @@
 Summary: SMB client and server
 Name: samba
-Version: 1.9.17a1
+Version: RH303-1.9.17a3
 Release: 1
 Copyright: GPL
 Group: Networking
-Source: ftp://samba.anu.edu.au/pub/samba/samba-1.9.17a1.tar.gz
+Source: ftp://samba.anu.edu.au/pub/samba/samba-latest.tar.gz
 Patch: samba-make.patch
 Patch2: samba-axp.patch
 Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au>
@@ -37,43 +37,32 @@ cd source
 cd ..
 for i in nmblookup smbclient smbpasswd smbrun smbstatus testparm testprns
 do
-install -m755 -s source/$i /usr/bin
-%attr(-,0,0) /usr/bin/$i
+install -m755 -s -g0 -o0 source/$i /usr/bin
 done
 
 for i in addtosmbpass mksmbpasswd.sh smbtar 
 do
-install -m755 source/$i /usr/bin
-%attr(-,0,0) /usr/bin/$i
+install -m755 -g0 -o0 source/$i /usr/bin
 done
 
 for i in smbd nmbd
 do
-install -m755 -s source/$i /usr/sbin
-%attr(-,0,0) /usr/bin/$i
+install -m755 -s -g0 -o0 source/$i /usr/sbin
 done
 
 for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1
 do
-install -m644 docs/$i /usr/man/man1
-%attr(-,0,0) /usr/bin/$i
+install -m644 -g0 -o0 docs/$i /usr/man/man1
 done
 
-install -m644 docs/smb.conf.5 /usr/man/man5
-%attr(-,0,0) /usr/man/man5/smb.conf.5
-install -m644 docs/samba.7 /usr/man/man7
-%attr(-,0,0) /usr/man/man7/samba.7
-install -m644 docs/smbd.8 /usr/man/man8
-%attr(-,0,0) /usr/man/man8/smbd.8
-install -m644 docs/nmbd.8 /usr/man/man8
-%attr(-,0,0) /usr/man/man8/nmbd.8
-install -m644 examples/simple/smb.conf /etc/smb.conf.sampl
-install -m644 examples/redhat/smb.conf /etc/smb.conf
-%attr(-,0,0) /etc/smb.conf
-install -m644 examples/printing/smbprint /usr/bin
-%attr(-,0,0) /usr/bin/smbprint
-install -m755 examples/redhat/smb.init /etc/rc.d/init.d/smb
-%attr(-,0,0) /etc/rc.d/init.d/smb
+install -m644 -g0 -o0 docs/smb.conf.5 /usr/man/man5
+install -m644 -g0 -o0 docs/samba.7 /usr/man/man7
+install -m644 -g0 -o0 docs/smbd.8 /usr/man/man8
+install -m644 -g0 -o0 docs/nmbd.8 /usr/man/man8
+install -m644 -g0 -o0 examples/simple/smb.conf /etc/smb.conf.sampl
+install -m644 -g0 -o0 examples/redhat/smb.conf /etc/smb.conf
+install -m644 -g0 -o0 examples/redhat/smbprint /usr/bin
+install -m755 -g0 -o0 examples/redhat/smb.init /etc/rc.d/init.d/smb
 ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc3.d/S91smb
 ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc0.d/K35smb
 ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc6.d/K35smb
@@ -82,8 +71,7 @@ mkdir -p /home/samba
 mkdir -p /var/lock/samba
 chown root.nobody /home/samba
 chmod 775 /home/samba
-install -m 644 examples/redhat/samba.log /etc/logrotate.d/samba
-%attr(-,0,0) /etc/logrotate.d/samba
+install -m 644 -g0 -o0 examples/redhat/samba.log /etc/logrotate.d/samba
 
 %post
 /sbin/pamconfig --add --service=samba --password=none --sesslist=none
diff --git a/examples/redhat/samba-RH42.spec b/examples/redhat/samba-RH42.spec
new file mode 100644
index 00000000000..40b6a70ebfe
--- /dev/null
+++ b/examples/redhat/samba-RH42.spec
@@ -0,0 +1,127 @@
+Summary: SMB client and server
+Name: samba
+Version: RH303-1.9.17a3
+Release: 1
+Copyright: GPL
+Group: Networking
+Source: ftp://samba.anu.edu.au/pub/samba/samba-latest.tar.gz
+Patch: samba-make.patch
+Patch2: samba-axp.patch
+Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au>
+Requires: pamconfig
+
+%description
+Samba provides an SMB server which can be used to provide network
+services to SMB (sometimes called "Lan Manager") clients, including
+various versions of MS Windows, OS/2, and other Linux machines.
+Samba also provides some SMB clients, which complement the built-in
+SMB filesystem in Linux.
+
+Samba uses NetBIOS over TCP/IP (NetBT) protocols and does NOT need
+NetBEUI (Microsoft Raw NetBIOS frame) protocol.
+
+%prep
+%setup
+%patch -p1
+
+%ifarch axp
+%patch2 -p1
+%endif
+
+%build
+cd source
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+
+%install
+cd source
+cd ..
+for i in nmblookup smbclient smbpasswd smbrun smbstatus testparm testprns
+do
+install -m755 -s -g0 -o0 source/$i /usr/bin
+done
+
+for i in addtosmbpass mksmbpasswd.sh smbtar 
+do
+install -m755 -g0 -o0 source/$i /usr/bin
+done
+
+for i in smbd nmbd
+do
+install -m755 -s -g0 -o0 source/$i /usr/sbin
+done
+
+for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1
+do
+install -m644 -g0 -o0 docs/$i /usr/man/man1
+done
+
+install -m644 -g0 -o0 docs/smb.conf.5 /usr/man/man5
+install -m644 -g0 -o0 docs/samba.7 /usr/man/man7
+install -m644 -g0 -o0 docs/smbd.8 /usr/man/man8
+install -m644 -g0 -o0 docs/nmbd.8 /usr/man/man8
+install -m644 -g0 -o0 examples/simple/smb.conf /etc/smb.conf.sampl
+install -m644 -g0 -o0 examples/redhat/smb.conf /etc/smb.conf
+install -m644 -g0 -o0 examples/redhat/smbprint /usr/bin
+install -m755 -g0 -o0 examples/redhat/smb.init /etc/rc.d/init.d/smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc3.d/S91smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc0.d/K35smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc6.d/K35smb
+ln -sf /etc/rc.d/init.d/smb /etc/rc.d/rc1.d/K35smb
+mkdir -p /home/samba
+mkdir -p /var/lock/samba
+chown root.nobody /home/samba
+chmod 775 /home/samba
+install -m 644 -g0 -o0 examples/redhat/samba.log /etc/logrotate.d/samba
+
+%post
+/sbin/pamconfig --add --service=samba --password=none --sesslist=none
+
+if [ ! -f /var/log/samba ]; then
+	touch /var/log/samba
+	chmod 600 /var/log/samba
+fi
+
+%postun
+if [ "$1" = 0 ] ; then
+  /sbin/pamconfig --remove --service=samba --password=none --sesslist=none
+fi
+
+%files
+%doc docs/*.txt docs/INSTALL.sambatar docs/MIRRORS docs/PROJECTS 
+%doc docs/README.DCEDFS docs/README.jis docs/README.sambatar 
+%doc docs/SMBTAR.notes docs/THANKS docs/announce docs/history
+%doc docs/samba.faq docs/samba.lsm docs/wfw_slip.htm 
+%doc examples
+/usr/sbin/smbd
+/usr/bin/addtosmbpass
+/usr/bin/mksmbpasswd.sh
+/usr/bin/smbclient
+/usr/sbin/nmbd
+/usr/bin/testparm
+/usr/bin/testprns
+/usr/bin/smbrun
+/usr/bin/smbstatus
+/usr/bin/nmblookup
+/usr/bin/smbpasswd
+/usr/bin/smbtar
+/usr/bin/smbprint
+%config /etc/smb.conf
+%config /etc/smb.conf.sampl
+%config /etc/rc.d/init.d/smb
+%config /etc/rc.d/rc3.d/S91smb
+%config /etc/rc.d/rc0.d/K35smb
+%config /etc/rc.d/rc1.d/K35smb
+%config /etc/rc.d/rc6.d/K35smb
+%config /etc/logrotate.d/samba
+/usr/man/man1/smbstatus.1
+/usr/man/man1/smbclient.1
+/usr/man/man1/smbrun.1
+/usr/man/man1/smbtar.1
+/usr/man/man1/testparm.1
+/usr/man/man1/testprns.1
+/usr/man/man5/smb.conf.5
+/usr/man/man7/samba.7
+/usr/man/man8/smbd.8
+/usr/man/man8/nmbd.8
+%dir /home/samba
+%dir /var/lock/samba
diff --git a/examples/redhat/smbprint b/examples/redhat/smbprint
index 3d7225144b1..51b15706add 100755
--- a/examples/redhat/smbprint
+++ b/examples/redhat/smbprint
@@ -44,8 +44,8 @@
 #
 # Debugging log file, change to /dev/null if you like.
 #
-logfile=/var/log/smb-print.log
-# logfile=/dev/null
+# logfile=/tmp/smb-print.log
+logfile=/dev/null
 
 
 #