mail/spamassassin, japanese/spamassassin: fix bug with dns/p5-Net-DNS change

Now that a port dns/p5-Net-DNS has been upgraded to version 1.01,
this revealed an incompatibility with DNS resolving in SpamAssassin.

In short: Net::DNS::Packet->new no longer sets the RD (recursion
desired) bit in new packets, so essentially DNS queries no longer
work. Details at:
  https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223

To bridge the time until SpamAssassin 3.4.2 gets released,
the attached patch is needed ( equivalent to
  https://svn.apache.org/viewvc?view=rev&rev=1691992 ).

For earlier version of dns/p5-Net-DNS this patch is redundant,
but does no harm.

PR:		201741
Submitted by:	Mark.Martinec@ijs.si
This commit is contained in:
Kurt Jaeger 2015-07-21 12:56:52 +00:00
parent 53a3544c77
commit e918a42233
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=392630
3 changed files with 14 additions and 2 deletions

View file

@ -1,7 +1,7 @@
# Created by: TAOKA Fumiyoshi
# $FreeBSD$
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= japanese mail perl5
PKGNAMEPREFIX= ja-

View file

@ -3,7 +3,7 @@
PORTNAME= spamassassin
PORTVERSION= 3.4.1
PORTREVISION?= 1 # also bump japanese/spamassassin
PORTREVISION?= 2 # also bump japanese/spamassassin
CATEGORIES?= mail perl5
MASTER_SITES= APACHE/spamassassin/source CPAN/Mail
DISTNAME= Mail-SpamAssassin-${PORTVERSION}

View file

@ -0,0 +1,12 @@
--- lib/Mail/SpamAssassin/DnsResolver.pm 2015/07/20 18:23:18 1691991
+++ lib/Mail/SpamAssassin/DnsResolver.pm 2015/07/20 18:24:48 1691992
@@ -592,6 +592,9 @@
};
if ($packet) {
+ # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223
+ $packet->header->rd(1);
+
# my $udp_payload_size = $self->{res}->udppacketsize;
my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
if ($udp_payload_size && $udp_payload_size > 512) {