Date: Sat, 15 Aug 2015 16:25:11 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394329 - in head/mail/spamassassin: . files Message-ID: <201508151625.t7FGPBjN050676@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Aug 15 16:25:10 2015 New Revision: 394329 URL: https://svnweb.freebsd.org/changeset/ports/394329 Log: Add a patch for SpamAssassin bug #7231 that resolves an incompatibility with the output of the new Net::DNS version. See https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?r1=1694126&r2=1694125&pathrev=1694126&view=patch for more information. PR: 202281 Submitted by: Mark Martinec, author of the upstream patch Added: head/mail/spamassassin/files/patch-bug7231 (contents, props changed) Modified: head/mail/spamassassin/Makefile Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Sat Aug 15 16:07:27 2015 (r394328) +++ head/mail/spamassassin/Makefile Sat Aug 15 16:25:10 2015 (r394329) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.1 -PORTREVISION?= 2 # also bump japanese/spamassassin +PORTREVISION?= 3 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} Added: head/mail/spamassassin/files/patch-bug7231 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamassassin/files/patch-bug7231 Sat Aug 15 16:25:10 2015 (r394329) @@ -0,0 +1,27 @@ +--- lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2015/08/04 23:14:23 1694125 ++++ lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2015/08/04 23:16:38 1694126 +@@ -942,9 +942,8 @@ + next unless (defined($str) && defined($dom)); + dbg("uridnsbl: got($j) NS for $dom: $str"); + +- if ($str =~ /IN\s+NS\s+(\S+)/) { +- my $nsmatch = lc $1; +- $nsmatch =~ s/\.$//; ++ if ($rr->type eq 'NS') { ++ my $nsmatch = lc $rr->nsdname; # available since at least Net::DNS 0.14 + my $nsrhblstr = $nsmatch; + my $fullnsrhblstr = $nsmatch; + +@@ -1025,9 +1024,9 @@ + } + dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str); + +- local $1; +- if ($str =~ /IN\s+A\s+(\S+)/) { +- $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1); ++ if ($rr->type eq 'A') { ++ my $ip_address = $rr->rdatastr; ++ $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address); + } + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508151625.t7FGPBjN050676>