CVS commit: pkgsrc/mail/postgrey

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Sep  6 09:58:26 UTC 2019

Modified Files:
        pkgsrc/mail/postgrey: Makefile distinfo
Added Files:
        pkgsrc/mail/postgrey/patches: patch-postgrey

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/mail/postgrey/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/postgrey/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/mail/postgrey/patches/patch-postgrey

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/postgrey/Makefile
diff -u pkgsrc/mail/postgrey/Makefile:1.49 pkgsrc/mail/postgrey/Makefile:1.50
--- pkgsrc/mail/postgrey/Makefile:1.49  Sun Aug 11 13:21:40 2019
+++ pkgsrc/mail/postgrey/Makefile       Fri Sep  6 09:58:25 2019
@@ -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/
 

Index: pkgsrc/mail/postgrey/distinfo
diff -u pkgsrc/mail/postgrey/distinfo:1.16 pkgsrc/mail/postgrey/distinfo:1.17
--- pkgsrc/mail/postgrey/distinfo:1.16  Sat Apr 27 11:33:03 2019
+++ pkgsrc/mail/postgrey/distinfo       Fri Sep  6 09:58:25 2019
@@ -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 @@ SHA1 (targrey-0.31-postgrey-1.34.patch) 
 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

Added files:

Index: pkgsrc/mail/postgrey/patches/patch-postgrey
diff -u /dev/null pkgsrc/mail/postgrey/patches/patch-postgrey:1.4
--- /dev/null   Fri Sep  6 09:58:26 2019
+++ pkgsrc/mail/postgrey/patches/patch-postgrey Fri Sep  6 09:58:26 2019
@@ -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 =~ /:/) {