- updated to 2.3.4, fixes CVE-2011-0762

[packages/vsftpd.git] / vsftpd.spec

diff --git a/vsftpd.spec b/vsftpd.spec
index fe1e45b8052d1340aba2fac86add1d38a77927cc..2bdfef65e093d07bd8890c5e6e3479c2f064fb2f 100644 (file)
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,18 +1,20 @@
+# TODO:
+# - default config does not work with inetd configuration
 #
-%define                _ftpdir /home/services/ftp
-#
+# 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
 Name:          vsftpd
-Version:       2.3.2
+Version:       2.3.4
 Release:       1
 License:       GPL v2
 Group:         Daemons
 Source0:       ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
-# Source0-md5: bad7b117d737a738738836041edc00db
+# Source0-md5: 2ea5d19978710527bb7444d93b67767a
 Source1:       %{name}.inetd
 Source2:       %{name}.pamd
 Source3:       %{name}-ftpusers
@@ -22,10 +24,15 @@ Source5:    %{name}.init
 Patch0:                %{name}-builddefs.patch
 Patch1:                %{name}-amd64-findlibs.patch
 Patch2:                %{name}-clamav.patch
+Patch3:                %{name}-switch_sha256_to_sha1.patch
 URL:           http://vsftpd.beasts.org/
 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
@@ -88,6 +95,9 @@ Ten pakiet pozwala na wystartowanie vsftpd jako samodzielnego demona.
 %if %{with clamav}
 %patch2 -p1
 %endif
+%if "%{pld_release}" == "ac"
+%patch3 -p1
+%endif
 
 %build
 %{__make} \