Date: Tue, 21 Jul 2015 12:56:53 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392630 - in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files Message-ID: <201507211256.t6LCurgk053439@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue Jul 21 12:56:52 2015 New Revision: 392630 URL: https://svnweb.freebsd.org/changeset/ports/392630 Log: 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 Added: head/mail/spamassassin/files/patch-DnsResolver.pm (contents, props changed) Modified: head/japanese/spamassassin/Makefile head/mail/spamassassin/Makefile Modified: head/japanese/spamassassin/Makefile ============================================================================== --- head/japanese/spamassassin/Makefile Tue Jul 21 12:51:19 2015 (r392629) +++ head/japanese/spamassassin/Makefile Tue Jul 21 12:56:52 2015 (r392630) @@ -1,7 +1,7 @@ # Created by: TAOKA Fumiyoshi # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= japanese mail perl5 PKGNAMEPREFIX= ja- Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Tue Jul 21 12:51:19 2015 (r392629) +++ head/mail/spamassassin/Makefile Tue Jul 21 12:56:52 2015 (r392630) @@ -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} Added: head/mail/spamassassin/files/patch-DnsResolver.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamassassin/files/patch-DnsResolver.pm Tue Jul 21 12:56:52 2015 (r392630) @@ -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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507211256.t6LCurgk053439>