Hi Benoit, Hi David!
I've released logwatch 7.1-1.0test1, which should fix the bugs you
reported. Please confirm :-)
It's available from
http://pkg-logwatch.alioth.debian.org/test/
(the orig.tar.gz is in the parent directory)
I'm especially interested if the *MultiService instruction works for
openvpn.
Attached is the source interdiff since 7.1-1.
Willi
diff -u logwatch-7.1/scripts/logwatch.pl logwatch-7.1/scripts/logwatch.pl
--- logwatch-7.1/scripts/logwatch.pl
+++ logwatch-7.1/scripts/logwatch.pl
@@ -28,6 +28,8 @@
# Added to solve problems with applystddate
# deb-TODO: really still needed?
+$ENV{'REAL_LANG'}=$ENV{'LANG'} if $ENV{'LANG'};
+$ENV{'REAL_LC_ALL'}=$ENV{'LC_ALL'} if $ENV{'LC_ALL'};
$ENV{'LANG'} = "C";
$ENV{'LC_ALL'} = "C";
diff -u logwatch-7.1/scripts/services/cron logwatch-7.1/scripts/services/cron
--- logwatch-7.1/scripts/services/cron
+++ logwatch-7.1/scripts/services/cron
@@ -74,12 +74,11 @@
($ThisLine =~ /Updated timestamp for job/) or
($ThisLine =~ /INFO \(pidfile fd = \d+\)/) or
($ThisLine =~ /INFO \(Running [EMAIL PROTECTED] jobs\)/)
-
) {
# Ignore
} elsif (
($ThisLine =~ s/^([^ ]+) \([^ ]+\)\s+//) or
- ($ThisLine =~ s/^\S+\s+\S+\s+..:..:.. [^ ]+ [\/\w]+\[\d+\]:
\((\S+)\)\s+//)
+ ($ThisLine =~
s/^\S+\s+\S+\s+..:..:..\s+\S+\s+\S+\[\d+\]:\s+\((\S+)\)\s+//)
) {
$User = $1;
diff -u logwatch-7.1/debian/changelog logwatch-7.1/debian/changelog
--- logwatch-7.1/debian/changelog
+++ logwatch-7.1/debian/changelog
@@ -1,3 +1,14 @@
+logwatch (7.1-1.0test1) unstable; urgency=low
+
+ * Remove part of the cron patch, it was redundant.
+ * Workaround to preserve language environment for fortunes closes: #340903,
+ thanks to Benoit Dejean <[EMAIL PROTECTED]> for the report.
+ * Openvpn logs to daemon, the server uses ovpn-server as name.
+ closes: #341863, thanks to David Anselmi <[EMAIL PROTECTED]> for the
+ report.
+
+ -- Willi Mann <[EMAIL PROTECTED]> Sun, 4 Dec 2005 10:53:37 +0100
+
logwatch (7.1-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- logwatch-7.1.orig/scripts/services/zz-fortune
+++ logwatch-7.1/scripts/services/zz-fortune
@@ -3,14 +3,17 @@
##########################################################################
# Named 'zz-fortune' so that it will be the last to execute...
+my $env = ( $ENV{'REAL_LANG'} ? "LANG=".$ENV{'REAL_LANG'}." " : "" ).
+ ( $ENV{'REAL_LC_ALL'} ? "LC_ALL=".$ENV{'REAL_LC_ALL'}." " : "" );
+
if (($ENV{'PRINTING'} eq "y" ) && (-f "/usr/games/fortune")) {
#print "\n\n------------------ Fortune --------------------\n\n";
- system("/usr/games/fortune");
+ system("$env /usr/games/fortune");
print "\n";
}
elsif (($ENV{'PRINTING'} eq "y" ) && (-f "/usr/bin/fortune")) {
#print "\n\n------------------ Fortune --------------------\n\n";
- system("/usr/bin/fortune");
+ system("$env /usr/bin/fortune");
print "\n";
}
only in patch2:
unchanged:
--- logwatch-7.1.orig/debian/dist.conf/services/openvpn.conf
+++ logwatch-7.1/debian/dist.conf/services/openvpn.conf
@@ -0,0 +1,4 @@
+LogFile =
+LogFile = daemon
+*MultiService = openvpn,ovpn-server
+*RemoveHeaders
