diff options
| author | tron <tron@pkgsrc.org> | 2014-10-01 11:37:31 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2014-10-01 11:37:31 +0000 |
| commit | e18f09d0d9ddba465b2beb076e186b52a26432ac (patch) | |
| tree | 93d7c7b830fb0011f379acd6ade2dd2fd7868145 /mail | |
| parent | 9655ed142c5e14adc246eeea8df62340e017a3ad (diff) | |
| download | pkgsrc-e18f09d0d9ddba465b2beb076e186b52a26432ac.tar.gz | |
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 (limited to 'mail')
| -rw-r--r-- | mail/spamassassin/Makefile | 4 | ||||
| -rw-r--r-- | mail/spamassassin/distinfo | 3 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm | 23 |
3 files changed, 27 insertions, 3 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 4c7f3978d0a..8c2dde6440d 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -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 --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index 1429b2199e8..6349536b29b 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -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-Makefile.PL) = 965e6aa223f2e714630db45131918485a5730c48 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 --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..e08ebc14a00 --- /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 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; |