X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvsftpd.git;a=blobdiff_plain;f=vsftpd.spec;h=8ea1256f15db271335c5396931a4a5b3b59b2e50;hp=56e6aad788d77179dca218be1c43258a12a2ba15;hb=f114556;hpb=d0d48041c44e4833c57743023f8323897eef532f

diff --git a/vsftpd.spec b/vsftpd.spec
index 56e6aad..8ea1256 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,16 +1,21 @@
+### TODO:
+# - fix ssl build on AC
+# - default config does not work with inetd configuration
 #
 %define		_ftpdir	/home/services/ftp
 #
+%bcond_with	clamav	#ClamAV scanning support
+
 Summary:	vsftpd - Very Secure FTP Daemon
 Summary(pl.UTF-8):	Bardzo Bezpieczny Demon FTP
 Summary(pt_BR.UTF-8):	vsftpd - Daemon FTP Muito Seguro
 Name:		vsftpd
-Version:	2.0.5
-Release:	4
+Version:	2.3.2
+Release:	1
 License:	GPL v2
 Group:		Daemons
 Source0:	ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
-# Source0-md5:	146062e8b2f93af43ff6c2c770feea94
+# Source0-md5:	bad7b117d737a738738836041edc00db
 Source1:	%{name}.inetd
 Source2:	%{name}.pamd
 Source3:	%{name}-ftpusers
@@ -19,31 +24,16 @@ Source4:	ftpusers.tar.bz2
 Source5:	%{name}.init
 Patch0:		%{name}-builddefs.patch
 Patch1:		%{name}-amd64-findlibs.patch
+Patch2:		%{name}-clamav.patch
 URL:		http://vsftpd.beasts.org/
 BuildRequires:	libcap-devel
 BuildRequires:	libwrap-devel
-BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	openssl-devel >= 0.9.8
 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:	krb5-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)
 
@@ -98,6 +88,9 @@ Ten pakiet pozwala na wystartowanie vsftpd jako samodzielnego demona.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if %{with clamav}
+%patch2 -p1
+%endif
 
 %build
 %{__make} \