diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2014-05-22 05:47:20 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2014-05-22 05:47:20 +0000 |
commit | 2aef98c62c6523d39c74731aafa136b65c8bdb15 (patch) | |
tree | 40e10161c0b6534a8acfabb207f7d6bb047e017d /mail/postfix-policyd-spf-perl/files | |
parent | - Update to 1.5.3 (diff) |
- Update to 2.1.10
PR: 189458
Submitted by: Paul J Murphy <paul@inetstat.net>
Approved by: maintainer
Diffstat (limited to 'mail/postfix-policyd-spf-perl/files')
-rw-r--r-- | mail/postfix-policyd-spf-perl/files/patch-postfix-policyd-spf-perl | 29 | ||||
-rw-r--r-- | mail/postfix-policyd-spf-perl/files/pkg-message.in | 2 |
2 files changed, 16 insertions, 15 deletions
diff --git a/mail/postfix-policyd-spf-perl/files/patch-postfix-policyd-spf-perl b/mail/postfix-policyd-spf-perl/files/patch-postfix-policyd-spf-perl index d3a0c0b49769..23b9931e5360 100644 --- a/mail/postfix-policyd-spf-perl/files/patch-postfix-policyd-spf-perl +++ b/mail/postfix-policyd-spf-perl/files/patch-postfix-policyd-spf-perl @@ -1,25 +1,26 @@ ---- postfix-policyd-spf-perl.orig 2008-07-25 19:35:01.000000000 -0700 -+++ postfix-policyd-spf-perl 2009-01-25 16:46:38.991336330 -0800 -@@ -263,14 +263,14 @@ - info => "%s: SPF %s: HELO/EHLO: %s", - $attr->{queue_id}, $helo_result, $attr->{helo_name} - ); +--- ./postfix-policyd-spf-perl.orig 2012-06-18 03:50:55.000000000 +0000 ++++ ./postfix-policyd-spf-perl 2014-05-08 00:22:28.000000000 +0000 +@@ -284,7 +284,7 @@ + $attr->{helo_name} || '<UNKNOWN>' + ); + }; - return "550 $helo_authority_exp"; + return "%%SPF_FAIL%% $helo_authority_exp"; } elsif ($helo_result->is_code('temperror')) { - syslog( - info => "%s: SPF %s: HELO/EHLO: %s", - $attr->{queue_id}, $helo_result, $attr->{helo_name} - ); + if ($VERBOSE) { +@@ -294,7 +294,7 @@ + $attr->{helo_name} || '<UNKNOWN>' + ); + }; - return "DEFER_IF_PERMIT SPF-Result=$helo_local_exp"; + return "%%SPF_TEMPERROR%% SPF-Result=$helo_local_exp"; } elsif ($attr->{sender} eq '') { - syslog( -@@ -334,10 +334,10 @@ - $attr->{queue_id}, $mfrom_result, $attr->{sender} - ); + if ($VERBOSE) { +@@ -368,10 +368,10 @@ + ); + }; if ($mfrom_result->is_code('fail')) { - return "550 $mfrom_authority_exp"; + return "%%SPF_FAIL%% $mfrom_authority_exp"; diff --git a/mail/postfix-policyd-spf-perl/files/pkg-message.in b/mail/postfix-policyd-spf-perl/files/pkg-message.in index d853e2bd17cb..62266b1e1e7a 100644 --- a/mail/postfix-policyd-spf-perl/files/pkg-message.in +++ b/mail/postfix-policyd-spf-perl/files/pkg-message.in @@ -3,7 +3,7 @@ The service is not enabled by default. Enable it by doing the following: 1. Add the following to /etc/postfix/master.cf: spf-policy unix - n n - 0 spawn - user=nobody argv=%%PREFIX%%/sbin/postfix-policyd-spf-perl + user=nobody argv=%%PREFIX%%/libexec/postfix-policyd-spf-perl The user nobody is fine if you have no other daemons running as nobody. Otherwise, you should use a dedicated user and group for this policy |