From owner-svn-ports-head@freebsd.org Tue Jul 21 12:56:54 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A6839A7A86; Tue, 21 Jul 2015 12:56:54 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A2471024; Tue, 21 Jul 2015 12:56:54 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6LCus65053442; Tue, 21 Jul 2015 12:56:54 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6LCurgk053439; Tue, 21 Jul 2015 12:56:53 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201507211256.t6LCurgk053439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 21 Jul 2015 12:56:53 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2015 12:56:54 -0000 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) {