Michael Orlitzky [Fri, 28 Dec 2018 14:40:36 +0000 (09:40 -0500)]
Ignore "will bind to" lines in addition to "bind to" lines.
In amavisd-new-2.11.0-rc1, the informational "bind to..." messages
were changed to say "will bind to..." instead. This commit updates the
@ignore_list_final regular expression to match both forms.
Michael Orlitzky [Fri, 28 Dec 2018 14:33:07 +0000 (09:33 -0500)]
Ignore "no $pid_file configured, not checking it" lines.
When no PID file is configured (for example, when amavisd is running
in the foreground), this message is logged. We already ignore the
other types of PID file notifications, so ignore this one too.
Michael Orlitzky [Fri, 28 Dec 2018 14:23:52 +0000 (09:23 -0500)]
Ignore all "sd_notify" lines.
Lines beginning with either "sd_notify:" or "sd_notify (no socket):"
contain information about what is being sent to the systemd
notification socket, if one exists. One such line was already being
ignored, but we don't want any of them. So, the existing
@ignore_list_final entry was expanded to encompass all such messages.
Ignore errors from the File::LibMagic describe_filename function.
Newer versions of amavisd-new can make use of the File::LibMagic
library (as opposed to the "file" executable) to get information about
attachments. Using the library should be faster, but when it fails, it
does so in a novel way:
These were unmatched, because the "-ENCRYPTED" suffix is new. One
regular expression and a dictionary have been updated to catch those
lines and dump them into the "unchecked" bin with the rest of the
UNCHECKED lines.
were previously unmatched because of the relatively-new "UTF8SMTP".
Similar lines that have "ESMTP" instead of "UTF8SMTP" are already
ignored, so it makes sense to ignore the "UTF8SMTP" lines too.
Michael Orlitzky [Thu, 24 Aug 2017 12:20:59 +0000 (08:20 -0400)]
Fix redundant argument to sprintf warning.
Perl 5.22 now warns about redundant (i.e. extra) arguments to the
sprintf function. If your format string only has two place-holders but
you pass three place-fillers, you get warned:
Redundant argument in sprintf at ./amavis-logwatch line 1338...
The issue there was that the format string passed to sprintf was
constructed dynamically; sometimes it would contain two place-holders,
and sometimes three. Three place-fillers were always passed, so when
only two place-holders were used, the warning would be thrown. This was
fixed by testing whether or not there are two or three place-holders,
and passing the appropriate number of place-fillers.
Michael Orlitzky [Thu, 24 Aug 2017 12:16:05 +0000 (08:16 -0400)]
Fix unescaped left brace warning in monster regex.
New versions of Perl are starting to complain about unescaped braces
in regular expressions, and supposedly the warning will become a fatal
error in Perl 5.30. This particular warning is,
Unescaped left brace in regex is deprecated, passed through in regex;
marked by <-- HERE in m/^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)
|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?:
{ <-- HERE [^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]),
(?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/ at
/usr/bin/amavis-logwatch line 2286.
and it was fixed by going to line 2286 and putting a backslash before
the left brace.