From 2aef98c62c6523d39c74731aafa136b65c8bdb15 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Thu, 22 May 2014 05:47:20 +0000
Subject: [PATCH] - Update to 2.1.10

PR:		189458
Submitted by:	Paul J Murphy <paul@inetstat.net>
Approved by:	maintainer
---
 mail/postfix-policyd-spf-perl/Makefile        | 14 +++++----
 mail/postfix-policyd-spf-perl/distinfo        |  4 +--
 .../files/patch-postfix-policyd-spf-perl      | 29 ++++++++++---------
 .../files/pkg-message.in                      |  2 +-
 mail/postfix-policyd-spf-perl/pkg-descr       |  2 +-
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/mail/postfix-policyd-spf-perl/Makefile b/mail/postfix-policyd-spf-perl/Makefile
index c376876f3c14..9c146c37520d 100644
--- a/mail/postfix-policyd-spf-perl/Makefile
+++ b/mail/postfix-policyd-spf-perl/Makefile
@@ -2,22 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	postfix-policyd-spf-perl
-PORTVERSION=	2.007
+PORTVERSION=	2.010
 CATEGORIES=	mail
-MASTER_SITES=	http://www.openspf.org/blobs/
+MASTER_SITES=	https://launchpadlibrarian.net/107864701/
 
 MAINTAINER=	ports.maintainer@evilphi.com
 COMMENT=	SPF policy service for Postfix written in Perl
 
-RUN_DEPENDS=	p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF \
+RUN_DEPENDS=	p5-Mail-SPF>=2.006:${PORTSDIR}/mail/p5-Mail-SPF \
 		p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
+		p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
 		p5-version>=0:${PORTSDIR}/devel/p5-version
 
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
 NO_BUILD=	yes
 
-PLIST_FILES=	sbin/postfix-policyd-spf-perl
+PLIST_FILES=	libexec/postfix-policyd-spf-perl
+SHEBANG_FILES=	postfix-policyd-spf-perl
 
 SUB_LIST=	PREFIX=${PREFIX}
 SUB_FILES=	pkg-message
@@ -42,6 +44,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '${REINPLACE}' ${WRKSRC}/postfix-policyd-spf-perl
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/postfix-policyd-spf-perl ${STAGEDIR}${PREFIX}/sbin
+	@${INSTALL_SCRIPT} ${WRKSRC}/postfix-policyd-spf-perl ${STAGEDIR}${PREFIX}/libexec
 
 .include <bsd.port.mk>
diff --git a/mail/postfix-policyd-spf-perl/distinfo b/mail/postfix-policyd-spf-perl/distinfo
index 14b1deba7d36..d6a84b746b7e 100644
--- a/mail/postfix-policyd-spf-perl/distinfo
+++ b/mail/postfix-policyd-spf-perl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (postfix-policyd-spf-perl-2.007.tar.gz) = 5137b03d9b6009684fe432451acb25db5513d7e9f69ccd218279d81d152a8cd3
-SIZE (postfix-policyd-spf-perl-2.007.tar.gz) = 13460
+SHA256 (postfix-policyd-spf-perl-2.010.tar.gz) = aafc09ed52e946572acf804b3c79caf464a1062df5710c2f2426276442f04042
+SIZE (postfix-policyd-spf-perl-2.010.tar.gz) = 13981
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
diff --git a/mail/postfix-policyd-spf-perl/pkg-descr b/mail/postfix-policyd-spf-perl/pkg-descr
index 74bc49bc4827..cdeb705eed36 100644
--- a/mail/postfix-policyd-spf-perl/pkg-descr
+++ b/mail/postfix-policyd-spf-perl/pkg-descr
@@ -1,4 +1,4 @@
 postfix-policyd-spf-perl is an RFC-4408-compliant SPF policy service for
 postfix written in Perl.
 
-WWW: http://www.openspf.org/Software/
+WWW: https://launchpad.net/postfix-policyd-spf-perl/