pure-ftpd is now standalone with external config file

Changed files:
    pure-ftpd.spec -> 1.35

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 0805434950b808c15018895a38e752cf3609becf..a700662eb276bf28ef33583be23390cc59a69672 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -1,15 +1,18 @@
+# _with_mysql - enables MySQL auth but disables PAM auth
 Summary:       Small, fast and secure FTP server
 Summary(pl):   Ma³y, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd
-Version:       0.99.1
+Version:       0.99.1b
 Release:       1
 License:       GPL
 Group:         Daemons
+Group(de):     Server
 Group(pl):     Serwery
 Source0:       http://prdownloads.sourceforge.net/pureftpd/%{name}-%{version}.tar.gz
-Source1:       pure-ftpd.pamd
-Source2:       pure-ftpd.rc-inetd
+Source1:       %{name}.pamd
+Source2:       %{name}.init
 URL:           http://www.pureftpd.org/
+%{?_with_mysql:BuildRequires:  mysql-devel}
 BuildRequires: libcap-devel
 BuildRequires: pam-devel
 BuildRequires: automake
@@ -29,21 +32,23 @@ Obsoletes:  troll-ftpd
 Obsoletes:     wu-ftpd
 
 %description
-Pure-FTPd is a fast, production-quality, standard-comformant FTP server,
-based upon Troll-FTPd. Unlike other popular FTP servers, it has no known
-security flaw, it is really trivial to set up and it is especially designed
-for modern Linux kernels (setfsuid, sendfile, capabilities) . Features
-include PAM support, IPv6, chroot()ed home directories, virtual domains,
-built-in LS, anti-warez system, bounded ports for passive downloads...
+Pure-FTPd is a fast, production-quality, standard-comformant FTP
+server, based upon Troll-FTPd. Unlike other popular FTP servers, it
+has no known security flaw, it is really trivial to set up and it is
+especially designed for modern Linux kernels (setfsuid, sendfile,
+capabilities) . Features include PAM support, IPv6, chroot()ed home
+directories, virtual domains, built-in LS, anti-warez system, bounded
+ports for passive downloads...
 
 %description -l pl
-Pure-FTPD to szybki, wysokiej jako¶ci, odpowiadaj±cy standardom serwer FTP
-bazuj±cy na Troll-FTPd. W przeciwieñstwie do innych serwerów FTP nie
-ma znanych luk w bezpieczeñstwie. Ponadto jest trywialny w konfiguracji
-i specjalnie zaprojektowany dla nowych kerneli Linuxa (setfsuid, sendfile,
-capabilibies). Mo¿liwo¶ci to wsparcie dla PAMa, IPv6, chroot()owanych
-katalogów domowych, virtualne domeny, wbudowany LS, system anty-warezowy,
-ograniczanie portów dla pasywnych po³±czeñ...
+Pure-FTPD to szybki, wysokiej jako¶ci, odpowiadaj±cy standardom serwer
+FTP bazuj±cy na Troll-FTPd. W przeciwieñstwie do innych serwerów FTP
+nie ma znanych luk w bezpieczeñstwie. Ponadto jest trywialny w
+konfiguracji i specjalnie zaprojektowany dla nowych kerneli Linuxa
+(setfsuid, sendfile, capabilibies). Mo¿liwo¶ci to wsparcie dla PAMa,
+IPv6, chroot()owanych katalogów domowych, virtualne domeny, wbudowany
+LS, system anty-warezowy, ograniczanie portów dla pasywnych
+po³±czeñ...
 
 %prep
 %setup -q
@@ -53,54 +58,61 @@ aclocal
 autoconf
 automake -a -c
 %configure \
+       %{?_with_mysql:CPPFLAGS="-I%{_includedir}/mysql" --with-mysql} \
+       --with-altlog \
+       %{?!_with_mysql:--with-pam} \
        --with-cookie \
-       --with-pam \
        --with-throttling \
        --with-ratios \
        --with-ftpwho \
        --with-largefile \
        --with-uploadscript \
+       --with-virtualhosts \
        --with-language=english
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,sysconfig/rc-inetd,ftpd/vhosts,security}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,sysconfig,ftpd/vhosts,security,rc.d/init.d}
 install -d $RPM_BUILD_ROOT/home/ftp/Incoming
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pure-ftpd
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rc-inetd/ftpd
-
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
+install contrib/redhat.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/ftpd/pureftpd.conf
+install pureftpd-mysql.conf     $RPM_BUILD_ROOT%{_sysconfdir}/ftpd/pureftpd-mysql.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/security/blacklist.ftp
 
-gzip -9nf README
+gzip -9nf README* AUTHORS ChangeLog HISTORY NEWS THANKS
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       %{_sysconfdir}/rc.d/init.d/rc-inetd restart 1>&2
+/sbin/chkconfig --add %{name}
+if [ -f %{_var}/lock/subsys/%{name} ]; then
+        %{_sysconfdir}/rc.d/init.d/%{name} restart 1>&2
 else
-       echo "Type \"%{_sysconfdir}/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
+        echo "Run \"%{_sysconfdir}/rc.d/init.d/%{name} start\" to start PureFTPD daemon."
 fi
 
-%postun
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-       %{_sysconfdir}/rc.d/init.d/rc-inetd restart
+%preun
+if [ "$1" = "0" -a -f %{_var}/lock/subsys/%{name} ]; then
+        %{_sysconfdir}/rc.d/init.d/%{name} stop 1>&2
 fi
+/sbin/chkconfig --del %{name}
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc *.gz pure*.conf
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,root) %dir %{_sysconfdir}/ftpd
 %dir %{_sysconfdir}/ftpd/vhosts
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pam.d/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/rc-inetd/ftpd
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/security/blacklist.ftp
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ftpd/pureftpd.conf
+%{?_with_mysql:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ftpd/pureftpd-mysql.conf}
+%{?!_with_mysql:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pam.d/*}
+%{?!_with_mysql:%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/security/blacklist.ftp}
 %dir /home/ftp
 %attr(755,ftp,ftp) %dir /home/ftp/Incoming
-
 %{_mandir}/man?/*