diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/001_default-rrd-location.diff | 20 | ||||
| -rw-r--r-- | debian/patches/0100-new_syslog_format.patch | 10 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 10 insertions, 22 deletions
diff --git a/debian/patches/001_default-rrd-location.diff b/debian/patches/001_default-rrd-location.diff index 54be53f..fa62f8c 100644 --- a/debian/patches/001_default-rrd-location.diff +++ b/debian/patches/001_default-rrd-location.diff @@ -16,23 +16,3 @@ Forwarded: not-needed my @graphs = ( { title => 'Last Day', seconds => 3600*24, }, ---- a/mailgraph.pl -+++ b/mailgraph.pl -@@ -373,7 +373,7 @@ - - my $daemon_logfile = '/var/log/mailgraph.log'; - my $daemon_pidfile = '/var/run/mailgraph.pid'; --my $daemon_rrd_dir = '/var/log'; -+my $daemon_rrd_dir = '/var/lib/mailgraph'; - - # global variables - my $logfile; -@@ -411,7 +411,7 @@ - print " --host=HOST use only entries for HOST (regexp) in syslog\n"; - print " -d, --daemon start in the background\n"; - print " --daemon-pid=FILE write PID to FILE instead of /var/run/mailgraph.pid\n"; -- print " --daemon-rrd=DIR write RRDs to DIR instead of /var/log\n"; -+ print " --daemon-rrd=DIR write RRDs to DIR instead of /var/lib/mailgraph\n"; - print " --daemon-log=FILE write verbose-log to FILE instead of /var/log/mailgraph.log\n"; - print " --ignore-localhost ignore mail to/from localhost (used for virus scanner)\n"; - print " --ignore-host=HOST ignore mail to/from HOST regexp (used for virus scanner)\n"; diff --git a/debian/patches/0100-new_syslog_format.patch b/debian/patches/0100-new_syslog_format.patch index 5cc7edc..b041ecd 100644 --- a/debian/patches/0100-new_syslog_format.patch +++ b/debian/patches/0100-new_syslog_format.patch @@ -1,3 +1,11 @@ +Description: Add new syslog format +Author: M.D. Klapwijk +Origin: https://gist.github.com/mdklapwijk/4f8d2fc39f09f4aa615cbf8ffae0379a +Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1051496 +Forwarded: not-needed +Last-Update: 2023-09-23 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/mailgraph.pl =================================================================== --- trunk.orig/mailgraph.pl @@ -64,7 +72,7 @@ Index: trunk/mailgraph.pl + } + else { + my($montxt); -+ ($mon, $day, $hour, $min, $sec, $host, $text) = $str =~ /^ ++ ($montex, $day, $hour, $min, $sec, $host, $text) = $str =~ /^ + (\S{3})\s+(\d+) # date + \s + (\d+):(\d+):(\d+) # time diff --git a/debian/patches/series b/debian/patches/series index bb41002..578c8c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ 0100-new_syslog_format.patch -#001_default-rrd-location.diff +001_default-rrd-location.diff 002_script-name.diff 003_web-bug.diff #050_greylist.diff |