X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvsftpd.git;a=blobdiff_plain;f=vsftpd.spec;h=76dc55eb39d7b22909f5c51b4b63e28bb99c8168;hp=c27daa9d9a0f50d8bb0f7d7c122131fa64f7135c;hb=4100b22;hpb=7177ff83a4e910c2b0a640043759c74818e81f5a

diff --git a/vsftpd.spec b/vsftpd.spec
index c27daa9..76dc55e 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,16 +1,20 @@
+# TODO:
+# - default config does not work with inetd configuration
 #
+# Conditional build:
+%bcond_with	clamav	# ClamAV scanning support
+
 %define		_ftpdir	/home/services/ftp
-#
 Summary:	vsftpd - Very Secure FTP Daemon
-Summary(pl.UTF-8):   Bardzo Bezpieczny Demon FTP
-Summary(pt_BR.UTF-8):   vsftpd - Daemon FTP Muito Seguro
+Summary(pl.UTF-8):	Bardzo Bezpieczny Demon FTP
+Summary(pt_BR.UTF-8):	vsftpd - Daemon FTP Muito Seguro
 Name:		vsftpd
-Version:	2.0.5
+Version:	3.0.2
 Release:	2
 License:	GPL v2
 Group:		Daemons
-Source0:	ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
-# Source0-md5:	146062e8b2f93af43ff6c2c770feea94
+Source0:	https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
+# Source0-md5:	8b00c749719089401315bd3c44dddbb2
 Source1:	%{name}.inetd
 Source2:	%{name}.pamd
 Source3:	%{name}-ftpusers
@@ -19,30 +23,22 @@ Source4:	ftpusers.tar.bz2
 Source5:	%{name}.init
 Patch0:		%{name}-builddefs.patch
 Patch1:		%{name}-amd64-findlibs.patch
-URL:		http://vsftpd.beasts.org/
+Patch2:		%{name}-clamav.patch
+Patch3:		%{name}-switch_sha256_to_sha1.patch
+Patch4:		%{name}-findlibs-egrep.patch
+URL:		https://security.appspot.com/vsftpd.html
 BuildRequires:	libcap-devel
 BuildRequires:	libwrap-devel
+%if "%{pld_release}" == "ac"
 BuildRequires:	openssl-devel >= 0.9.7d
+%else
+BuildRequires:	openssl-devel >= 0.9.8
+%endif
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{name}-init = %{version}-%{release}
 Requires:	filesystem >= 3.0-11
 Requires:	pam >= 0.77.3
 Provides:	ftpserver
-Obsoletes:	anonftp
-Obsoletes:	bftpd
-Obsoletes:	ftpd-BSD
-Obsoletes:	ftpserver
-Obsoletes:	glftpd
-Obsoletes:	heimdal-ftpd
-Obsoletes:	linux-ftpd
-Obsoletes:	muddleftpd
-Obsoletes:	proftpd
-Obsoletes:	proftpd-common
-Obsoletes:	proftpd-inetd
-Obsoletes:	proftpd-standalone
-Obsoletes:	pure-ftpd
-Obsoletes:	troll-ftpd
-Obsoletes:	wu-ftpd
 Conflicts:	man-pages < 1.51
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,8 +56,8 @@ Man Security Audit Team" Evans.
 
 %package inetd
 Summary:	vsftpd - Very Secure FTP Daemon
-Summary(pl.UTF-8):   Bardzo Bezpieczny Demon FTP
-Summary(pt_BR.UTF-8):   vsftpd - Daemon FTP Muito Seguro
+Summary(pl.UTF-8):	Bardzo Bezpieczny Demon FTP
+Summary(pt_BR.UTF-8):	vsftpd - Daemon FTP Muito Seguro
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	rc-inetd
@@ -77,8 +73,8 @@ Ten pakiet pozwala na wystartowanie vsftpd jako usługi inetd.
 
 %package standalone
 Summary:	vsftpd - Very Secure FTP Daemon
-Summary(pl.UTF-8):   Bardzo Bezpieczny Demon FTP
-Summary(pt_BR.UTF-8):   vsftpd - Daemon FTP Muito Seguro
+Summary(pl.UTF-8):	Bardzo Bezpieczny Demon FTP
+Summary(pt_BR.UTF-8):	vsftpd - Daemon FTP Muito Seguro
 Group:		Networking/Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
@@ -97,6 +93,13 @@ Ten pakiet pozwala na wystartowanie vsftpd jako samodzielnego demona.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if %{with clamav}
+%patch2 -p1
+%endif
+%if "%{pld_release}" == "ac"
+%patch3 -p1
+%endif
+%patch4 -p1
 
 %build
 %{__make} \
@@ -110,21 +113,21 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8}} \
 	$RPM_BUILD_ROOT/etc/{pam.d,sysconfig/rc-inetd,logrotate.d,ftpd,rc.d/init.d} \
 	$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 RedHat/vsftpd.log $RPM_BUILD_ROOT/etc/logrotate.d/vsftpd
+install -p vsftpd $RPM_BUILD_ROOT%{_sbindir}/vsftpd
+cp -p vsftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd.conf
+cp -p vsftpd.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/vsftpd.conf.5
+cp -p vsftpd.8 $RPM_BUILD_ROOT%{_mandir}/man8/vsftpd.8
+cp -p RedHat/vsftpd.log $RPM_BUILD_ROOT/etc/logrotate.d/vsftpd
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/vsftpd
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/ftp
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ftpd/ftpusers
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/vsftpd
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/vsftpd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/ftp
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ftpd/ftpusers
+install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vsftpd
 
 > $RPM_BUILD_ROOT/var/log/vsftpd.log
 
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT/usr/share/man/ftpusers-path.diff
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff
 
 %clean
 rm -rf $RPM_BUILD_ROOT