Sync up packaging updates that didn't make it to HEAD.

(This used to be commit c6f7358535eb96112e055d60d39c1595601d3056)

1 files changed, 106 insertions, 62 deletions

diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index 92ea52527b..73ca951336 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -8,7 +8,7 @@ Source: ftp://samba.org/pub/samba/samba-PVERSION.tar.gz
 Patch: makefile-path.patch
 Patch1: smbw.patch
 Packager: John H Terpstra [Samba-Team] <jht@samba.org>
-Requires: pam >= 0.64
+Requires: pam >= 0.64 kernel >= 2.2.1 glibc >= 2.1.2
 Prereq: chkconfig fileutils
 BuildRoot: /var/tmp/samba
 Prefix: /usr
@@ -23,22 +23,33 @@ in Linux. Samba uses NetBIOS over TCP/IP (NetBT) protocols
 and does NOT need NetBEUI (Microsoft Raw NetBIOS frame)
 protocol.
 
-Samba-2 features an almost working NT Domain Control
-capability and includes the new SWAT (Samba Web Administration
-Tool) that allows samba's smb.conf file to be remotely managed
-using your favourite web browser. For the time being this is
-being enabled on TCP port 901 via inetd.
+Samba-2.2 features working NT Domain Control capability and 
+includes the SWAT (Samba Web Administration Tool) that 
+allows samba's smb.conf file to be remotely managed using your 
+favourite web browser. For the time being this is being
+enabled on TCP port 901 via inetd.
+
+Users are advised to use Samba-2.2 as a Windows NT4
+Domain Controller only on networks that do NOT have a Windows
+NT Domain Controller. This release does NOT as yet have
+Backup Domain control ability.
 
 Please refer to the WHATSNEW.txt document for fixup information.
 This binary release includes encrypted password support.
+
 Please read the smb.conf file and ENCRYPTION.txt in the
 docs directory for implementation details.
 
-NOTE: Red Hat Linux 5.X Uses PAM which has integrated support
-for Shadow passwords. Do NOT recompile with the SHADOW_PWD option
-enabled. Red Hat Linux has built in support for quotas in PAM.
+NOTE: Red Hat Linux uses PAM which has integrated support
+for Shadow passwords and quotas. Do NOT recompile with the
+SHADOW_PWD option enabled
 
 %changelog
+* Sun Nov 12 2000 John H Terpstra <jht@samba.org>
+ - Updated for Samba-2.2 releases
+ - Added libnss_wins.so stuff
+ - Added compile-time options
+
 * Sat Nov 29 1999 Matthew Vanecek <mev0003@unt.edu>
  - Added a Prefix and changed "/usr" to "%{prefix}"
 
@@ -117,8 +128,35 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
 
 %build
 cd source
-./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
+
+%ifarch ia64
+libtoolize --copy --force     # get it to recognize IA-64
+autoconf
+autoheader
+EXTRA="-D_LARGEFILE64_SOURCE"
+%endif
+NUMCPU=`grep processor /proc/cpuinfo | wc -l`
+CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
+	--prefix=%{prefix}\
+	--libdir=/etc \
+	--with-lockdir=/var/lock/samba \
+	--with-privatedir=/etc \
+	--with-swatdir=%{prefix}/share/swat \
+	--with-quotas \
+	--with-smbmount \
+	--with-pam \
+	--with-profile \
+	--with-syslog \
+	--with-utmp \
+	--with-vfs \
+	--with-msdfs \
+	--with-netatalk \
+	--with-sambabook=%{prefix}/share/swat/using_samba
+make -j${NUMCPU} all smbfilter nsswitch/libnss_wins.so
+make -j${NUMCPU} smbtorture debug2html locktest2
+make -j${NUMCPU} masktest bin/smbspool
+#make -j${NUMCPU} rpctorture locktest smbwrapper bin/wbinfo
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -136,8 +174,9 @@ 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 smbspool smbpasswd smbstatus testparm testprns \
-      make_smbcodepage make_printerdef rpcclient
+for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
+      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool
+#      smbsh smbwrapper.so 
 do
 install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
@@ -147,13 +186,16 @@ install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
 
 # Install secure binary files
-for i in smbd nmbd swat smbmount smbmnt smbumount
+for i in smbd nmbd swat smbmount smbumount smbmnt debug2html \
+      smbtorture smbfilter locktest2 masktest
+#     wbinfo
 do
 install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin
 done
 
-# we need a symlink for mount to recognise the smb filesystem type
+# we need a symlink for mount to recognise the smb and smbfs filesystem types
 ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
+ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
 
 # 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
@@ -162,10 +204,19 @@ install -m644 docs/manpages/$i $RPM_BUILD_ROOT%{prefix}/man/man1
 done
 
 # Install codepage source files
-for i in 437 737 850 852 861 866 932 936 949 950
+for i in 437 737 775 850 852 861 866 932 936 949 950 1251
 do
 install -m644 source/codepages/codepage_def.$i $RPM_BUILD_ROOT/etc/codepages/src
 done
