mail/postgrey: Update to 1.37

* 2016-09-22: version 1.37
   - added initial test suite
   - testing using travis-ci (https://travis-ci.org/schweikert/postgrey)
   - removed IP pool-detection code for --lookup-by-net, because it matched
     also the naming of some big hosters like facebook (#32, Michal Petrucha,
     Andrew Ayer, Jon Sailor)
   - fix early logging of errors and warnings to syslog
   - simplified IP matching code
   - added support for IPv6 whitelists with netmask
   - add network-range based whitelist for Office 365 (Holger Stember)
   - updated whitelist

4 files changed, 13 insertions, 34 deletions

diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index 38df6b44ce9..0cf09ff6e7f 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2021/05/24 19:52:52 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2021/10/20 16:15:52 tm Exp $
 
-DISTNAME=	postgrey-1.36
-PKGREVISION=	8
+DISTNAME=	postgrey-1.37
 CATEGORIES=	mail
 MASTER_SITES=	http://postgrey.schweikert.ch/pub/
 
diff --git a/mail/postgrey/distinfo b/mail/postgrey/distinfo
index ec02b1cba1e..bba850c8f7f 100644
--- a/mail/postgrey/distinfo
+++ b/mail/postgrey/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2021/10/07 14:25:39 nia Exp $
+$NetBSD: distinfo,v 1.19 2021/10/20 16:15:52 tm Exp $
 
-RMD160 (postgrey-1.36.tar.gz) = db87cb17774bb40df3200307c682e0083df87158
-SHA512 (postgrey-1.36.tar.gz) = 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395
-Size (postgrey-1.36.tar.gz) = 38797 bytes
-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
+RMD160 (postgrey-1.37.tar.gz) = ec148e96d3d70e26d25f12f8fdf842f8c7444e60
+SHA512 (postgrey-1.37.tar.gz) = 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca
+Size (postgrey-1.37.tar.gz) = 41815 bytes
+RMD160 (targrey-0.31-postgrey-1.37.patch) = fa5c93cc1167834efe27ff71a88bdc758951c5ed
+SHA512 (targrey-0.31-postgrey-1.37.patch) = 4b993028df6217713a8ce9a054f1b9cd43099ef396cad0b3355647149c41c6564f633992aac9dc3eb8eb276975dae822195031ab06514824b8e6ce4b1258d539
+Size (targrey-0.31-postgrey-1.37.patch) = 8574 bytes
diff --git a/mail/postgrey/options.mk b/mail/postgrey/options.mk
index df14853aba8..a256fed9e4b 100644
--- a/mail/postgrey/options.mk
+++ b/mail/postgrey/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/10/12 11:10:34 fhajny Exp $
+# $NetBSD: options.mk,v 1.3 2021/10/20 16:15:52 tm Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgrey
 PKG_SUPPORTED_OPTIONS=	postgrey-targrey
@@ -6,8 +6,8 @@ PKG_SUPPORTED_OPTIONS=	postgrey-targrey
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpostgrey-targrey)
-# See http://k2net.hakuba.jp/targrey/index.en.html
-PATCHFILES+=		targrey-0.31-postgrey-1.34.patch
-PATCH_SITES=		http://k2net.hakuba.jp/pub/
+ See http://k2net.hakuba.jp/targrey/index.en.html
+PATCHFILES+=		targrey-0.31-postgrey-1.37.patch
+PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCH_DIST_STRIP=	-p0
 .endif
diff --git a/mail/postgrey/patches/patch-postgrey b/mail/postgrey/patches/patch-postgrey
deleted file mode 100644
index 60055d6ed53..00000000000
--- a/mail/postgrey/patches/patch-postgrey
+++ /dev/null
@@ -1,19 +0,0 @@
-$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 =~ /:/) {