diff options
Diffstat (limited to 'packaging/Mandrake')
| -rw-r--r-- | packaging/Mandrake/empty.patch | 0 | ||||
| -rw-r--r-- | packaging/Mandrake/makerpms.sh.tmpl | 5 | ||||
| -rw-r--r-- | packaging/Mandrake/samba.log | 4 | ||||
| -rw-r--r-- | packaging/Mandrake/samba2.spec.tmpl | 165 | ||||
| -rw-r--r-- | packaging/Mandrake/smb.conf | 13 | ||||
| -rwxr-xr-x | packaging/Mandrake/smb.init | 2 |
6 files changed, 96 insertions, 93 deletions
diff --git a/packaging/Mandrake/empty.patch b/packaging/Mandrake/empty.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packaging/Mandrake/empty.patch diff --git a/packaging/Mandrake/makerpms.sh.tmpl b/packaging/Mandrake/makerpms.sh.tmpl index 3b13bcab64..c4ad9c6b58 100644 --- a/packaging/Mandrake/makerpms.sh.tmpl +++ b/packaging/Mandrake/makerpms.sh.tmpl @@ -7,8 +7,9 @@ USERID=`id -u` GRPID=`id -g` VERSION='PVERSION' -( cd ../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-$VERSION ) -( cd ../../.. ; tar --exclude-dir=CVS czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-$VERSION ) +( cd ../../.. ; mv samba samba-$VERSION; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-$VERSION ) +( cd ../../.. ; tar --exclude=CVS -czvf ${SRCDIR}/samba-$VERSION.tar.gz samba-$VERSION ) +( cd ../../.. ; mv samba-$VERSION samba ) cp -a *.spec $SPECDIR cp -a *.patch smb.* samba.log $SRCDIR cd $SPECDIR diff --git a/packaging/Mandrake/samba.log b/packaging/Mandrake/samba.log index 4e8b44b60e..7dc1667baf 100644 --- a/packaging/Mandrake/samba.log +++ b/packaging/Mandrake/samba.log @@ -1,4 +1,4 @@ -/var/log/samba/log.nmb { +/var/log/samba/log.nmbd { notifempty missingok postrotate @@ -6,7 +6,7 @@ endscript } -/var/log/samba/log.smb { +/var/log/samba/log.smbd { notifempty missingok postrotate diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl index 750b88e392..5bc92535f8 100644 --- a/packaging/Mandrake/samba2.spec.tmpl +++ b/packaging/Mandrake/samba2.spec.tmpl @@ -5,7 +5,7 @@ Release: PRELEASE Copyright: GNU GPL version 2 Group: Networking Source: ftp://samba.org/pub/samba/samba-%{version}.tar.gz -Packager: John H Terpstra [Samba-Team] <jht@samba.org> +Packager: Gerald (Jerry) Carter [Samba-Team] <jerry@samba.org> Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2 Prereq: chkconfig fileutils BuildRoot: /var/tmp/samba @@ -39,6 +39,12 @@ Please read the smb.conf file and ENCRYPTION.txt in the docs directory for implementation details. %changelog +* Mon May 21 2001 Gerald (Jerry) Carter <jerry@samba.org> + - removed docs/htmldocs and docs/manpages from /usr/share/docs + These het installed in /usr/share/swat already + - Fix for codepages and src not getting installed in the RPM + - Fixed minor typos + * Mon Apr 23 2001 Gerald (Jerry) Carter <jerry@samba.org> - Added a few bug fixes to release the first Mandrake RPMS @@ -62,20 +68,22 @@ EXTRA="-D_LARGEFILE64_SOURCE" NUMCPU=`grep processor /proc/cpuinfo | wc -l` CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \ - --prefix=%{prefix} \ + --prefix=%{prefix} \ --with-fhs \ - --libdir=/etc \ + --libdir=/etc/samba \ --localstatedir=/var \ - --with-configdir=/etc \ - --with-lockdir=/var/lock/samba \ - --with-swatdir=%{prefix}/share/swat \ - --with-quotas \ - --with-smbmount \ - --with-pam \ - --with-syslog \ - --with-utmp \ - --with-netatalk \ - --with-sambabook=%{prefix}/share/swat/using_samba + --with-codepagedir=%{prefix}/share/samba/codepages \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/lock/samba \ + --with-swatdir=%{prefix}/share/swat \ + --with-quotas \ + --with-smbmount \ + --with-pam \ + --with-pam_smbpass \ + --with-syslog \ + --with-utmp \ + --with-netatalk \ + --with-sambabook=%{prefix}/share/swat/using_samba make -j${NUMCPU} proto make -j${NUMCPU} all smbfilter nsswitch/libnss_wins.so debug2html @@ -83,13 +91,15 @@ make -j${NUMCPU} all smbfilter nsswitch/libnss_wins.so debug2html %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba,xinetd.d,codepages/src} +mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba,xinetd.d} +mkdir -p $RPM_BUILD_ROOT/etc/samba/security mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -mkdir -p $RPM_BUILD_ROOT/lib +mkdir -p $RPM_BUILD_ROOT/lib/security mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin} mkdir -p $RPM_BUILD_ROOT/home/samba mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include} +mkdir -p $RPM_BUILD_ROOT%{prefix}/share/samba/codepages/src mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs} mkdir -p $RPM_BUILD_ROOT%{prefix}/share/man/{man1,man5,man7,man8} mkdir -p $RPM_BUILD_ROOT/var/lock/samba @@ -98,40 +108,32 @@ 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 + make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool \ + smbmount smbumount smbmnt do -install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin + install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin done -for i in smbtar +for i in smbtar do -install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin + 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 \ - smbfilter +for i in smbd nmbd swat debug2html smbfilter do -install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin + install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin done # 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 +ln -sf %{prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs +ln -sf %{prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb -# Install level 1 man pages -for i in *.1 -do -install -m644 docs/manpages/$i $RPM_BUILD_ROOT%{prefix}/share/man/man1 -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 +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%{prefix}/share/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 +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%{prefix}/share/samba/codepages/src done # Install the nsswitch library extenstion file @@ -139,40 +141,43 @@ 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; ) +# PAM Authentication file +install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security + # Install SWAT helper files -for i in swat/help/*.html docs/htmldocs/*.html -do -install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help +for i in swat/help/*.html docs/htmldocs/*.html; do + install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help done -for i in swat/images/*.gif -do -install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images +for i in swat/images/*.gif; do + install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images done -for i in swat/include/*.html -do -install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include +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 +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 +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 +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 install -m644 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat +# Install level 1 man pages +for i in *.1; do + install -m644 docs/manpages/$i $RPM_BUILD_ROOT%{prefix}/share/man/man1 +done install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT%{prefix}/share/man/man5 install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT%{prefix}/share/man/man5 install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT%{prefix}/share/man/man5 + install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT%{prefix}/share/man/man7 + install -m644 docs/manpages/smbd.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/nmbd.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/smbpasswd.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 @@ -180,9 +185,12 @@ 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 docs/manpages/smbspool.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 + install -m644 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat -install -m644 packaging/Mandrake/smb.con* $RPM_BUILD_ROOT/etc/ -install -m644 packaging/Mandrake/smbusers $RPM_BUILD_ROOT/etc/smbusers + +install -m644 packaging/Mandrake/smb.con* $RPM_BUILD_ROOT/etc/samba/ +install -m644 packaging/Mandrake/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers install -m755 packaging/Mandrake/smbprint $RPM_BUILD_ROOT%{prefix}/bin install -m755 packaging/Mandrake/findsmb $RPM_BUILD_ROOT%{prefix}/bin install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb @@ -190,11 +198,14 @@ install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba install -m644 packaging/Mandrake/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba install -m644 packaging/Mandrake/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba install -m644 packaging/Mandrake/samba.xinetd $RPM_BUILD_ROOT/etc/xinetd.d/swat -echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/lmhosts +echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts + +## +## remove these directories so they don't get installed twice +## +/bin/rm -rf docs/htmldocs +/bin/rm -rf docs/manpages -# Link smbmount to /sbin/mount.smb and /sbin/mount.smbfs -ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb -ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs %clean rm -rf $RPM_BUILD_ROOT @@ -204,14 +215,14 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig smb off # Build codepage load files -cd /etc +cd %{prefix}/share/samba/codepages 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 @@ -219,25 +230,14 @@ if !( grep ^[:space:]*swat /etc/services > /dev/null ) then echo 'swat 901/tcp # Add swat service used via inetd' >> /etc/services fi -# Add swat entry to /etc/inetd.conf if needed -if [ -f /etc/inetd.conf ]; then - if !( grep ^[:space:]*swat /etc/inetd.conf > /dev/null ) then - echo '#swat stream tcp nowait.400 root %{prefix}/sbin/swat swat' >> /etc/inetd.conf - killall -1 inetd || : - fi -fi - %preun if [ $1 = 0 ] ; then /sbin/chkconfig --del smb - # We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba! + # We want to remove the browse.dat file if [ -e /var/lock/samba/browse.dat ]; then rm -f /var/lock/samba/browse.dat fi - if [ -e /var/lock/samba/wins.dat ]; then - rm -f /var/lock/samba/wins.dat - fi fi %postun @@ -256,10 +256,6 @@ if [ $1 = 0 ] ; then # Remove swat entries from /etc/inetd.conf and /etc/services cd /etc tmpfile=/etc/tmp.$$ - if [ -f /etc/inetd.conf ]; then - sed -e '/^[:space:]*swat.*$/d' /etc/inetd.conf > $tmpfile - mv $tmpfile inetd.conf - fi sed -e '/^[:space:]*swat.*$/d' /etc/services > $tmpfile mv $tmpfile services fi @@ -283,9 +279,9 @@ fi %attr(-,root,root) %{prefix}/share/swat/images/* %attr(-,root,root) %{prefix}/share/swat/include/* %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) %config(noreplace) /etc/pam.d/samba @@ -293,8 +289,9 @@ fi %attr(-,root,root) %{prefix}/share/man/man5/* %attr(-,root,root) %{prefix}/share/man/man7/* %attr(-,root,root) %{prefix}/share/man/man8/* -%attr(-,root,root) %dir /etc/codepages/* -%attr(-,root,root) %dir /etc/codepages/src/* +%attr(-,root,root) %dir /etc/samba/ +%attr(-,root,root) %dir /usr/share/samba/codepages/* +%attr(-,root,root) %dir /usr/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 diff --git a/packaging/Mandrake/smb.conf b/packaging/Mandrake/smb.conf index db0528d8aa..a14e90ec16 100644 --- a/packaging/Mandrake/smb.conf +++ b/packaging/Mandrake/smb.conf @@ -79,7 +79,7 @@ # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation. # Do not enable this option unless you have read those documents ; encrypt passwords = yes -; smb passwd file = /etc/smbpasswd +; smb passwd file = /etc/samba/private/smbpasswd # The following are needed to allow password changing from Windows to # update the Linux sytsem password also. @@ -198,16 +198,21 @@ # Un-comment the following and create the netlogon directory for Domain Logons ; [netlogon] ; comment = Network Logon Service -; path = /home/samba/netlogon +; path = /var/lib/samba/netlogon ; guest ok = yes ; writable = no ; share modes = no +#Uncomment the following 2 lines if you would like your login scripts to +#be created dynamically by ntlogon (check that you have it in the correct +#locationn (the default of the ntlogon rpm available in contribs) +;root preexec = /usr/bin/ntlogon -u %U -g %G -o %a -d /var/lib/samba/netlogon +;root postexec = rm -f /var/lib/samba/netlogon/%U.bat # Un-comment the following to provide a specific roving profile share # the default is to use the user's home directory ;[Profiles] -; path = /home/samba/profiles +; path = /var/lib/samba/profiles ; browseable = no ; guest ok = yes @@ -222,7 +227,7 @@ [printers] comment = All Printers path = /var/spool/samba - browseable = yes + browseable = no # to allow user 'guest account' to print. guest ok = yes writable = no diff --git a/packaging/Mandrake/smb.init b/packaging/Mandrake/smb.init index 31b2deee57..8855f04efb 100755 --- a/packaging/Mandrake/smb.init +++ b/packaging/Mandrake/smb.init @@ -20,7 +20,7 @@ fi [ ${NETWORKING} = "no" ] && exit 0 # Check that smb.conf exists. -[ -f /etc/smb.conf ] || exit 0 +[ -f /etc/samba/smb.conf ] || exit 0 RETVAL=0 |