-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 tags 378826 + patch
The package should be changed nonetheless. Either in the way, that the documentation and applications are changed to reflect the new default log directory as default (as demonstrated in default_xferlog_path.patch) or to fix bug #364580, which is as of now still not completely fixed, as ftpstats uses the former default path (see cronjob_xferlog_path.patch). Best Regards Daniel -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFF02rdjG7gjygyQSURArfnAKC6FvZ4RZ0kb6oIoTsfOUEhZy0uZwCgsZYd gTuFvjchNOIQoPRJexG/PHo= =GDlX -----END PGP SIGNATURE-----
diff -uNr a/debian/proftpd.cron.monthly c/debian/proftpd.cron.monthly --- a/debian/proftpd.cron.monthly 2007-02-14 16:51:08.000000000 +0100 +++ c/debian/proftpd.cron.monthly 2007-02-14 17:03:27.345572440 +0100 @@ -7,7 +7,7 @@ cd /var/log/proftpd savelog -q -u root -g adm -m 640 -c 12 /var/log/proftpd/xferreport -ftpstats -a -r -l 2 -d 2>/dev/null >/var/log/proftpd/xferreport +ftpstats -f /var/log/proftpd/xferlog -a -r -l 2 -d 2>/dev/null >/var/log/proftpd/xferreport savelog -q -u root -g adm -m 640 -c 7 /var/log/proftpd/xferlog savelog -q -u root -g adm -m 640 -c 7 /var/log/proftpd/proftpd.log savelog -q -u root -g adm -m 640 -c 7 /var/log/proftpd/controls.log
diff -uNr a/contrib/dist/rpm/proftpd.logrotate b/contrib/dist/rpm/proftpd.logrotate
--- a/contrib/dist/rpm/proftpd.logrotate 2002-11-02 23:44:41.000000000 +0100
+++ b/contrib/dist/rpm/proftpd.logrotate 2007-02-14 16:56:53.743513170 +0100
@@ -1,4 +1,4 @@
-/var/log/xferlog {
+/var/log/proftpd/xferlog {
missingok
notifempty
postrotate
diff -uNr a/contrib/README b/contrib/README
--- a/contrib/README 2003-01-03 03:36:47.000000000 +0100
+++ b/contrib/README 2007-02-14 16:56:40.170339157 +0100
@@ -9,7 +9,7 @@
xferstats.holger-preiss (BSD license, I think)
A port of the infamous wu-ftpd xferlog perl analysis script, w/ bug fixes
- and some modifications. Useful for analyzing your /var/log/xferlog files.
+ and some modifications. Useful for analyzing your /var/log/proftpd/xferlog files.
See xferlog(5).
mod_ratio.c (GPL license)
diff -uNr a/contrib/xferstats.holger-preiss b/contrib/xferstats.holger-preiss
--- a/contrib/xferstats.holger-preiss 2002-05-30 18:22:46.000000000 +0200
+++ b/contrib/xferstats.holger-preiss 2007-02-14 16:56:46.694903495 +0100
@@ -49,7 +49,7 @@
# $mydom2 = "org";
# edit the next line to customize for your default log file
-$usage_file = "/var/log/xferlog";
+$usage_file = "/var/log/proftpd/xferlog";
# Edit the following lines for default report settings.
# Entries defined here will be over-ridden by the command line.
diff -uNr a/debian/ftpstats.8 b/debian/ftpstats.8
--- a/debian/ftpstats.8 2007-02-14 16:51:08.000000000 +0100
+++ b/debian/ftpstats.8 2007-02-14 16:56:24.929020900 +0100
@@ -36,7 +36,7 @@
Use
.IR filename
rather than the default
-.IR /var/log/xferlog
+.IR /var/log/proftpd/xferlog
.
.TP
.BR \-r
diff -uNr a/doc/Configuration.html b/doc/Configuration.html
--- a/doc/Configuration.html 2003-10-30 21:38:16.000000000 +0100
+++ b/doc/Configuration.html 2007-02-14 16:57:11.141018019 +0100
@@ -29146,7 +29146,7 @@
></DT
><DD
><P
->TransferLog /var/log/xferlog</P
+>TransferLog /var/log/proftpd/xferlog</P
></DD
><DT
><PRE
diff -uNr a/include/default_paths.h b/include/default_paths.h
--- a/include/default_paths.h 2004-11-03 01:40:07.000000000 +0100
+++ b/include/default_paths.h 2007-02-14 16:56:30.269482804 +0100
@@ -70,7 +70,7 @@
* log files. These can be overridden in the configuration file via
* "TransferLog" and "ExtendedLog".
*/
-#define PR_XFERLOG_PATH "/var/log/xferlog"
+#define PR_XFERLOG_PATH "/var/log/proftpd/xferlog"
/* Location of the file that tells proftpd to discontinue servicing
* requests.
diff -uNr a/src/proftpd.8 b/src/proftpd.8
--- a/src/proftpd.8 2007-02-14 16:51:08.000000000 +0100
+++ b/src/proftpd.8 2007-02-14 16:57:11.173020787 +0100
@@ -100,7 +100,7 @@
.br
.B /usr/sbin/ftpshut
.br
-.B /var/log/xferlog
+.B /var/log/proftpd/xferlog
.br
.B /var/run/run/proftpd.pid
.br
diff -uNr a/src/proftpd.8.in b/src/proftpd.8.in
--- a/src/proftpd.8.in 2004-09-18 02:40:30.000000000 +0200
+++ b/src/proftpd.8.in 2007-02-14 16:57:11.149018711 +0100
@@ -100,7 +100,7 @@
.br
.B @SBINDIR@/ftpshut
.br
-.B /var/log/xferlog
+.B /var/log/proftpd/xferlog
.br
.B @LOCALSTATEDIR@/run/proftpd.pid
.br
diff -uNr a/src/xferlog.5 b/src/xferlog.5
--- a/src/xferlog.5 2006-04-16 23:41:55.000000000 +0200
+++ b/src/xferlog.5 2007-02-14 16:58:39.032621327 +0100
@@ -8,7 +8,7 @@
file contains logging information from the FTP server daemon,
.BR proftpd (8).
This file usually is found in
-.BR /var/log
+.BR /var/log/proftpd
but can be located anywhere by
using a
.BR proftpd (8)
@@ -151,7 +151,7 @@
.SH FILES
.PD 0
.TP 20
-.B /var/log/xferlog
+.B /var/log/proftpd/xferlog
.PP
.PD
.SH AUTHORS
diff -uNr a/src/xferlog.5.in b/src/xferlog.5.in
--- a/src/xferlog.5.in 2004-02-04 19:45:49.000000000 +0100
+++ b/src/xferlog.5.in 2007-02-14 17:00:12.468705831 +0100
@@ -8,7 +8,7 @@
file contains logging information from the FTP server daemon,
.BR proftpd (8).
This file usually is found in
-.BR /var/log
+.BR /var/log/proftpd
but can be located anywhere by
using a
.BR proftpd (8)
@@ -151,7 +151,7 @@
.SH FILES
.PD 0
.TP 20
-.B /var/log/xferlog
+.B /var/log/proftpd/xferlog
.PP
.PD
.SH AUTHORS
cronjob_xferlog_path.patch.sig
Description: Binary data
default_xferlog_path.patch.sig
Description: Binary data
