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

diff --git a/vsftpd.spec b/vsftpd.spec
index f3f88db..76dc55e 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,20 +1,20 @@
-### TODO:
+# 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.3.2
+Version:	3.0.2
 Release:	2
 License:	GPL v2
 Group:		Daemons
-Source0:	ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
-# Source0-md5:	bad7b117d737a738738836041edc00db
+Source0:	https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
+# Source0-md5:	8b00c749719089401315bd3c44dddbb2
 Source1:	%{name}.inetd
 Source2:	%{name}.pamd
 Source3:	%{name}-ftpusers
@@ -25,7 +25,8 @@ 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/
+Patch4:		%{name}-findlibs-egrep.patch
+URL:		https://security.appspot.com/vsftpd.html
 BuildRequires:	libcap-devel
 BuildRequires:	libwrap-devel
 %if "%{pld_release}" == "ac"
@@ -98,6 +99,7 @@ Ten pakiet pozwala na wystartowanie vsftpd jako samodzielnego demona.
 %if "%{pld_release}" == "ac"
 %patch3 -p1
 %endif
+%patch4 -p1
 
 %build
 %{__make} \
@@ -111,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