diff -urN ../Mail-SpamAssassin-3.4.1.orig/spamd/spamd.raw ./spamd/spamd.raw --- ../Mail-SpamAssassin-3.4.1.orig/spamd/spamd.raw 2015-04-28 22:56:59.000000000 +0300 +++ ./spamd/spamd.raw 2018-06-30 20:06:21.561404000 +0300 @@ -1434,7 +1434,7 @@ # in case. # bug 4699: this is the alarm that often ends up with an empty $@ - my $timer = Mail::SpamAssassin::Timeout->new({ secs => 20 }); + my $timer = Mail::SpamAssassin::Timeout->new({ secs => 40 }); my $err = $timer->run(sub { while(my($k,$v) = each %msa_backup) { @@ -2979,7 +2979,7 @@ my $child_stat; # Bug 6191, Bug 6258: takes almost two minutes on a slow machine # for a forked child process to report back, bump limit to 180 seconds - for (my $retry=180, my $waited=0; + for (my $retry=360, my $waited=0; $retry > 0 && !$serverstarted && $waited != $pid; $retry--) {