Updating build ability for TurboLinux.

Fixes to allow compilation of libnss_wins.so.

1 files changed, 55 insertions, 37 deletions

diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl
index 257159b759f..7b704889d1c 100644
--- a/packaging/PHT/TurboLinux/samba2.spec.tmpl
+++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl
@@ -7,7 +7,7 @@ Group: Networking
 Source: ftp://samba.org/pub/samba/samba-PVERSION.tar.gz
 Patch: makefile-path.patch
 Patch1: smbw.patch
-Patch2: nss_makefile.patch
+Patch2: nss-wins.patch
 Requires: pam >= 0.64 kernel >= 2.2.1 glibc >= 2.1.2
 Prereq: chkconfig fileutils
 BuildRoot: /var/tmp/samba
@@ -35,7 +35,7 @@ in Linux. Samba uses NetBIOS over TCP/IP (NetBT) protocols
 and does NOT need NetBEUI (Microsoft Raw NetBIOS frame)
 protocol.
 
-Samba-2 features an mostly working NT Domain Control
+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
@@ -61,8 +61,9 @@ server. Please use it with care. If you do not need it then do NOT
 install.
 
 %changelog
-* Mon Jul 17 2000 John H Terpstra <jht@turbolinux.com>
-- Start of Samba-3 packaging
+* Mon Oct 09 2000 John H Terpstra <jht@turbolinux.com>
+- Started move to Samba-2.2.0
+- Added nsswitch wins support
 
 * Mon May 29 2000 John H Terpstra <jht@turbolinux.com>
 - moved linkage of libnss_wins.so.2 to %post
