summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2019-09-06 09:58:25 +0000
committerjperkin <jperkin@pkgsrc.org>2019-09-06 09:58:25 +0000
commit92a85c25b1a0fd26ea5517f6ed718b146ebf61e3 (patch)
tree54f30e6020e30b93ee47b5b210768df918747248
parent80f33a14a5bdd63b149556490d754fc98268483a (diff)
downloadpkgsrc-92a85c25b1a0fd26ea5517f6ed718b146ebf61e3.tar.gz
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.
-rw-r--r--mail/postgrey/Makefile4
-rw-r--r--mail/postgrey/distinfo3
-rw-r--r--mail/postgrey/patches/patch-postgrey19
3 files changed, 23 insertions, 3 deletions
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index a52db4434f0..e862a72aac6 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -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 --git a/mail/postgrey/distinfo b/mail/postgrey/distinfo
index 07b97c4ee50..f490e299598 100644
--- a/mail/postgrey/distinfo
+++ b/mail/postgrey/distinfo
@@ -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) = 67f9a0dd22e79a9c1c2f428b5ea12f5a9e7271
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 --git a/mail/postgrey/patches/patch-postgrey b/mail/postgrey/patches/patch-postgrey
new file mode 100644
index 00000000000..60055d6ed53
--- /dev/null
+++ b/mail/postgrey/patches/patch-postgrey
@@ -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 =~ /:/) {