diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | debian/mailgraph.conf | 4 | ||||
| -rw-r--r-- | debian/mailgraph.dirs | 1 | ||||
| -rw-r--r-- | debian/mailgraph.install | 4 | ||||
| -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 |
8 files changed, 25 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index bdcc232..16e0054 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ mailgraph (1.14-21) UNRELEASED; urgency=medium - * New debian/patches/0100-new_syslog_format.patch + * New debian/patches/0100-new_syslog_format.patch: + - support the new syslog format (Closes: #1051496) * debian/control: - Remove obsolete lsb-base. + * debian/mailgraph.install: + - Move cgi to /usr/lib/cgi-bin. + * debian/mailgraph.conf: + - Move directory to /usr/lib/cgi-bin. -- Jörg Frings-Fürst <debian@jff.email> Sat, 23 Sep 2023 12:24:48 +0200 diff --git a/debian/copyright b/debian/copyright index 37e4acb..b081433 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,6 +14,10 @@ Copyright: 2002-2008 Norbert Tretkowski <nobse@debian.org> 2014-2023 Jörg Frings-Fürst <debian@jff.email> License: GPL-2 +Files: debian/patches/0100-new_syslog_format.patch +Copyright: 2018 M.D. Klapwijk +License: GPL-2 + License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/debian/mailgraph.conf b/debian/mailgraph.conf index 3b4a240..b71cdba 100644 --- a/debian/mailgraph.conf +++ b/debian/mailgraph.conf @@ -1,7 +1,7 @@ # mailgraph default Apache configuration -Alias /mailgraph /usr/share/mailgraph -<Directory /usr/share/mailgraph> +Alias /mailgraph /usr/lib/cgi-bin +<Directory /usr/lib/cgi-bin> Options +FollowSymLinks +ExecCGI AddHandler cgi-script .cgi diff --git a/debian/mailgraph.dirs b/debian/mailgraph.dirs index 07d42c1..868d8f9 100644 --- a/debian/mailgraph.dirs +++ b/debian/mailgraph.dirs @@ -1 +1,2 @@ var/lib/mailgraph +usr/lib/cgi-bin diff --git a/debian/mailgraph.install b/debian/mailgraph.install index 33a4b0a..73db00c 100644 --- a/debian/mailgraph.install +++ b/debian/mailgraph.install @@ -1,4 +1,4 @@ mailgraph usr/sbin -mailgraph.cgi usr/share/mailgraph +mailgraph.cgi usr/lib/cgi-bin debian/default.conf usr/share/mailgraph -mailgraph.css usr/share/mailgraph +mailgraph.css usr/lib/cgi-bin 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 |