[Pkg-logwatch-general] r55 - in trunk: debian/dist.conf/services patches

[Willi Mann]

Author: willi-guest
Date: 2006-10-15 12:16:32 +0000 (Sun, 15 Oct 2006)
New Revision: 55

Added:
   trunk/patches/10-postfix-smtpd-ignore-in-secure.diff
Removed:
   trunk/debian/dist.conf/services/secure.conf
   trunk/patches/10-secure-nss-mysql-bug390743.diff
   trunk/patches/NOTE_TO_UPSTREAM
Log:
- The patch for removal of postfix-smtpd messages is now in patches, instead in 
  dist.conf, this should be more consistent as it's intended for upstream 
  inclusion.
- The patch to remove nss-mysql is removed, because it's wrong to remove a 
  message that might be a real configuration error. (That some 
  implementations might report it as error while it isn't one is less 
  important. They can use ignore.conf.)



Deleted: trunk/debian/dist.conf/services/secure.conf
===================================================================
--- trunk/debian/dist.conf/services/secure.conf	2006-10-14 11:57:32 UTC (rev 54)
+++ trunk/debian/dist.conf/services/secure.conf	2006-10-15 12:16:32 UTC (rev 55)
@@ -1 +0,0 @@
-$ignore_services = sshd Pluto stunnel proftpd saslauthd imapd postfix/smtpd

Added: trunk/patches/10-postfix-smtpd-ignore-in-secure.diff
===================================================================
--- trunk/patches/10-postfix-smtpd-ignore-in-secure.diff	                        (rev 0)
+++ trunk/patches/10-postfix-smtpd-ignore-in-secure.diff	2006-10-15 12:16:32 UTC (rev 55)
@@ -0,0 +1,12 @@
+diff -ur logwatch-7.3.1.b/conf/services/secure.conf logwatch-7.3.1/conf/services/secure.conf
+--- logwatch-7.3.1.b/conf/services/secure.conf	2005-02-24 18:05:20.000000000 +0100
++++ logwatch-7.3.1/conf/services/secure.conf	2006-10-15 14:08:24.000000000 +0200
+@@ -24,7 +24,7 @@
+ # Use this to ignore certain services in the secure log.
+ # You can ignore as many services as you would like.
+ # (we ignore sshd because its entries are processed by the sshd script)
+-$ignore_services = sshd Pluto stunnel proftpd saslauthd imapd
++$ignore_services = sshd Pluto stunnel proftpd saslauthd imapd postfix/smtpd
+ 
+ # For these services, summarize only (i.e. don't least each IP, just
+ # list the number of connections total)

Deleted: trunk/patches/10-secure-nss-mysql-bug390743.diff
===================================================================
--- trunk/patches/10-secure-nss-mysql-bug390743.diff	2006-10-14 11:57:32 UTC (rev 54)
+++ trunk/patches/10-secure-nss-mysql-bug390743.diff	2006-10-15 12:16:32 UTC (rev 55)
@@ -1,11 +0,0 @@
-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

Deleted: trunk/patches/NOTE_TO_UPSTREAM
===================================================================
--- trunk/patches/NOTE_TO_UPSTREAM	2006-10-14 11:57:32 UTC (rev 54)
+++ trunk/patches/NOTE_TO_UPSTREAM	2006-10-15 12:16:32 UTC (rev 55)
@@ -1,2 +0,0 @@
-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.