packages: vsftpd/vsftpd.spec - new home and url; spec cosmetics

[glen]

Author: glen                         Date: Wed Dec  7 14:47:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new home and url; spec cosmetics

---- Files affected:
packages/vsftpd:
   vsftpd.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/vsftpd/vsftpd.spec
diff -u packages/vsftpd/vsftpd.spec:1.78 packages/vsftpd/vsftpd.spec:1.79
--- packages/vsftpd/vsftpd.spec:1.78	Tue Mar  1 20:49:04 2011
+++ packages/vsftpd/vsftpd.spec	Wed Dec  7 15:47:53 2011
@@ -3,7 +3,7 @@
 # - default config does not work with inetd configuration
 #
 # Conditional build:
-%bcond_with	clamav	#ClamAV scanning support
+%bcond_with	clamav	# ClamAV scanning support
 
 %define		_ftpdir	/home/services/ftp
 Summary:	vsftpd - Very Secure FTP Daemon
@@ -14,7 +14,7 @@
 Release:	1
 License:	GPL v2
 Group:		Daemons
-Source0:	ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
+Source0:	https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
 # Source0-md5:	2ea5d19978710527bb7444d93b67767a
 Source1:	%{name}.inetd
 Source2:	%{name}.pamd
@@ -26,7 +26,7 @@
 Patch1:		%{name}-amd64-findlibs.patch
 Patch2:		%{name}-clamav.patch
 Patch3:		%{name}-switch_sha256_to_sha1.patch
-URL:		http://vsftpd.beasts.org/
+URL:		https://security.appspot.com/vsftpd.html
 BuildRequires:	libcap-devel
 BuildRequires:	libwrap-devel
 %if "%{pld_release}" == "ac"
@@ -112,21 +112,21 @@
 	$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 %{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 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 -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
@@ -189,6 +189,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2011/12/07 14:47:53  glen
+- new home and url; spec cosmetics
+
 Revision 1.78  2011/03/01 19:49:04  charles
 - updated to 2.3.4, fixes CVE-2011-0762
 
@@ -347,7 +350,7 @@
 - 1.2.2
 
 Revision 1.29  2004/03/29 08:49:55  luzik
- - added Obsolete: glftpd
+- added Obsolete: glftpd
 
 Revision 1.28  2004/03/02 00:05:02  pluto
 - /srv/ftp -> /home/services/ftp
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vsftpd/vsftpd.spec?r1=1.78&r2=1.79&f=u