+for i in 437 737 850 852 861 866 932 936 949 950 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI8-R
+do
+install -m644 source/codepages/CP$i.TXT $RPM_BUILD_ROOT/etc/codepages/src
+done
+
+# Install the nsswitch library extension file
+install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib
+# Make link for wins resolver
+( cd $RPM_BUILD_ROOT/lib; ln -s libnss_wins.so libnss_wins.so.2; )
 
 # Install SWAT helper files
 for i in swat/help/*.html docs/htmldocs/*.html
@@ -179,6 +230,18 @@ done
 for i in swat/include/*.html
 do
 install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include
+done# This is the O'Reily Samba Book - on-line
+for i in docs/htmldocs/using_samba/*.html
+do
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba
+done
+for i in docs/htmldocs/using_samba/figs/*.gif
+do
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/figs
+done
+for i in docs/htmldocs/using_samba/gifs/*.gif
+do
+install -m644 $i $RPM_BUILD_ROOT%{prefix/share/swat/using_samba/gifs
 done
 
 # Install the miscellany
@@ -212,10 +275,14 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add smb
 
 # Build codepage load files
-for i in 437 737 850 852 861 866 932 936 949 950
+for i in 437 737 850 852 861 866 932 936 949 950 1251
 do
 %{prefix}/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i
 done
+for i in 437 737 850 852 861 866 932 936 949 950 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI8-R
+do
+%{prefix/bin/make_unicodemap $i /etc/codepages/src/CP$i.TXT /etc/codepages/unicode_map.$i
+done
 
 # Add swat entry to /etc/services if not already there
 if !( grep ^[:space:]*swat /etc/services > /dev/null ) then
@@ -268,6 +335,13 @@ if [ $1 = 0 ] ; then
     mv $tmpfile services
 fi
 
+if [ -f /sbin/mount.smb ]; then
+	rm -f /sbin/mount.smb
+fi
+if [ -f /sbin/mount.smbfs ]; then
+	rm -f /sbin/mount.smbfs
+fi
+
 %triggerpostun -- samba < samba-2.0.0
 if [ $0 != 0 ]; then
     /sbin/chkconfig --add smb
@@ -287,6 +361,7 @@ fi
 %attr(-,root,root) %{prefix}/sbin/smbmount
 %attr(-,root,root) %{prefix}/sbin/smbumount
 %attr(-,root,root) /sbin/mount.smbfs
+%attr(-,root,root) /sbin/mount.smb
 %attr(0750,root,root) %{prefix}/sbin/samba
 %attr(-,root,root) %{prefix}/bin/addtosmbpass
 %attr(-,root,root) %{prefix}/bin/mksmbpasswd.sh
@@ -299,76 +374,45 @@ fi
 %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_unicodemap
 %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(755,root,root) /lib/libnss_wins.s*
+%attr(-,root,root) %{prefix}/share/swat/help/*
+%attr(-,root,root) %{prefix}/share/swat/images/*
 %attr(-,root,root) %{prefix}/share/swat/include/header.html
 %attr(-,root,root) %{prefix}/share/swat/include/footer.html
+%attr(-,root,root) %{prefix}/share/swat/using_samba/*
 %attr(-,root,root) %config(noreplace) /etc/lmhosts
 %attr(-,root,root) %config(noreplace) /etc/smb.conf
 %attr(-,root,root) %config(noreplace) /etc/smbusers
 %attr(-,root,root) /etc/rc.d/init.d/smb
 %attr(-,root,root) /etc/logrotate.d/samba
 %attr(-,root,root) /etc/pam.d/samba
-%attr(-,root,root) /etc/codepages/src/codepage_def.437
-%attr(-,root,root) /etc/codepages/src/codepage_def.737
-%attr(-,root,root) /etc/codepages/src/codepage_def.850
-%attr(-,root,root) /etc/codepages/src/codepage_def.852
-%attr(-,root,root) /etc/codepages/src/codepage_def.861
-%attr(-,root,root) /etc/codepages/src/codepage_def.866
-%attr(-,root,root) /etc/codepages/src/codepage_def.932
-%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) %{prefix}/man/man1/smbstatus.1
-%attr(-,root,root) %{prefix}/man/man1/smbclient.1
+%attr(-,root,root) /etc/codepages/src/codepage_def.*
 %attr(-,root,root) %{prefix}/man/man1/make_smbcodepage.1
+%attr(-,root,root) %{prefix}/man/man1/make_unicodemap.1
+%attr(-,root,root) %{prefix}/man/man1/nmblookup.1
+%attr(-,root,root) %{prefix}/man/man1/smbclient.1
 %attr(-,root,root) %{prefix}/man/man1/smbrun.1
+%attr(-,root,root) %{prefix}/man/man1/smbstatus.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/smb.conf.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/smbd.8
 %attr(-,root,root) %{prefix}/man/man8/smbmnt.8
 %attr(-,root,root) %{prefix}/man/man8/smbmount.8
+%attr(-,root,root) %{prefix}/man/man8/smbpasswd.8
 %attr(-,root,root) %{prefix}/man/man8/smbspool.8
+%attr(-,root,root) %{prefix}/man/man8/swat.8
 %attr(-,root,nobody) %dir /home/samba
 %attr(-,root,root) %dir /etc/codepages
 %attr(-,root,root) %dir /etc/codepages/src