rpms/proftpd/devel proftpd.conf,1.6,1.7 proftpd.spec,1.17,1.18

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17193/devel

Modified Files:
	proftpd.conf proftpd.spec 
Log Message:
Disable sendfile support by default (#196913).



Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- proftpd.conf	10 May 2006 11:29:02 -0000	1.6
+++ proftpd.conf	3 Jul 2006 17:29:18 -0000	1.7
@@ -58,6 +58,10 @@
 User				nobody
 Group				nobody
 
+# Disable sendfile by default since it breaks displaying the download speeds in
+# ftptop and ftpwho
+UseSendfile			no
+
 # This is where we want to put the pid file
 ScoreboardFile			/var/run/proftpd.score
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- proftpd.spec	19 Jun 2006 10:43:18 -0000	1.17
+++ proftpd.spec	3 Jul 2006 17:29:18 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -181,6 +181,10 @@
 
 
 %changelog
+* Mon Jul  3 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-5
+- Disable sendfile by default since it breaks displaying the download speed in
+  ftptop and ftpwho (#196913).
+
 * Mon Jun 19 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-4
 - Include ctrls restart patch, see #195884 (patch from proftpd.org #2792).