From 8a2a1ff6280d072cb83fd8268866703a962b288c Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Sun, 30 Jul 2000 06:37:46 +0000 Subject: Updating for Samba-3. (This used to be commit 183d55b2ae38305f68ca677f6d413a54bd122394) --- packaging/PHT/TurboLinux/samba2.spec.tmpl | 176 ++++++++++++++++++------------ 1 file changed, 108 insertions(+), 68 deletions(-) (limited to 'packaging') diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl index ea246364db..257159b759 100644 --- a/packaging/PHT/TurboLinux/samba2.spec.tmpl +++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl @@ -7,6 +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 Requires: pam >= 0.64 kernel >= 2.2.1 glibc >= 2.1.2 Prereq: chkconfig fileutils BuildRoot: /var/tmp/samba @@ -34,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 almost working NT Domain Control +Samba-2 features an mostly 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 @@ -48,7 +49,7 @@ docs directory for implementation details. NOTE: TurboLinux uses PAM which has integrated support for Shadow passwords. Do NOT recompile with the SHADOW_PWD option -enabled. PHT TurboLinux has built in support for quotas in PAM. +enabled. TurboLinux has built in support for quotas in PAM. %description -n smbfs This package includes the tools necessary to mount filesystems from @@ -60,6 +61,28 @@ server. Please use it with care. If you do not need it then do NOT install. %changelog +* Mon Jul 17 2000 John H Terpstra +- Start of Samba-3 packaging + +* Mon May 29 2000 John H Terpstra +- moved linkage of libnss_wins.so.2 to %post +- added removal step to %postun + +* Fri Apr 14 2000 John H Terpstra +- Added unicode pages + +* Sat Apr 08 2000 John H Terpsta +- Added nsswitch stuff +- Fixed some typos +- Changed hard link for smbmount to symlink + +* Sun Apr 02 2000 John H Terpstra +- Updated for samba-2.0.7 +- Added codepages 775 1251 +- Added configure options "--with-profile --with-utmp + --with-netatalk --with-sambabook=/usr/share/swat/using_samba" +- added using_samba book + * Fri Oct 29 1999 Kelley Spoon - get rid of the rc?.d directories - -j flags for make command to (hopefully) speed up on @@ -140,13 +163,14 @@ install. %setup %patch -p1 %patch1 -p1 +#%patch2 -p2 %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-smbwrapper --with-automount --with-quotas --with-smbmount --with-pam -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 -make -j${NUMCPU} all smbtorture rpctorture smbfilter debug2html # smbwrapper +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 %install @@ -155,8 +179,10 @@ mkdir -p $RPM_BUILD_ROOT/sbin 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 +mkdir -p $RPM_BUILD_ROOT/lib mkdir -p $RPM_BUILD_ROOT/home/samba mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin} +mkdir -p $RPM_BUILD_ROOT/usr/share/swat/using_samba/{gifs,figs} mkdir -p $RPM_BUILD_ROOT/usr/share/swat/{images,help,include} mkdir -p $RPM_BUILD_ROOT/usr/share/man/{man1,man5,man7,man8} mkdir -p $RPM_BUILD_ROOT/var/lock/samba @@ -166,7 +192,8 @@ 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_printerdef rpcclient + make_smbcodepage make_unicodemap make_printerdef \ + smbfilter smbsh smbspool smbw_sample smbwrapper.so do install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/bin done @@ -176,28 +203,46 @@ 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 rpctorture smbtorture smbfilter +for i in smbd nmbd swat smbmount smbumount smbmnt debug2html smbtorture masktest \ + locktest locktest2 do install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/sbin done -# Now link smbmount to mount.smb -ln $RPM_BUILD_ROOT/usr/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb # Install level 1 man pages -# At a later date add back to line below: smbsh.1 -for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1 make_smbcodepage.1 nmblookup.1 +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 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 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 # Install SWAT helper files -for i in swat/help/*.html docs/htmldocs/*.html +for i in swat/help/*.html +do +cat $i | sed 's/@BOOKDIR@//' > $RPM_BUILD_ROOT/usr/share/$i +chmod 644 $RPM_BUILD_ROOT/usr/share/$i +done +for i in docs/htmldocs/*.html do install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/help done @@ -210,21 +255,26 @@ do install -m644 $i $RPM_BUILD_ROOT/usr/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/usr/share/swat/using_samba +done +for i in docs/htmldocs/using_samba/figs/*.gif +do +install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/using_samba/figs +done +for i in docs/htmldocs/using_samba/gifs/*.gif +do +install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/using_samba/gifs +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/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 @@ -243,11 +293,21 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --add smb /sbin/chkconfig smb off +# Link smbmount to /sbin/mount.smb +if [ ! -f /sbin/mount.smb ]; then + ln -s /usr/sbin/smbmount /sbin/mount.smb +fi + # Build codepage load files -for i in 437 737 850 852 861 866 932 936 949 950 +cd /etc +for i in 437 737 775 850 852 861 866 932 936 949 950 1251 do /usr/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 +/usr/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 @@ -256,7 +316,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 /usr/sbin/swat swat' >> /etc/inetd.conf killall -1 inetd || : fi @@ -265,6 +325,8 @@ if [ -f /etc/xinetd.conf ]; then mv /etc/xinetd.conf /etc/xinetd.conf.presamba /usr/sbin/itox --daemon_dir /usr/sbin < /etc/inetd.conf > /etc/xinetd.conf fi +# Make link for wins resolver +ln -s /lib/libnss_wins.so /lib/libnss_wins.so.2 %preun if [ $1 = 0 ] ; then @@ -309,6 +371,10 @@ if [ $1 = 0 ] ; then mv /etc/xinetd.conf /etc/xinetd.conf.samba /usr/sbin/itox --daemon_dir /usr/sbin < /etc/inetd.conf > /etc/xinetd.conf fi +if [ -f /sbin/mount.smb ]; then + rm -f /sbin/mount.smb +fi +rm -f /lib/libnss_wins.so.2 %triggerpostun -- samba < samba-2.0.0 if [ $0 != 0 ]; then @@ -329,71 +395,44 @@ 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 %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_unicodemap %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/smbsh.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/bin/smbfilter +%attr(-,root,root) /usr/bin/smbspool +%attr(0755,root,root) /usr/bin/smbsh +%attr(0755,root,root) /usr/bin/smbwrapper.so +%attr(755,root,root) /lib/libnss_wins.so +%attr(-,root,root) /usr/share/swat/help/* +%attr(-,root,root) /usr/share/swat/images/* %attr(-,root,root) /usr/share/swat/include/header.html %attr(-,root,root) /usr/share/swat/include/footer.html +%attr(-,root,root) /usr/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) /etc/codepages/src/codepage_def.* +%attr(-,root,root) /etc/codepages/src/CP* %attr(-,root,root) /usr/share/man/man1/smbstatus.1 %attr(-,root,root) /usr/share/man/man1/nmblookup.1 %attr(-,root,root) /usr/share/man/man1/smbclient.1 %attr(-,root,root) /usr/share/man/man1/make_smbcodepage.1 +%attr(-,root,root) /usr/share/man/man1/make_unicodemap.1 %attr(-,root,root) /usr/share/man/man1/smbrun.1 -# %attr(-,root,root) /usr/share/man/man1/smbsh.1 +%attr(-,root,root) /usr/share/man/man1/smbsh.1 %attr(-,root,root) /usr/share/man/man1/smbtar.1 %attr(-,root,root) /usr/share/man/man1/testparm.1 %attr(-,root,root) /usr/share/man/man1/testprns.1 @@ -414,14 +453,15 @@ 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/masktest +%attr(-,root,root) /usr/sbin/smbw_sample -- cgit