[pkgsrc/trunk]: pkgsrc/mail/spamassassin Make the DNSRBL based plug-ins work ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7734f20e550d
branches:  trunk
changeset: 639967:7734f20e550d
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Oct 01 11:37:31 2014 +0000

description:
Make the DNSRBL based plug-ins work with version 0.76 or newer of the
"p5-Net-DNS" package. Patch taken from the SVN repository.

diffstat:

 mail/spamassassin/Makefile                                           |   4 +-
 mail/spamassassin/distinfo                                           |   3 +-
 mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm |  23 ++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r 65d7243ae040 -r 7734f20e550d mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile        Wed Oct 01 11:13:47 2014 +0000
+++ b/mail/spamassassin/Makefile        Wed Oct 01 11:37:31 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2014/05/29 23:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2014/10/01 11:37:31 tron Exp $
 
 DISTNAME=      Mail-SpamAssassin-3.4.0
 PKGNAME=       spamassassin-3.4.0
-PKGREVISION=   1
+PKGREVISION=   2
 SVR4_PKGNAME=  sa
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
diff -r 65d7243ae040 -r 7734f20e550d mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo        Wed Oct 01 11:13:47 2014 +0000
+++ b/mail/spamassassin/distinfo        Wed Oct 01 11:37:31 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2014/04/26 13:55:10 tron Exp $
+$NetBSD: distinfo,v 1.63 2014/10/01 11:37:31 tron Exp $
 
 SHA1 (Mail-SpamAssassin-3.4.0.tar.gz) = 4dac1384282b6201f7d80cea8295933ef08e7e28
 RMD160 (Mail-SpamAssassin-3.4.0.tar.gz) = c3a9b4adaebfe62c279684349ce76ed36d304f26
@@ -16,6 +16,7 @@
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
+SHA1 (patch-lib_Mail_SpamAssassin_DnsResolver.pm) = 0ed96e5c35fdd1dacd27b4d29119206b1d3d1f58
 SHA1 (patch-lib_Mail_SpamAssassin_Message.pm) = 402b9769df65ae87c3beebcc9441e29619eed367
 SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b
 SHA1 (patch-sa-update) = 6ea354aa6b11740df1d25a807f5610115218294a
diff -r 65d7243ae040 -r 7734f20e550d mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm      Wed Oct 01 11:37:31 2014 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_Mail_SpamAssassin_DnsResolver.pm,v 1.3 2014/10/01 11:37:31 tron Exp $
+
+Make this work with Net::DNS 0.76 or newer.
+
+Patch taken from SVN repository:
+
+https://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?r1=1603518&r2=1603517&pathrev=1603518
+
+--- lib/Mail/SpamAssassin/DnsResolver.pm.orig  2014-02-07 08:36:28.000000000 +0000
++++ lib/Mail/SpamAssassin/DnsResolver.pm       2014-10-01 09:35:33.000000000 +0100
+@@ -204,8 +204,10 @@
+     @ns_addr_port = @{$self->{conf}->{dns_servers}};
+     dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
+   } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/resolv.conf
+-    @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
+-                        @{$res->{nameservers}});
++    my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
++                                                 : @{$res->{nameservers}};
++    my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
++    @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
+     dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
+   }
+   return @ns_addr_port;