diff options
| -rw-r--r-- | packaging/Caldera/OpenLinux/makerpms.sh.tmpl | 4 | ||||
| -rw-r--r-- | packaging/Caldera/OpenLinux/samba2.spec.tmpl | 32 | ||||
| -rw-r--r-- | packaging/Mandrake/makerpms.sh.tmpl | 3 | ||||
| -rw-r--r-- | packaging/Mandrake/samba2.spec.tmpl | 27 |
4 files changed, 25 insertions, 41 deletions
diff --git a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl index fa4c1e1090e..40510354fbe 100644 --- a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl +++ b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl @@ -7,10 +7,10 @@ USERID=`id -u` GRPID=`id -g` if [ z$1 = "zdevel" ]; then - ( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba; mv samba samba-PVERSION; ls -al ) + ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba; mv samba samba-PVERSION ) ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION; mv samba-PVERSION samba ) else - ( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-PVERSION ) + ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba-PVERSION ) ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION ) fi diff --git a/packaging/Caldera/OpenLinux/samba2.spec.tmpl b/packaging/Caldera/OpenLinux/samba2.spec.tmpl index ebe501dcc24..9a309a7df7d 100644 --- a/packaging/Caldera/OpenLinux/samba2.spec.tmpl +++ b/packaging/Caldera/OpenLinux/samba2.spec.tmpl @@ -28,7 +28,7 @@ Requires : libpam >= 0.66, SysVinit-scripts >= 1.04-6 BuildRoot : /tmp/%{Name}-%{Version} -Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}-%{date}.tar.gz +Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz #Patch0: %{Name}-%{Version}-smbmount.patch #Patch1: %{Name}-%{Version}-install.patch #Patch2: %{Name}-%{Version}-smbconf.patch @@ -82,7 +82,7 @@ Maschinen ein. %Description -l es Samba dispone de un servidor SMB que puede utilizarse para proporcionar -servicios de red a clientes SMB (a veces conocido como "Lan Manager"), +servicios de red a clientes SMB (a veces conocido como "Lan Manager"), incluyendo varias versiones de MS Windows, OS/2 y otras máquinas Linux. %Description -l fr @@ -152,8 +152,8 @@ ficheiros de servidores SMB. %Description -n swat SWAT allows a Samba administrator to configure the complex smb.conf -file via a Web browser. It also provides links to all the configurable -options in the smb.conf file allowing an administrator to easily look +file via a Web browser. It also provides links to all the configurable +options in the smb.conf file allowing an administrator to easily look up the effects of any change. %Description -l de -n swat @@ -186,13 +186,8 @@ todas as opções configuraveis no smb.conf, permitindo a um admnistrador verificar rapidamente o efeite de qualquer alteração. -%Description debug -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. - - %Prep -%setup -n samba +%setup #%patch0 -p1 #%patch1 -p1 #%patch2 -p1 @@ -246,11 +241,10 @@ done for i in htmldocs/DOMAIN_MEMBER.html htmldocs/Samba-HOWTO-Collection.html \ htmldocs/samba-pdc-faq.html htmldocs/samba-pdc-howto.html \ htmldocs/smbclient.1.html htmldocs/smbd.8.html \ - docbook/projdoc/DOMAIN_MEMBER.sgml docbook/howto/DOMAIN_MEMBER.sgml \ + docbook/projdoc/DOMAIN_MEMBER.sgml htmldocs/DOMAIN_MEMBER.html \ docbook/faq/samba-pdc-faq.sgml docbook/howto/samba-pdc-howto.sgml \ docbook/manpages/smbclient.1.sgml docbook/manpages/smbd.8.sgml \ - docbook/projdoc/ENCRYPTION.sgml textdocs/samba-pdc-faq.txt \ - textdocs/samba-pdc-howto.txt manpages/smbclient.1 manpages/smbd.8 ; do + docbook/projdoc/ENCRYPTION.sgml manpages/smbclient.1 manpages/smbd.8 ; do %{fixUP} -vT docs/$i -e ' s:/usr/local/samba/private/FOREST.SLEEPY.SID:/var/lock/samba.d/FOREST.SLEEPY.SID: + s:/usr/local/samba/private:/usr/bin:g + @@ -264,9 +258,6 @@ done %{fixUP} -vT docs/htmldocs/samba-pdc-faq.html -e ' s:/usr/local/src:/usr/src:g ; ' -%{fixUP} -vT docs/textdocs/PRINTER_DRIVER.txt -e ' - s:/usr/local/samba/printer:/var/spool/samba:g ; -' # End of DirtyHack(TM) @@ -287,6 +278,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \ --without-smbwrapper \ --with-smbmount \ --with-pam \ + --with-pam_smbpass \ --with-netatalk \ --with-quotas \ --with-syslog \ @@ -294,8 +286,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \ make LOGFILEBASE=/var/log/samba.d all make LOGFILEBASE=/var/log/samba.d nsswitch -# debug package: -make LOGFILEBASE=/var/log/samba.d smbfilter debug2html +make LOGFILEBASE=/var/log/samba.d smbfilter debug2html make LOGFILEBASE=/var/log/samba.d bin/smbspool @@ -356,6 +347,9 @@ cp -p $VVS/README.home $DESTDIR/etc/skel/Samba/README.txt cp -p $VVS/README.Public $DESTDIR/%{LSBservedir}/Public/README.txt cp -p $VVS/README.profiles $DESTDIR/%{LSBservedir}/profiles/README.txt +# Add PAM smbpass facility +mv $DESTDIR/usr/bin/pam_smbpass.so $DESTDIR/lib/security + for f in testparm testprns; do ln -s $f $DESTDIR/usr/bin/smb$f ln -s $f.1 $DESTDIR/usr/man/man1/smb$f.1 @@ -486,4 +480,4 @@ lisa --inetd disable swat $1 %ChangeLog * Mon Jan 01 1997 ... -$Id: samba2.spec.tmpl,v 1.1.6.15 2001/04/15 00:33:29 jht Exp $ +$Id: samba2.spec.tmpl,v 1.1.6.16 2001/05/17 07:47:09 jht Exp $ diff --git a/packaging/Mandrake/makerpms.sh.tmpl b/packaging/Mandrake/makerpms.sh.tmpl index 3b13bcab64d..f55b0a86c93 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 ../../.. ; mv samba samba-$VERSION; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-$VERSION ) ( cd ../../.. ; tar --exclude-dir=CVS czvf ${SRCDIR}/samba-PVERSION.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/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl index 750b88e3925..b5ec6d5cbec 100644 --- a/packaging/Mandrake/samba2.spec.tmpl +++ b/packaging/Mandrake/samba2.spec.tmpl @@ -72,6 +72,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \ --with-quotas \ --with-smbmount \ --with-pam \ + --with-pam_smbpass \ --with-syslog \ --with-utmp \ --with-netatalk \ @@ -85,7 +86,7 @@ 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/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 @@ -102,7 +103,7 @@ for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \ do 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 done @@ -123,7 +124,7 @@ 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 @@ -139,6 +140,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; ) +# 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 @@ -219,25 +223,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 +249,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 |