Revision: 206
http://sourceforge.net/p/logwatch/code/206
Author: stefjakobs
Date: 2014-09-08 19:39:13 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
update postfix and amavis service scripts
Modified Paths:
--------------
scripts/services/amavis
scripts/services/postfix
Modified: scripts/services/amavis
===================================================================
--- scripts/services/amavis 2014-09-08 19:15:49 UTC (rev 205)
+++ scripts/services/amavis 2014-09-08 19:39:13 UTC (rev 206)
@@ -49,7 +49,7 @@
no warnings "uninitialized";
use re 'taint';
-our $Version = '1.51.02';
+our $Version = '1.51.03';
our $progname_prefix = 'amavis';
# Specifies the default configuration file for use in standalone mode.
@@ -1841,7 +1841,6 @@
#
sub create_ignore_list() {
- push @ignore_list_final, qr/^RUSAGE: /;
push @ignore_list_final, qr/^lookup_ip_acl/;
push @ignore_list_final, qr/^lookup_acl/;
push @ignore_list_final, qr/^lookup_hash/;
@@ -2015,9 +2014,16 @@
push @ignore_list_final, qr/^Load low precedence policybank/;
push @ignore_list_final, qr/^warm restart on /; # XXX could be placed instartup info
push @ignore_list_final, qr/^Signalling a SIGHUP to a running daemon/;
- push @ignore_list_final, qr/^Deleting db files nanny.db in /;
+ push @ignore_list_final, qr/^Deleting db files /;
push @ignore_list_final, qr/^address modified \(/;
+ push @ignore_list_final, qr/^Request: AM\.PDP /;
+ push @ignore_list_final, qr/^DSPAM result: /;
+ push @ignore_list_final, qr/^bind to \//;
+ push @ignore_list_final, qr/^ZMQ enabled: /;
+ push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /;
+ push @ignore_list_final, qr/^Decoding of .* failed, leaving it unpacked: /;
+
# various forms of "Using ..."
# more specific, interesting variants already captured: search "Using"
push @ignore_list_final, qr/^Using \(.*\) on dir:/;
@@ -2027,6 +2033,7 @@
push @ignore_list_final, qr/creating socket by /;
# unanchored
+ push @ignore_list_final, qr/\bRUSAGE\b/;
push @ignore_list_final, qr/: Sending .* to UNIX socket/;
}
@@ -2114,8 +2121,8 @@
or ($p1 =~ /^SpamControl/)
or ($p1 =~ /^Perl/)
or ($p1 =~ /^ESMTP/)
- or ($p1 =~ /^(?:\(!+\))?(?:FWD|SEND) from /) # log level 4
- or ($p1 =~ /^(?:\(!+\))?(?:ESMTP|FWD|SEND) via /) # log level 4
+ or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:FWD|SEND) from /) # log level 4
+ or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:ESMTP|FWD|SEND) via /) # log level 4
or ($p1 =~ /^tempdir being removed/)
or ($p1 =~ /^do_notify_and_quar(?:antine)?: .*ccat/)
or ($p1 =~ /^cached [a-zA-Z0-9]+ /)
@@ -2482,8 +2489,10 @@
$Totals{'truncatedmsg'}++;
}
- elsif ( $p1 =~ /: spam level exceeds quarantine cutoff level/ ) {
+ elsif ($p1 =~ /: spam level exceeds quarantine cutoff level/ or
+ $p1 =~ /: cutoff, blacklisted/) {
#TD do_notify_and_quarantine: spam level exceeds quarantine cutoff level 20
+ #TD do_notify_and_quarantine: cutoff, blacklisted
$Totals{'spamdiscarded'}++;
}
@@ -2758,6 +2767,20 @@
#$Counts{'sadiags'}{'fuzzyocr'}{'image too small'}++;
next;
}
+ elsif ($msg =~ /dns: \[\.\.\.\]/) {
+ #TD SA info: dns: [...] ;; ADDITIONAL SECTION (1 record)
+ next;
+ }
+ # canonicalize some PIDs and IDs
+ elsif ($msg =~ s/^pyzor: \[\d+\] error/pyzor: [<PID>] error/) {
+ #TD SA info: pyzor: [11550] error: TERMINATED, signal 15 (000f)
+ }
+ elsif ($msg =~ /dns: no likely matching queries for id \d+/) {
+ $msg =~ s/\d+/<ID>/;
+ }
+ elsif ($msg =~ /dns: no callback for id \d+/) {
+ $msg =~ s/\d+.*$/<ID>.../;
+ }
# report other SA warn's
$Totals{'sadiags'}++;
@@ -3014,13 +3037,15 @@
}
# Timing report
- } elsif (my ($total,$report) = ( $p1 =~ /^(?:size: \d+, )?TIMING \[total (\d+) ms\] - (.+)$/)) {
+ } elsif (my ($total,$report) = ( $p1 =~ /^(?:size: \d+, )?TIMING \[total (\d+) ms(?:, [^]]+)?\] - (.+)$/)) {
next if ($report =~ /^got data/); # skip amavis release timing
-
#TD TIMING [total 5808 ms] - SMTP greeting: 5 (0%)0, SMTP LHLO: 1 (0%)0, SMTP pre-MAIL: 2 (0%)0, SMTP pre-DATA-flush: 5 (0%)0, SMTP DATA: 34 (1%)1, check_init: 1 (0%)1
# older format, maia mailguard
#TD TIMING [total 3795 ms] - SMTP EHLO: 1 (0%), SMTP pre-MAIL: 0 (0%), maia_read_system_config: 1 (0%), maia_get_mysql_size_limit: 0 (0%), SA check: 3556 (94%), rundown: 0 (0%)
+ # v2.8.1
+ # .... size: 3815, TIMING [total 1901 ms, cpu 657 ms] - ...
+
# Timing line is incomplete - let's report it
if ($p1 !~ /\d+ \(\d+%\)\d+$/ and $p1 !~ /\d+ \(\d+%\)$/) {
inc_unmatched('timing');
@@ -3031,7 +3056,7 @@
my @pairs = split(/[,:] /, $report);
while (my ($key,$value) = @pairs) {
#4 (0%)0
- my ($ms) = ($value =~ /^(\d+) /);
+ my ($ms) = ($value =~ /^([\d.]+) /);
# maintain a per-test list of timings
push @{$Timings{$key}}, $ms;
shift @pairs; shift @pairs;
@@ -3039,7 +3064,9 @@
push @TimingsTotals, $total;
}
- } elsif (($total,$report) = ( $p1 =~ /^TIMING-SA total (\d+) ms - (.+)$/ )) {
+ } elsif ((($total,$report) = ( $p1 =~ /^TIMING-SA total (\d+) ms - (.+)$/ )) or
+ (($total,$report) = ( $p1 =~ /^TIMING-SA \[total (\d+) ms, cpu \d+ ms\] - (.+)$/ ))) {
+ #TIMING-SA [total 3219 ms, cpu 432 ms] - parse: 6 (0.2%), ext
#TD TIMING-SA total 5478 ms - parse: 1.69 (0.0%), extract_message_metadata: 16 (0.3%), get_uri_detail_list: 2 (0.0%), tests_pri_-1000: 25 (0.4%), tests_pri_-950: 0.67 (0.0%), tests_pri_-900: 0.83 (0.0%), tests_pri_-400: 19 (0.3%), check_bayes: 17 (0.3%), tests_pri_0: 5323 (97.2%), check_spf: 12 (0.2%), poll_dns_idle: 0.81 (0.0%), check_dkim_signature: 1.50 (0.0%), check_razo r2: 5022 (91.7%), check_dcc: 192 (3.5%), check_pyzor: 0.02 (0.0%), tests_pri_500: 9 (0.2%), tests_pri_1000: 24 (0.4%), total_awl: 23 (0.4%), check_awl: 10 (0.2%), update_awl: 8 (0.1%), learn: 36 (0.7%), get_report: 1.77 (0.0%)
# Timing line is incomplete - let's report it
@@ -3102,8 +3129,11 @@
}
elsif (($suffix, $decoder) = ( $p1 =~ /^Found decoder for\s+(\.\S*)\s+at\s+(.*)$/)) {
+ #TD Found decoder for .bz2 at /usr/bin/bzip2 -d
+ #TD Found decoder for .bz2 at /usr/bin/7za (backup, not used)
next unless ($Opts{'startinfo'});
- $StartInfo{'Decoders'}{'External'}{$suffix} = $decoder;
+ $StartInfo{'Decoders'}{'External'}{$suffix} = exists $StartInfo{'Decoders'}{'External'}{$suffix} ?
+ join '; ', $StartInfo{'Decoders'}{'External'}{$suffix}, $decoder : $decoder;
}
# AV Scanners
@@ -3130,11 +3160,16 @@
next unless ($Opts{'startinfo'});
$StartInfo{'Code'}{"\u\L$loaded"}{$code} = "";
- } elsif (my ($module, $vers,) = ( $p1 =~ /^Module (\S+)\s+(.+)$/)) {
+ } elsif (my ($module, $vers) = ( $p1 =~ /^Module (\S+)\s+(.+)$/)) {
#TD Module Amavis::Conf 2.086
next unless ($Opts{'startinfo'});
$StartInfo{'Code'}{'Loaded'}{$module} = $vers;
+ } elsif (($module, my $families) = ( $p1 =~ /^socket module (\S+),\s+(.+)$/)) {
+ #TD socket module IO::Socket::IP, protocol families available: INET, INET6
+ next unless ($Opts{'startinfo'});
+ $StartInfo{'Code'}{'Loaded'}{$module} = $families;
+
} elsif (($code, $location) = ( $p1 =~ /^Found \$(\S+)\s+at\s+(.+)$/)) {
#TD Found $file at /usr/bin/file
#TD Found $uncompress at /usr/bin/gzip -d
@@ -3146,6 +3181,13 @@
next unless ($Opts{'startinfo'});
$StartInfo{'Code'}{'Not loaded'}{$code} = $location;
+ } elsif (($code, $location) = ( $p1 =~ /^No ext program for\s+([^,]+), (tried: .+)/)) {
+ #TD No ext program for .kmz, tried: 7za, 7z
+ #TD No ext program for .F, tried: unfreeze, freeze -d, melt, fcat
+ next unless ($Opts{'startinfo'});
+ $StartInfo{'Code'}{'Not found'}{$code} = $location;
+
+
} elsif ( $p1 =~ /^starting\.\s+(.+) at \S+ (?:amavisd-new-|Maia Mailguard )([^,]+),/) {
#TD starting. /usr/local/sbin/amavisd at mailhost.example.com amavisd-new-2.5.0 (20070423), Unicode aware, LANG="C"
#TD starting. /usr/sbin/amavisd-maia at vwsw02.eon.no Maia Mailguard 1.0.2, Unicode aware, LANG=en_US.UTF-8
Modified: scripts/services/postfix
===================================================================
--- scripts/services/postfix 2014-09-08 19:15:49 UTC (rev 205)
+++ scripts/services/postfix 2014-09-08 19:39:13 UTC (rev 206)
@@ -55,7 +55,7 @@
no warnings "uninitialized";
use re 'taint';
-our $Version = '1.40.00';
+our $Version = '1.40.03';
our $progname_prefix = 'postfix';
# Specifies the default configuration file for use in standalone mode.
@@ -3586,7 +3586,7 @@
}
# Client TLS messages
- elsif ( ($status,$host,$type) = ($p1 =~ /^(?:(Verified|Trusted|Untrusted) )?TLS connection established to ([^ ]*): (.*)$/o)) {
+ elsif ( ($status,$host,$type) = ($p1 =~ /^(?:(Verified|Trusted|Untrusted|Anonymous) )?TLS connection established to ([^ ]*): (.*)$/o)) {
#TD TLS connection established to example.com: TLSv1 with cipher AES256-SHA (256/256 bits)
# Postfix 2.5+: peer verification status: Untrusted, Trusted or Verified when
# server's trust chain is valid and peername is matched
@@ -3931,6 +3931,8 @@
push @ignore_list, qr/^report recipient to all milters /;
push @ignore_list, qr/_action = defer_if_permit$/;
push @ignore_list, qr/^reject_invalid_hostname: /;
+ push @ignore_list, qr/^cfg_get_/;
+ push @ignore_list, qr/^sacl_check: /;
# non-anchored
#push @ignore_list, qr/: Greylisted for /;
@@ -4739,6 +4741,17 @@
#TDs warning: Read failed in network_biopair_interop with errno=0: num_read=0, want_read=11
$warning =~ s/^(Read failed in network_biopair_interop) with .*$/$1/;
+=cut
+ $warning =~ s/^(TLS library problem: )\d+:(error:.*)$/$1$2/;
+ $warning =~ s/^(network_biopair_interop: error reading) \d+ bytes(.*)$/$1$2/;
+
+1 TLS library problem: 10212:error:1408A0C1:SSL routines:SSL3_GET_CLIENT_HELLO:no shared cipher...
+1 TLS library problem: 10217:error:1408A0C1:SSL routines:SSL3_GET_CLIENT_HELLO:no shared cipher...
+1 network_biopair_interop: error reading 1102 bytes from the network: Connection reset by peer
+1 network_biopair_interop: error reading 1120 bytes from the network: Connection reset by peer
+=cut
+
+
$Totals{'warningsother'}++; return unless ($Collecting{'warningsother'});
$Counts{'warningsother'}{$warning}++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.