diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/createlinks mezzanine_patched_smeserver-qpsmtpd-2.4.0/createlinks --- smeserver-qpsmtpd-2.4.0/createlinks 2016-04-15 13:13:52.254050154 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/createlinks 2016-04-15 13:06:01.531938659 +0200 @@ -80,14 +80,13 @@ for (qw( IP badhelo - badrcptto_patterns + badrcptto dnsbl_zones dnsbl_allow loglevel memory_threshold plugins relayclients norelayclients - require_resolvable_fromhost rhsbl_zones signatures_patterns plugin_dirs diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10header mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10header --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10header 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10header 2008-10-07 17:05:18.000000000 +0200 @@ -0,0 +1 @@ +# Format is pattern\s+Response - don't forget to tie the pattern if required diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoBangPaths mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoBangPaths --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoBangPaths 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoBangPaths 2005-04-29 23:20:03.000000000 +0200 @@ -0,0 +1 @@ +! Sorry, bang paths not accepted here diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoDoubleAt mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoDoubleAt --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoDoubleAt 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoDoubleAt 2005-04-29 23:20:07.000000000 +0200 @@ -0,0 +1 @@ +@.*@ Sorry, multiple at signs not accepted here diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoEmptyLocalPart mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoEmptyLocalPart --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoEmptyLocalPart 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoEmptyLocalPart 2008-10-07 17:05:18.000000000 +0200 @@ -0,0 +1 @@ +^@ Invalid recipient address diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoPercentHack mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoPercentHack --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoPercentHack 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto/10NoPercentHack 2005-04-29 23:20:13.000000000 +0200 @@ -0,0 +1 @@ +% Sorry, percent hack not accepted here diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10header mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10header --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10header 2008-10-07 17:05:18.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10header 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -# Format is pattern\s+Response - don't forget to tie the pattern if required diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoBangPaths mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoBangPaths --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoBangPaths 2005-04-29 23:20:03.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoBangPaths 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -! Sorry, bang paths not accepted here diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoDoubleAt mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoDoubleAt --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoDoubleAt 2005-04-29 23:20:07.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoDoubleAt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -@.*@ Sorry, multiple at signs not accepted here diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoEmptyLocalPart mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoEmptyLocalPart --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoEmptyLocalPart 2008-10-07 17:05:18.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoEmptyLocalPart 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -^@ Invalid recipient address diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoPercentHack mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoPercentHack --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoPercentHack 2005-04-29 23:20:13.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/badrcptto_patterns/10NoPercentHack 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -% Sorry, percent hack not accepted here diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10check_earlytalker mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10check_earlytalker --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10check_earlytalker 2005-04-21 07:40:44.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10check_earlytalker 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -check_earlytalker diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10earlytalker mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10earlytalker --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10earlytalker 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/10earlytalker 2016-04-15 12:12:57.849430942 +0200 @@ -0,0 +1 @@ +earlytalker diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14check_relay mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14check_relay --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14check_relay 2005-04-21 07:41:15.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14check_relay 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -check_relay diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14relay mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14relay --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14relay 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/14relay 2016-04-15 12:22:42.515538402 +0200 @@ -0,0 +1 @@ +relay diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15check_norelay mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15check_norelay --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15check_norelay 2005-04-26 06:24:08.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15check_norelay 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -check_norelay diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16require_resolvable_fromhost mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16require_resolvable_fromhost --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16require_resolvable_fromhost 2005-04-21 07:41:29.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16require_resolvable_fromhost 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -require_resolvable_fromhost diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16resolvable_fromhost mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16resolvable_fromhost --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16resolvable_fromhost 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/16resolvable_fromhost 2016-04-15 12:26:14.848574759 +0200 @@ -0,0 +1 @@ +resolvable_fromhost diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17check_basicheaders mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17check_basicheaders --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17check_basicheaders 2005-08-19 23:31:03.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17check_basicheaders 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -{ - $OUT = "check_basicheaders"; - - # Note: You can't specify a maximum offset of 0 days, but that's fair - my $days = $smtpd{MaximumDateOffset} || ''; - - $OUT .= " $days" if ($days); -} diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers 2016-04-15 12:35:27.135671290 +0200 @@ -0,0 +1,8 @@ +{ + $OUT = "headers"; + + # Note: You can't specify a maximum offset of 0 days, but that's fair + my $days = $smtpd{MaximumDateOffset} || ''; + + $OUT .= " future $days past $days" if ($days); +} diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30badmailfrom mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30badmailfrom --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30badmailfrom 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30badmailfrom 2016-04-15 12:46:45.786783430 +0200 @@ -0,0 +1 @@ +badmailfrom diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30check_badmailfrom mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30check_badmailfrom --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30check_badmailfrom 2005-04-21 07:42:07.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/30check_badmailfrom 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -check_badmailfrom diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/33check_badrcptto_patterns mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/33check_badrcptto_patterns --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/33check_badrcptto_patterns 2005-04-26 06:37:24.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/33check_badrcptto_patterns 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -check_badrcptto_patterns diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34badrcptto mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34badrcptto --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34badrcptto 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34badrcptto 2016-04-15 12:49:46.514810023 +0200 @@ -0,0 +1 @@ +badrcptto diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34check_badrcptto mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34check_badrcptto --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34check_badrcptto 2005-04-21 07:42:13.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/34check_badrcptto 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -check_badrcptto diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36check_spamhelo mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36check_spamhelo --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36check_spamhelo 2005-04-21 07:42:20.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36check_spamhelo 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -check_spamhelo diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36helo mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36helo --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36helo 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/36helo 2016-04-15 12:05:01.697458729 +0200 @@ -0,0 +1 @@ +helo diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/require_resolvable_fromhost/10RequireResolvableFromHost mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/require_resolvable_fromhost/10RequireResolvableFromHost --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/require_resolvable_fromhost/10RequireResolvableFromHost 2013-02-07 23:09:06.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/require_resolvable_fromhost/10RequireResolvableFromHost 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -1