From a25f6694d230fe384c212350dacf17bfae3ab79d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 1 Jun 2001 12:33:16 +0000 Subject: final sync with SAMBA_2_2 --- packaging/PHT/TurboLinux/makefile-path.patch | 12 ---- packaging/PHT/TurboLinux/samba.pamd | 13 +++- packaging/PHT/TurboLinux/samba2.spec.tmpl | 102 ++++++++++++--------------- 3 files changed, 58 insertions(+), 69 deletions(-) delete mode 100644 packaging/PHT/TurboLinux/makefile-path.patch (limited to 'packaging/PHT') diff --git a/packaging/PHT/TurboLinux/makefile-path.patch b/packaging/PHT/TurboLinux/makefile-path.patch deleted file mode 100644 index 88d5222e09a..00000000000 --- a/packaging/PHT/TurboLinux/makefile-path.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 = @sbindir@ - LIBDIR = @libdir@ --VARDIR = @localstatedir@ -+VARDIR = /var/log/samba - MANDIR = @mandir@ diff --git a/packaging/PHT/TurboLinux/samba.pamd b/packaging/PHT/TurboLinux/samba.pamd index f38e70184af..225ab724ec9 100644 --- a/packaging/PHT/TurboLinux/samba.pamd +++ b/packaging/PHT/TurboLinux/samba.pamd @@ -1,2 +1,11 @@ -auth required /lib/security/pam_pwdb.so nullok shadow -account required /lib/security/pam_pwdb.so +#%PAM-1.0 +#[For version 1.0 syntax, the above header is optional] +# +# The PAM configuration file for the `samba' service +# +auth required /lib/security/pam_pwdb.so nullok nodelay # shadow audit +# auth required /lib/security/pam_smbpass.so nodelay +account required /lib/security/pam_pwdb.so audit nodelay +session required /lib/security/pam_pwdb.so nodelay +password required /lib/security/pam_pwdb.so # shadow md5 +#password required /lib/security/pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl index 668dddb0f6f..0633f62a7e7 100644 --- a/packaging/PHT/TurboLinux/samba2.spec.tmpl +++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl @@ -5,8 +5,7 @@ Release: PRELEASE Copyright: GNU GPL version 2 Group: Networking Source: ftp://samba.org/pub/samba/samba-PVERSION.tar.gz -Patch: makefile-path.patch -Patch1: smbw.patch +Patch: smbw.patch Requires: pam >= 0.64 kernel >= 2.2.1 glibc >= 2.1.2 Prereq: chkconfig fileutils BuildRoot: /var/tmp/samba @@ -69,12 +68,10 @@ http://samba.org/samba for this interesting program suite and lots of more information on SMB and NetBIOS over TCP/IP. There you also find explanation for conceps like NetBIOS name or share. -%description debugtools -This package contains programs that can be used to crash test any SMB -server. Please use it with care. If you do not need it then do NOT -install. - %changelog +* Tue Mar 27 2001 John H Terpstra +- Fixes to make 2.2 compile + * Sat Nov 04 2000 John H Terpstra - Put Symlink for libnss_wins.so back into main install section @@ -183,7 +180,6 @@ install. %prep %setup %patch -p1 -%patch1 -p1 %build @@ -191,38 +187,36 @@ cd source %ifarch ia64 libtoolize --copy --force # get it to recognize IA-64 -autoconf -autoheader -EXTRA="-D_LARGEFILE64_SOURCE" %endif +autoconf +autoheader NUMCPU=`grep processor /proc/cpuinfo | wc -l` CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \ --prefix=%{prefix} \ - --libdir=/etc \ + --libdir=/etc/samba \ --with-lockdir=/var/lock/samba \ --with-privatedir=/etc \ --with-swatdir=%{prefix}/share/swat \ --with-quotas \ --with-smbmount \ --with-pam \ + --with-pam_smbpass \ --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 +make -j${NUMCPU} debug2html %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/etc/codepages/src +mkdir -p $RPM_BUILD_ROOT%{prefix}/share/samba/codepages/src +mkdir -p $RPM_BUILD_ROOT/etc/samba 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 @@ -238,19 +232,16 @@ mkdir -p $RPM_BUILD_ROOT/var/spool/samba # Install standard binary files 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 -for i in addtosmbpass mksmbpasswd.sh smbtar +for i in mksmbpasswd.sh smbtar do install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin done # Install secure binary files -for i in smbd nmbd swat smbmount smbumount smbmnt debug2html \ - smbtorture smbfilter locktest2 masktest -# wbinfo +for i in smbd nmbd swat smbmount smbumount smbmnt debug2html smbfilter do install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/sbin done @@ -265,11 +256,11 @@ done # Install codepage source files 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 +install -m644 source/codepages/codepage_def.$i $RPM_BUILD_ROOT%{prefix}/samba/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 +install -m644 source/codepages/CP$i.TXT $RPM_BUILD_ROO%{prefix}/samba/codepages/src done # Install the nsswitch library extension file @@ -277,6 +268,9 @@ 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 PAM pam_smbpass.so +install -m644 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security + # Install SWAT helper files for i in swat/help/*.html docs/htmldocs/*.html do @@ -318,11 +312,10 @@ install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/smbmount.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/smbmnt.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/smbumount.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 -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 -m644 packaging/PHT/TurboLinux/smb.conf $RPM_BUILD_ROOT/etc/samba/smb.conf +install -m644 packaging/PHT/TurboLinux/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers install -m755 packaging/PHT/TurboLinux/smbprint $RPM_BUILD_ROOT%{prefix}/bin install -m755 packaging/PHT/TurboLinux/findsmb $RPM_BUILD_ROOT%{prefix}/bin -install -m755 packaging/PHT/TurboLinux/smbadduser $RPM_BUILD_ROOT%{prefix}/bin install -m755 packaging/PHT/TurboLinux/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb install -m755 packaging/PHT/TurboLinux/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba install -m644 packaging/PHT/TurboLinux/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba @@ -341,14 +334,14 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig smb off # Build codepage load files -cd /etc +cd %{prefix}/share/samba for i in 437 737 775 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 +%{prefix}/bin/make_smbcodepage c $i %{prefix}/share/samba/codepages/src/codepage_def.$i %{prefix}/share/samba/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 +%{prefix}/bin/make_unicodemap $i %{prefix}/share/samba/codepages/src/CP$i.TXT %{prefix}/share/samba/codepages/unicode_map.$i done # Add swat entry to /etc/services if not already there @@ -373,8 +366,8 @@ fi if [ $1 = 0 ] ; then /sbin/chkconfig --del smb - for n in /etc/codepages/*; do - if [ $n != /etc/codepages/src ]; then + for n in %{prefix}/share/samba/codepages/*; do + if [ $n != %{prefix}/share/samba/codepages/src ]; then rm -rf $n fi done @@ -396,8 +389,18 @@ if [ $1 = 0 ] ; then if [ -e /var/log/samba ]; then rm -rf /var/log/samba fi - if [ -e /var/lock/samba ]; then - rm -rf /var/lock/samba + +# Note: We MUST keep: +# winbindd_*, sshare_info*, printing*, ntdrivers* + + if [ -x /var/lock/samba ]; then + rm -f /var/lock/samba/browse.dat + rm -f /var/lock/samba/{brlock,connections,locking,messages}.tdb + if [ -e /var/lock/samba.d/namelist.debug ]; then + rm -f /var/lock/samba.d/namelist.debug + fi + rm -f /var/lock/samba/unexpected.tdb + rm -f /var/lock/samba/{smbd,nmbd}.pid fi # Remove swat entries from /etc/inetd.conf and /etc/services @@ -431,9 +434,8 @@ fi %attr(-,root,root) %{prefix}/sbin/smbd %attr(-,root,root) %{prefix}/sbin/nmbd %attr(-,root,root) %{prefix}/sbin/swat +%attr(-,root,root) %{prefix}/sbin/debug2html %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/rpcclient %attr(-,root,root) %{prefix}/bin/testparm @@ -449,22 +451,21 @@ fi %attr(-,root,root) %{prefix}/bin/smbprint %attr(-,root,root) %{prefix}/bin/smbspool %attr(-,root,root) %{prefix}/bin/smbadduser -# %attr(0755,root,root) %{prefix}/bin/smbsh -# %attr(0755,root,root) %{prefix}/bin/smbwrapper.so %attr(755,root,root) /lib/libnss_wins.s* +%attr(755,root,root) /lib/security/pam_smbpass.so %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) %config(noreplace) /etc/samba/lmhosts +%attr(-,root,root) %config(noreplace) /etc/samba/smb.conf +%attr(-,root,root) %config(noreplace) /etc/samba/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.* -%attr(-,root,root) /etc/codepages/src/CP* +%attr(-,root,root) %{prefix}/share/samba/codepages/src/codepage_def.* +%attr(-,root,root) %{prefix}/share/samba/codepages/src/CP* # %attr(-,root,root) %{prefix}/share/man/man1/smbsh.1 %attr(-,root,root) %{prefix}/share/man/man1/make_smbcodepage.1 %attr(-,root,root) %{prefix}/share/man/man1/make_unicodemap.1 @@ -484,8 +485,8 @@ fi %attr(-,root,root) %{prefix}/share/man/man8/smbpasswd.8 %attr(-,root,root) %{prefix}/share/man/man8/swat.8 %attr(-,root,nobody) %dir /home/samba -%attr(-,root,root) %dir /etc/codepages -%attr(-,root,root) %dir /etc/codepages/src +%attr(-,root,root) %dir %{prefix}/share/samba/codepages +%attr(-,root,root) %dir %{prefix}/share/samba/codepages/src %attr(-,root,root) %dir /var/lock/samba %attr(-,root,root) %dir /var/log/samba %attr(1777,root,root) %dir /var/spool/samba @@ -499,12 +500,3 @@ fi %attr(-,root,root) %{prefix}/share/man/man8/smbmnt.8 %attr(-,root,root) %{prefix}/share/man/man8/smbmount.8 %attr(-,root,root) %{prefix}/share/man/man8/smbumount.8 - -%files debugtools -%attr(-,root,root) %{prefix}/sbin/smbtorture -#%attr(-,root,root) %{prefix}/sbin/rpctorture -%attr(-,root,root) %{prefix}/sbin/smbfilter -%attr(-,root,root) %{prefix}/sbin/debug2html -%attr(-,root,root) %{prefix}/sbin/locktest2 -#%attr(-,root,root) %{prefix}/sbin/wbinfo -%attr(-,root,root) %{prefix}/sbin/masktest -- cgit