@@ -149,28 +150,44 @@ install.
 
 * Sat Jan 24 1998 John H Terpstra <jht@samba.org>
  - Many optimisations (some suggested by Manoj Kasichainula <manojk@io.com>
-  - Use of chkconfig in place of individual symlinks to /etc/rc.d/init/smb
-  - Compounded make line
-  - Updated smb.init restart mechanism
-  - Use compound mkdir -p line instead of individual calls to mkdir
-  - Fixed smb.conf file path for log files
-  - Fixed smb.conf file path for incoming smb print spool directory
-  - Added a number of options to smb.conf file
-  - Added smbadduser command (missed from all previous RPMs) - Doooh!
-  - Added smbuser file and smb.conf file updates for username map
+ - Use of chkconfig in place of individual symlinks to /etc/rc.d/init/smb
+ - Compounded make line
+ - Updated smb.init restart mechanism
+ - Use compound mkdir -p line instead of individual calls to mkdir
+ - Fixed smb.conf file path for log files
+ - Fixed smb.conf file path for incoming smb print spool directory
+ - Added a number of options to smb.conf file
+ - Added smbadduser command (missed from all previous RPMs) - Doooh!
+ - Added smbuser file and smb.conf file updates for username map
 
 %prep
 %setup
 %patch -p1
 %patch1 -p1
-#%patch2 -p2
+%patch2 -p1
 
 %build
 cd source
 NUMCPU=`grep processor /proc/cpuinfo | wc -l`
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat --with-automount --with-quotas --with-smbmount --with-pam --with-profile --with-utmp --with-netatalk --with-sambabook=/usr/share/swat/using_samba
-#make -j${NUMCPU} all smbtorture rpctorture smbfilter debug2html nsswitch/libnss_wins.so
-make -j${NUMCPU} all smbtorture smbfilter debug2html nsswitch/libnss_wins.so masktest locktest locktest2 smbwrapper nsswitch/libnss_wins.so bin/smbw_sample
+CFLAGS="$RPM_OPT_FLAGS" ./configure \
+	--prefix=/usr \
+	--libdir=/etc \
+	--with-lockdir=/var/lock/samba \
+	--with-privatedir=/etc \
+	--with-swatdir=/usr/share/swat \
+	--with-quotas \
+	--with-smbmount \
+	--with-pam \
+	--with-profile \
+	--with-syslog \
+	--with-utmp \
+	--with-vfs \
+	--with-netatalk \
+	--with-sambabook=/usr/share/swat/using_samba
+make -j${NUMCPU} all
+make -j${NUMCPU} smbtorture smbfilter debug2html nsswitch/libnss_wins.so locktest2
+make -j${NUMCPU} masktest bin/smbspool smbwrapper bin/wbinfo
+#make -j${NUMCPU} rpctorture locktest
 
 
 %install
@@ -190,10 +207,9 @@ mkdir -p $RPM_BUILD_ROOT/var/log/samba
 mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 
 # Install standard binary files
-# At a later date add smbsh and smbwrapper.so back into line below
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-      make_smbcodepage make_unicodemap make_printerdef \
-      smbfilter smbsh smbspool smbw_sample smbwrapper.so
+      make_smbcodepage make_unicodemap make_printerdef rpcclient \
+      smbsh smbwrapper.so smbspool
 do
 install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/bin
 done
@@ -203,26 +219,19 @@ install -m755 source/script/$i $RPM_BUILD_ROOT/usr/bin
 done
 
 # Install secure binary files
-for i in smbd nmbd swat smbmount smbumount smbmnt debug2html smbtorture masktest \
-       locktest locktest2
+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/usr/sbin
 done
 
 # Install level 1 man pages
-for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1 \
-      make_smbcodepage.1 make_unicodemap.1 nmblookup.1 wbinfo.1
+# At a later date add back to line below: smbsh.1
+for i in *.1
 do
 install -m644 docs/manpages/$i $RPM_BUILD_ROOT/usr/share/man/man1
 done
 
-# Install level 8 man pages
-for i in nmbd.8 smbd.8 smbmnt.8 smbmount.8 smbpasswd.8 smbspool.8 \
-      smbumount.8 swat.8 winbindd.8
-do
-install -m644 docs/manpages/$i $RPM_BUILD_ROOT/usr/share/man/man8
-done
-
 # Install codepage source files
 for i in 437 737 775 850 852 861 866 932 936 949 950 1251
 do
@@ -275,6 +284,15 @@ install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5
 install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT/usr/share/man/man5
 install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT/usr/share/man/man5
 install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT/usr/share/man/man7
+install -m644 docs/manpages/smbd.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -m644 docs/manpages/nmbd.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -m644 docs/manpages/smbpasswd.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -m644 docs/manpages/smbmount.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -m644 docs/manpages/smbmnt.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -m644 docs/manpages/smbumount.8 $RPM_BUILD_ROOT/usr/share/man/man8
+# The mount.smb script has been obsoleted.
+# install -m644 packaging/PHT/TurboLinux/mount.smb $RPM_BUILD_ROOT/sbin
 install -m644 packaging/PHT/TurboLinux/smb.conf $RPM_BUILD_ROOT/etc/smb.conf
 install -m644 packaging/PHT/TurboLinux/smbusers $RPM_BUILD_ROOT/etc/smbusers
 install -m755 packaging/PHT/TurboLinux/smbprint $RPM_BUILD_ROOT/usr/bin
@@ -395,7 +413,7 @@ fi
 %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/rpcclient
 %attr(-,root,root) /usr/bin/testparm
 %attr(-,root,root) /usr/bin/testprns
 %attr(-,root,root) /usr/bin/findsmb
@@ -407,12 +425,11 @@ fi
 %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(-,root,root) /usr/bin/smbfilter
 %attr(-,root,root) /usr/bin/smbspool
+%attr(-,root,root) /usr/bin/smbadduser
 %attr(0755,root,root) /usr/bin/smbsh
 %attr(0755,root,root) /usr/bin/smbwrapper.so
-%attr(755,root,root) /lib/libnss_wins.so
+%attr(755,root,root) /lib/libnss_wins.s*
 %attr(-,root,root) /usr/share/swat/help/*
 %attr(-,root,root) /usr/share/swat/images/*
 %attr(-,root,root) /usr/share/swat/include/header.html
@@ -453,15 +470,16 @@ fi
 %attr(-,root,root) /usr/sbin/smbmount
 %attr(-,root,root) /usr/sbin/smbumount
 %attr(-,root,root) /usr/sbin/smbmnt
+#%attr(-,root,root) /sbin/mount.smb
 %attr(-,root,root) /usr/share/man/man8/smbmnt.8
 %attr(-,root,root) /usr/share/man/man8/smbmount.8
 %attr(-,root,root) /usr/share/man/man8/smbumount.8
 
 %files debugtools
 %attr(-,root,root) /usr/sbin/smbtorture
+#%attr(-,root,root) /usr/sbin/rpctorture
 %attr(-,root,root) /usr/sbin/smbfilter
 %attr(-,root,root) /usr/sbin/debug2html
-%attr(-,root,root) /usr/sbin/locktest
 %attr(-,root,root) /usr/sbin/locktest2
+%attr(-,root,root) /usr/sbin/wbinfo
 %attr(-,root,root) /usr/sbin/masktest
-%attr(-,root,root) /usr/sbin/smbw_sample