Control: forward -1 https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7231 Control: tags -1 upstream fixed-upstream
Hi Noah, I have prepared an NMU based on the upstream patch, which resolves the issue of using uninitialized values in URIDNSBL.pm at line 1042. Please let me know whether you are going to upload a new version soon, or whether I should request sponsorship for an NMU by debian-mentors. Regards, Peter
--- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +spamassassin (3.4.1-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix uninitialized values in URIDNSBL.pm with Net::DNS 1.01 + (Closes: #760277) + + -- Peter Colberg <pe...@colberg.org> Thu, 29 Sep 2016 23:04:25 -0400 + spamassassin (3.4.1-5) unstable; urgency=medium * Fix "FTBFS with '.' removed from perl's @INC" with patch from --- a/debian/patches/bug_760277_net_dns_URIDNSBL +++ b/debian/patches/bug_760277_net_dns_URIDNSBL @@ -0,0 +1,34 @@ +Description: Fix uninitialized values in URIDNSBL.pm with Net::DNS 1.01 +Origin: upstream, https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?r1=1676616&r2=1694126&pathrev=1694126&view=patch +Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7231 +Bug-Debian: https://bugs.debian.org/760277 +Last-Update: 2016-09-29 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm ++++ b/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm +@@ -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); + } + } + } --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ disable_sslv3 bug_821385_dnsresolver bug_835494_perl_INC +bug_760277_net_dns_URIDNSBL