#s/Exim \K\d+[._]\d+[\w_-]*/x.yz/i;
# Replace Exim message ids by a unique series
- s/((?:[^\W_]{6}-){2}[^\W_]{2})
+ s/(\d[^\W_]{5}-[^\W_]{6}-[^\W_]{2})
/new_value($1, "10Hm%s-0005vi-00", \$next_msgid)/egx;
# The names of lock files appear in some error and debug messages
s/(TLS error on connection from .* \(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/;
next if /SSL verify error: depth=0 error=certificate not trusted/;
+ # OpenSSL 3.0.0
+ s/TLS error \(D-H param setting .* error:\K.*dh key too small/xxxxxxxx:SSL routines::dh key too small/;
+
# ======== Maildir things ========
# timestamp output in maildir processing
s/(timestamp=|\(timestamp_only\): )\d+/$1ddddddd/g;
next if /^watch dir/;
next if /^watch file .*\/usr\/local/;
next if /^watch file .*\/etc\/ssl/;
+ next if /^closing watch fd:/;
# TLS preload
# there happen in different orders for OpenSSL/GnuTLS/noTLS
next if /^Lookups \(built-in\):/;
next if /^Loading lookup modules from/;
next if /^Loaded \d+ lookup modules/;
- next if /^Total \d+ lookups/;
+ next if /^(?:\d\d:\d\d:\d\d \d+ )?Total \d+ lookups/;
# drop compiler information
next if /^Compiler:/;
$_ = $line . $_;
}
+ # Different builds will have different lookup types included
+ s/^search_type \K\d+ \((\w+)\) quoting -1 \(none\)$/NN ($1) quoting -1 (none)/;
+
# DISABLE_OCSP
next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
s/^errno = \d+$/errno = EEE/;
s/^writing error \d+: /writing error EEE: /;
- # Some platforms have to flip to slow-mode taint-checking
- next if /switching to slow-mode taint checking/;
+ # Time-only, in debug output
+ # we have to handle double lines from the DBOPEN, hence placed down here and /mg
+ s/^\d\d:\d\d:\d\d\s/01:01:01 /mg;
+
+ # pid in debug lines
+ s/^(\d\d:\d\d:\d\d)(\s\d+\s)/"$1 " . new_value($2, "%s", \$next_pid) . " "/mgxe;
+ s/(?<!post-)[Pp]rocess\K(\s\d+ )/new_value($1, "%s", \$next_pid) . " "/gxe;
# When Exim is checking the size of directories for maildir, it uses
# the check_dir_size() function to scan directories. Of course, the order
/^Routers:/ ||
/^Transports:/ ||
/^Malware:/ ||
- /^log selectors =/ ||
+ /^(?:\d\d:\d\d:\d\d \d+ )?log selectors =/ ||
/^cwd=/ ||
/^Fixed never_users:/ ||
/^Configure owner:/ ||
'debuglog_stdout' =>
{ 'stdout' => 's/^\d\d:\d\d:\d\d\s+\d+ //;
- s/Process \d+ is ready for new message/Process pppp is ready for new message/'
+ s/Process \d+ is ready for new message/Process pppp is ready for new message/;
+ s/^(?:daemon-accept forked for daemon-accept-delivery:|forked delivery process) \K\d+$/pppp/;'
},
'timeout_errno' => # actual errno differs Solaris vs. Linux