Pullup ticket #4509 - requested by tron

mail/spamassassin: bug fix

Revisions pulled up:
- mail/spamassassin/Makefile                                    1.115
- mail/spamassassin/distinfo                                    1.63
- mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm 1.3

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Oct  1 11:37:31 UTC 2014

   Modified Files:
   	pkgsrc/mail/spamassassin: Makefile distinfo
   Added Files:
   	pkgsrc/mail/spamassassin/patches:
   	    patch-lib_Mail_SpamAssassin_DnsResolver.pm

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


   To generate a diff of this commit:
   cvs rdiff -u -r1.114 -r1.115 pkgsrc/mail/spamassassin/Makefile
   cvs rdiff -u -r1.62 -r1.63 pkgsrc/mail/spamassassin/distinfo
   cvs rdiff -u -r0 -r1.3 \
       pkgsrc/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm

1 files changed, 23 insertions, 0 deletions

diff --git a/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm
new file mode 100644
index 00000000000..c1a76eed06d
--- /dev/null
+++ b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_Mail_SpamAssassin_DnsResolver.pm,v 1.3.2.2 2014/10/10 10:56:05 spz 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;