- updated to 3.0.5

[packages/vsftpd.git] / vsftpd.spec

diff --git a/vsftpd.spec b/vsftpd.spec
index 99e9c5e40b65984c1f6b2e926a667c5ac069cd22..81dc66a33d73e6dee87029676444645a39ff79f2 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
-#
-%bcond_with    clamav  #ClamAV scanning support
+# 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.1.0
-Release:       1.1
+Version:       3.0.5
+Release:       1
 License:       GPL v2
 Group:         Daemons
-Source0:       ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
-# Source0-md5: 7890b54e7ffa6106ffbdfda53f47fa41
+Source0:       https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
+# Source0-md5: efbf362a65bec771bc15ad311f5a982e
 Source1:       %{name}.inetd
 Source2:       %{name}.pamd
 Source3:       %{name}-ftpusers
@@ -22,10 +24,17 @@ Source5:    %{name}.init
 Patch0:                %{name}-builddefs.patch
 Patch1:                %{name}-amd64-findlibs.patch
 Patch2:                %{name}-clamav.patch
-URL:           http://vsftpd.beasts.org/
+Patch3:                %{name}-switch_sha256_to_sha1.patch
+Patch4:                %{name}-findlibs-egrep.patch
+Patch5:                fix-str_open.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
@@ -34,6 +43,8 @@ Provides:     ftpserver
 Conflicts:     man-pages < 1.51
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define        specflags       -fpie -pipe -Wextra
+
 %description
 A Very Secure FTP Daemon - written from scratch - by Chris "One Man
 Security Audit Team" Evans.
@@ -54,7 +65,7 @@ Group:                Networking/Daemons
 Requires:      %{name} = %{version}-%{release}
 Requires:      rc-inetd
 Provides:      %{name}-init = %{version}-%{release}
-Obsoletes:     vsftpd-standalone
+Obsoletes:     vsftpd-standalone <= %{version}-%{release}
 Conflicts:     %{name} <= 2.0.3-1
 
 %description inetd
@@ -72,7 +83,7 @@ Requires(post,preun): /sbin/chkconfig
 Requires:      %{name} = %{version}-%{release}
 Requires:      rc-scripts
 Provides:      %{name}-init = %{version}-%{release}
-Obsoletes:     vsftpd-inetd
+Obsoletes:     vsftpd-inetd <= %{version}-%{release}
 Conflicts:     %{name} <= 2.0.3-1
 
 %description standalone
@@ -88,12 +99,17 @@ Ten pakiet pozwala na wystartowanie vsftpd jako samodzielnego demona.
 %if %{with clamav}
 %patch2 -p1
 %endif
-
+%if "%{pld_release}" == "ac"
+%patch3 -p1
+%endif
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__make} \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags}" \
+       LIBS="-lwrap -lpam -lcap -lssl -lcrypto" \
        LINK="%{rpmldflags}"
 
 %install
@@ -102,21 +118,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
@@ -143,6 +159,12 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
+%triggerin standalone -- glibc
+# restart vsftpd if glibc is upgraded or downgraded
+if [ "$2" != 1 ]; then
+       %service -q vsftpd restart
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AUDIT BENCHMARKS BUGS Changelog FAQ README README.ssl REWARD SIZE SPEED TODO TUNING EXAMPLE SECURITY