Date: Wednesday, September 7, 2016 @ 19:03:28 Author: bluewind Revision: 275827
Fix URIBL errors https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7231 upgpkg: spamassassin 3.4.1-4 Added: spamassassin/trunk/net-dns-1.01-compat-uribl.patch Modified: spamassassin/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 6 ++++-- net-dns-1.01-compat-uribl.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-09-07 17:57:00 UTC (rev 275826) +++ PKGBUILD 2016-09-07 19:03:28 UTC (rev 275827) @@ -4,7 +4,7 @@ # Contributor: Manolis Tzanidakis pkgname=spamassassin pkgver=3.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="A mail filter to identify spam." arch=('i686' 'x86_64') license=('APACHE') @@ -22,12 +22,13 @@ 'etc/mail/spamassassin/v330.pre') install="${pkgname}.install" source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc} - 'spamassassin.service' net-dns-1.01-compat.patch disable-sslv3.patch) + 'spamassassin.service' net-dns-1.01-compat.patch net-dns-1.01-compat-uribl.patch disable-sslv3.patch) validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814) md5sums=('76eca1f38c11635d319e62c26d5b034b' 'SKIP' '8adce028f25387ac3bc4dba697d209ed' '63458976671c35f423bd4e8033cfff3a' + '14f2e3dc93c560d6b5a7fd7d54e44e11' 'e6aeeae9828f305db72abb8707312ee7') prepare() { @@ -37,6 +38,7 @@ -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = "/bin/site_perl/";#' patch -i "$srcdir/net-dns-1.01-compat.patch" -p3 + patch -i "$srcdir/net-dns-1.01-compat-uribl.patch" -p3 # From Debian patch -i "$srcdir/disable-sslv3.patch" -p1 Added: net-dns-1.01-compat-uribl.patch =================================================================== --- net-dns-1.01-compat-uribl.patch (rev 0) +++ net-dns-1.01-compat-uribl.patch 2016-09-07 19:03:28 UTC (rev 275827) @@ -0,0 +1,27 @@ +--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2015/04/28 20:36:05 1676616 ++++ spamassassin/branches/3.4/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); + } + } + }
