- updated to 2.0.1.

[packages/vsftpd.git] / vsftpd.spec

diff --git a/vsftpd.spec b/vsftpd.spec
index c5f67f6f519a7eddd0ad7f7ec394f6378eec7be7..aef658430726dffec8dd7e9893ff2e5282f16ee1 100644 (file)
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,25 +1,36 @@
+#
+%define                _ftpdir /home/services/ftp
+#
 Summary:       vsftpd - Very Secure FTP Daemon
 Summary(pl):   Bardzo Bezpieczny Demon FTP
 Summary(pt_BR):        vsftpd - Daemon Ftp Muito Seguro
 Name:          vsftpd
-Version:       1.0.1
-Release:       4
+Version:       2.0.1
+Release:       1
 License:       GPL v2
 Group:         Daemons
-Source0:       ftp://ferret.lmh.ox.ac.uk/pub/linux/vsftpd/%{name}-%{version}.tar.gz
+Source0:       ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
+# Source0-md5: 63838791ec8b1375ed154fb2603e52e9
 Source1:       %{name}.inetd
 Source2:       %{name}.pamd
 Source3:       %{name}-ftpusers
 Source4:       ftpusers.tar.bz2
+# Source4-md5: 76c80b6ec9f4d079a1e27316edddbe16
+Patch0:                %{name}-builddefs.patch
+Patch1:                %{name}-amd64-findlibs.patch
 URL:           http://vsftpd.beasts.org/
 PreReq:                rc-inetd
-Requires:      FHS >= 2.1-24
+BuildRequires: libcap-devel
+BuildRequires: libwrap-devel
+BuildRequires: openssl-devel >= 0.9.7d
+Requires:      FHS >= 2.3
+Requires:      pam >= 0.77.3
 Provides:      ftpserver
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     ftpserver
 Obsoletes:     anonftp
 Obsoletes:     bftpd
 Obsoletes:     ftpd-BSD
+Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
@@ -31,6 +42,7 @@ Obsoletes:    pure-ftpd
 Obsoletes:     troll-ftpd
 Obsoletes:     wu-ftpd
 Conflicts:     man-pages < 1.51
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A Very Secure FTP Daemon - written from scratch - by Chris "One Man
@@ -45,7 +57,9 @@ A Very Secure FTP Daemon (vsftpd) - escrito do zero - por Chris "One
 Man Security Audit Team" Evans.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
@@ -57,12 +71,12 @@ Man Security Audit Team" Evans.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_datadir}/empty,%{_mandir}/man{5,8}} \
        $RPM_BUILD_ROOT/etc/{pam.d,sysconfig/rc-inetd,logrotate.d,ftpd} \
-       $RPM_BUILD_ROOT{/home/ftp/pub/Incoming,/var/log}
+       $RPM_BUILD_ROOT{%{_ftpdir}/pub/incoming,/var/log}
 
 install vsftpd $RPM_BUILD_ROOT%{_sbindir}/vsftpd
 install vsftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd.conf
-install vsftpd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/vsftpd.conf.5
-install vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/vsftpd.8
+install vsftpd.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/vsftpd.conf.5
+install vsftpd.8 $RPM_BUILD_ROOT%{_mandir}/man8/vsftpd.8
 install RedHat/vsftpd.log $RPM_BUILD_ROOT/etc/logrotate.d/vsftpd
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/vsftpd
@@ -92,8 +106,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUDIT BENCHMARKS BUGS Changelog FAQ README REWARD SIZE SPEED TODO TUNING
-%doc SECURITY
+%doc AUDIT BENCHMARKS BUGS Changelog FAQ README REWARD SIZE SPEED TODO TUNING EXAMPLE SECURITY
 %attr(755,root,root) %{_sbindir}/vsftpd
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vsftpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ftpd/ftpusers
@@ -108,7 +121,7 @@ fi
 %lang(pl) %{_mandir}/pl/man5/ftpusers*
 %lang(pt_BR) %{_mandir}/pt_BR/man5/ftpusers*
 %lang(ru) %{_mandir}/ru/man5/ftpusers*
-%dir /home/ftp
-%dir /home/ftp/pub
+%dir %{_ftpdir}
+%dir %{_ftpdir}/pub
 # it's safe - by default anon_upload_enable=NO, anon_world_readable_only=YES
-%attr(775,root,ftp) %dir /home/ftp/pub/Incoming
+%attr(775,root,ftp) %dir %{_ftpdir}/pub/incoming