[pkgsrc/trunk]: pkgsrc/mail/postgrey postgrey: Backport dedupe fix.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7ec9cf08f59
branches:  trunk
changeset: 339095:c7ec9cf08f59
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Sep 06 09:58:25 2019 +0000

description:
postgrey: Backport dedupe fix.

Requested in joyent/pkgsrc#214.  We can't yet upgrade to postgrey 1.37 as there
is no working distribution patch for the postgrey-targrey option, hence the
backport rather than upgrade.  Bump PKGREVISION.

diffstat:

 mail/postgrey/Makefile               |   4 ++--
 mail/postgrey/distinfo               |   3 ++-
 mail/postgrey/patches/patch-postgrey |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r ba609218a40f -r c7ec9cf08f59 mail/postgrey/Makefile
--- a/mail/postgrey/Makefile    Fri Sep 06 09:42:56 2019 +0000
+++ b/mail/postgrey/Makefile    Fri Sep 06 09:58:25 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2019/08/11 13:21:40 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/09/06 09:58:25 jperkin Exp $
 
 DISTNAME=      postgrey-1.36
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    mail
 MASTER_SITES=  http://postgrey.schweikert.ch/pub/
 
diff -r ba609218a40f -r c7ec9cf08f59 mail/postgrey/distinfo
--- a/mail/postgrey/distinfo    Fri Sep 06 09:42:56 2019 +0000
+++ b/mail/postgrey/distinfo    Fri Sep 06 09:58:25 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2019/04/27 11:33:03 wiz Exp $
+$NetBSD: distinfo,v 1.17 2019/09/06 09:58:25 jperkin Exp $
 
 SHA1 (postgrey-1.36.tar.gz) = 78d57e88a1a16a7a863a4a51dff2d88268d8f63e
 RMD160 (postgrey-1.36.tar.gz) = db87cb17774bb40df3200307c682e0083df87158
@@ -8,3 +8,4 @@
 RMD160 (targrey-0.31-postgrey-1.34.patch) = 19d4b54da630445c3c26a4dcfdc65643780cae45
 SHA512 (targrey-0.31-postgrey-1.34.patch) = af4433f08120ae6ab07179f1adb88ca8c86c142b68727657555cef04d84105912e8e67c969c860ea000930196c6046b7b2bef2647f04b202ceecaf163d8515d5
 Size (targrey-0.31-postgrey-1.34.patch) = 8555 bytes
+SHA1 (patch-postgrey) = cf53c987d6b5db70a242b7b3411645467ed0a663
diff -r ba609218a40f -r c7ec9cf08f59 mail/postgrey/patches/patch-postgrey
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postgrey/patches/patch-postgrey      Fri Sep 06 09:58:25 2019 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-postgrey,v 1.4 2019/09/06 09:58:26 jperkin Exp $
+
+Backport https://github.com/schweikert/postgrey/pull/34
+
+--- postgrey.orig      2019-09-06 09:53:38.119350175 +0000
++++ postgrey
+@@ -185,12 +185,6 @@ sub do_client_substitutions($$$)
+     my $ipaddr;
+     if($ip =~ /\./) {
+         # IPv4
+-        my @ip=split(/\./, $ip);
+-        return ($ip, undef) unless defined $ip[3];
+-        # skip if it contains the last two IP numbers in the hostname
+-        # (we assume it is a pool of dialup addresses of a provider)
+-        return ($ip, undef) if $revdns =~ /$ip[2]/ and $revdns =~ /$ip[3]/;
+-
+         $ipaddr = NetAddr::IP->new($ip, $self->{postgrey}{ipv4cidr});
+     }
+     elsif($ip =~ /:/) {