From e0e9c32a96f6920a3220656f2c6667b0963bf546 Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@skalnik-nb.(none)>
Date: Tue, 17 Jul 2012 11:17:12 +0200
Subject: [PATCH] - changed default value of xferlog_file to /var/log/xferlog -
 added rotating xferlog

---
 vsftpd-3.0.0-logrotate.patch | 13 +++++++++++++
 vsftpd-3.0.0-xferlog.patch   | 12 ++++++++++++
 vsftpd.spec                  | 10 +++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 vsftpd-3.0.0-logrotate.patch
 create mode 100644 vsftpd-3.0.0-xferlog.patch

diff --git a/vsftpd-3.0.0-logrotate.patch b/vsftpd-3.0.0-logrotate.patch
new file mode 100644
index 0000000..06dc6b9
--- /dev/null
+++ b/vsftpd-3.0.0-logrotate.patch
@@ -0,0 +1,13 @@
+diff -up vsftpd-3.0.0/RedHat/vsftpd.log.logrotate vsftpd-3.0.0/RedHat/vsftpd.log
+--- vsftpd-3.0.0/RedHat/vsftpd.log.logrotate	2012-07-17 11:08:28.484061640 +0200
++++ vsftpd-3.0.0/RedHat/vsftpd.log	2012-07-17 11:09:08.000020510 +0200
+@@ -3,3 +3,9 @@
+     nocompress
+     missingok
+ }
++
++/var/log/xferlog {
++    # ftpd doesn't handle SIGHUP properly
++    nocompress
++    missingok
++}
diff --git a/vsftpd-3.0.0-xferlog.patch b/vsftpd-3.0.0-xferlog.patch
new file mode 100644
index 0000000..54c563b
--- /dev/null
+++ b/vsftpd-3.0.0-xferlog.patch
@@ -0,0 +1,12 @@
+diff -up vsftpd-3.0.0/vsftpd.conf.xferlog vsftpd-3.0.0/vsftpd.conf
+--- vsftpd-3.0.0/vsftpd.conf.xferlog	2012-07-17 10:38:14.022601998 +0200
++++ vsftpd-3.0.0/vsftpd.conf	2012-07-17 10:41:09.311073484 +0200
+@@ -50,7 +50,7 @@ connect_from_port_20=YES
+ #
+ # You may override where the log file goes if you like. The default is shown
+ # below.
+-#xferlog_file=/var/log/vsftpd.log
++#xferlog_file=/var/log/xferlog
+ #
+ # If you want, you can have your log file in standard ftpd xferlog format.
+ # Note that the default log file location is /var/log/xferlog in this case.
diff --git a/vsftpd.spec b/vsftpd.spec
index 6afeb68..164604c 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 3.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -55,6 +55,8 @@ Patch20: vsftpd-2.3.4-sqb.patch
 Patch21: vsftpd-2.3.4-listen_ipv6.patch
 Patch22: vsftpd-2.3.5-aslim.patch
 Patch23: vsftpd-3.0.0-tz.patch
+Patch24: vsftpd-3.0.0-xferlog.patch
+Patch25: vsftpd-3.0.0-logrotate.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -93,6 +95,8 @@ cp %{SOURCE1} .
 %patch21 -p1 -b .listen_ipv6
 %patch22 -p1 -b .aslim
 %patch23 -p1 -b .tz
+%patch24 -p1 -b .xferlog
+%patch25 -p1 -b .logrotate
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -167,6 +171,10 @@ fi
 %{_sysconfdir}/rc.d/init.d/vsftpd
 
 %changelog
+* Tue Jul 17 2012 Jiri Skala <jskala@redhat.com> - 3.0.0-3
+- changed default value of xferlog_file to /var/log/xferlog
+- added rotating xferlog
+
 * Thu Apr 26 2012 Jiri Skala <jskala@redhat.com> - 3.0.0-2
 - corrected time zone handling - especially DST flag
 - fixed default value of option 'listen'