[Pkg-logwatch-general] r54 - in trunk: debian
debian/dist.conf/services patches
Willi Mann
willi-guest at costa.debian.org
Sat Oct 14 11:57:33 UTC 2006
Author: willi-guest
Date: 2006-10-14 11:57:32 +0000 (Sat, 14 Oct 2006)
New Revision: 54
Added:
trunk/debian/dist.conf/services/secure.conf
trunk/patches/09-postfix-unmatched-bug390741.diff
trunk/patches/10-secure-nss-mysql-bug390743.diff
trunk/patches/NOTE_TO_UPSTREAM
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
logwatch (7.3.1-3~0) unstable; urgency=low
* Fixes concerning postfix reported by Andreas Beckmann (thanks):
- missing postfix logs (closes: #390741)
- ignore some logs in secure, concerning postfix related authentication
(closes: #390743). Partially done by overriding services/secure.conf.
* Ship ignore.conf in /etc/logwatch/conf. Make Ka Teznik (see bug #391720)
partially happy.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-09-27 11:11:48 UTC (rev 53)
+++ trunk/debian/changelog 2006-10-14 11:57:32 UTC (rev 54)
@@ -1,3 +1,14 @@
+logwatch (7.3.1-3~0) unstable; urgency=low
+
+ * Fixes concerning postfix reported by Andreas Beckmann (thanks):
+ - missing postfix logs (closes: #390741)
+ - ignore some logs in secure, concerning postfix related authentication
+ (closes: #390743). Partially done by overriding services/secure.conf.
+ * Ship ignore.conf in /etc/logwatch/conf. Make Ka Teznik (see bug #391720)
+ partially happy.
+
+ -- Willi Mann <willi at wm1.at> Tue, 3 Oct 2006 08:47:47 +0200
+
logwatch (7.3.1-2) unstable; urgency=low
* Another unmatched line for secure.
Added: trunk/debian/dist.conf/services/secure.conf
===================================================================
--- trunk/debian/dist.conf/services/secure.conf (rev 0)
+++ trunk/debian/dist.conf/services/secure.conf 2006-10-14 11:57:32 UTC (rev 54)
@@ -0,0 +1 @@
+$ignore_services = sshd Pluto stunnel proftpd saslauthd imapd postfix/smtpd
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2006-09-27 11:11:48 UTC (rev 53)
+++ trunk/debian/rules 2006-10-14 11:57:32 UTC (rev 54)
@@ -52,6 +52,7 @@
# Add here commands to install the package into debian/logwatch.
mkdir -p $(LOGDIR)
mkdir -p $(LOGDIR)/conf
+ cp -a conf/ignore.conf $(LOGDIR)/conf
mkdir -p $(LOGDIR)/conf/logfiles
mkdir -p $(LOGDIR)/conf/services
mkdir -p $(LOGDIR)/scripts
Added: trunk/patches/09-postfix-unmatched-bug390741.diff
===================================================================
--- trunk/patches/09-postfix-unmatched-bug390741.diff (rev 0)
+++ trunk/patches/09-postfix-unmatched-bug390741.diff 2006-10-14 11:57:32 UTC (rev 54)
@@ -0,0 +1,21 @@
+diff -u logwatch-7.3.1/scripts/services/postfix logwatch-7.3.1/scripts/services/postfix
+--- logwatch-7.3.1/scripts/services/postfix 2006-10-03 08:52:17.000000000 +0200
++++ logwatch-7.3.1/scripts/services/postfix 2006-10-14 12:19:37.000000000 +0200
+@@ -174,6 +174,7 @@
+ ( $ThisLine =~ m/^$re_MsgID: to=\<.*>, relay=.*, delay=[\d.]+,(?: delays=[\d\/.]+, dsn=[\d.]+,)? status=(?:sent|deferred)/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: host [^ ]*\[[^ ]*\] said: 4[0-9][0-9]/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: host [^ ]*\[[^ ]*\] refused to talk to me: 4[0-9][0-9]/ ) or
++ ( $ThisLine =~ m/^$re_MsgID: sender non-delivery notification: $re_MsgID/ ) or
+ ( $ThisLine =~ m/^Deleted: \d message$/ ) or
+ ( $ThisLine =~ m/^Peer certficate could not be verified$/ ) or #postfix typo
+ ( $ThisLine =~ m/^Peer certificate could not be verified$/ ) or
+@@ -331,7 +332,8 @@
+ $SaslAuthenticationFail{$Host}++;
+ } elsif (
+ ($Host,$User) = ($ThisLine =~ /^$re_MsgID: client=([^ ]*\[[^ ]*\]), .* sasl_username=([^ ]*)$/) or
+- ($Host,$User) = ($ThisLine =~ /^$re_MsgID: client=([^ ]*\[[^ ]*\]), sasl_sender=([^ ]*)$/)
++ ($Host,$User) = ($ThisLine =~ /^$re_MsgID: client=([^ ]*\[[^ ]*\]), sasl_sender=([^ ]*)$/) or
++ ($Host,$User) = ($ThisLine =~ /^$re_MsgID: client=([^ ]*\[[^ ]*\]), .* sasl_username=([^ ]*), sasl_sender=[^ ]*$/)
+ ) {
+ chomp($User);
+ $SaslAuth{$Host}{$User}++;
Added: trunk/patches/10-secure-nss-mysql-bug390743.diff
===================================================================
--- trunk/patches/10-secure-nss-mysql-bug390743.diff (rev 0)
+++ trunk/patches/10-secure-nss-mysql-bug390743.diff 2006-10-14 11:57:32 UTC (rev 54)
@@ -0,0 +1,11 @@
+diff -ur logwatch-7.3.1.b/scripts/services/secure logwatch-7.3.1/scripts/services/secure
+--- logwatch-7.3.1.b/scripts/services/secure 2006-10-14 13:20:54.000000000 +0200
++++ logwatch-7.3.1/scripts/services/secure 2006-10-14 13:25:31.000000000 +0200
+@@ -181,6 +181,7 @@
+ ( $ThisLine =~ /^kcheckpass(\[\d+\]|):/ ) or # done in pam_unix
+ ( $ThisLine =~ /^cyrus\/lmtpd\[\d+\]: [^ ]+ server step [12]/ ) or
+ ( $ThisLine =~ /^cyrus\/imapd\[\d+\]: [^ ]+ server step [12]/ ) or
++ ( $ThisLine =~ /^nss-mysql\[\d+\]: _nss_mysql_getspnam_r conf file parsing failed/ ) or #debian bug#390743
+ ( $ThisLine =~ /pam_timestamp: updated timestamp file/) or
+ ( $ThisLine =~ /pam_timestamp\(?[^ ]*\)?: timestamp file `([^ ]+)' is only \d+ seconds old, allowing access to ([^ ]+) for user ([^ ]+)/) or
+ ( $ThisLine =~ /pam_timestamp\(?[^ ]*\)?: timestamp file `([^ ]+)'/) or # has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) or
Added: trunk/patches/NOTE_TO_UPSTREAM
===================================================================
--- trunk/patches/NOTE_TO_UPSTREAM (rev 0)
+++ trunk/patches/NOTE_TO_UPSTREAM 2006-10-14 11:57:32 UTC (rev 54)
@@ -0,0 +1,2 @@
+There's another thing I've done by the configuration file, because it should
+be more effitient: I've thrown out postfix/smtpd by a dist.conf config file.
More information about the Pkg-logwatch-general
mailing list