CVS commit: pkgsrc/mail/spamassassin

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Thu Nov 10 20:25:50 UTC 2016

Modified Files:
        pkgsrc/mail/spamassassin: Makefile distinfo
Added Files:
        pkgsrc/mail/spamassassin/patches:
            patch-lib_Mail_SpamAssassin_DnsResolver.pm

Log Message:
Add patch to fix SA working with >=Net::DNS-1.01, taken from upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/mail/spamassassin/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/spamassassin/distinfo
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/spamassassin/Makefile
diff -u pkgsrc/mail/spamassassin/Makefile:1.126 pkgsrc/mail/spamassassin/Makefile:1.127
--- pkgsrc/mail/spamassassin/Makefile:1.126     Wed Nov  2 21:09:02 2016
+++ pkgsrc/mail/spamassassin/Makefile   Thu Nov 10 20:25:50 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.126 2016/11/02 21:09:02 roy Exp $
+# $NetBSD: Makefile,v 1.127 2016/11/10 20:25:50 roy Exp $
 
 DISTNAME=      Mail-SpamAssassin-3.4.1
 PKGNAME=       spamassassin-3.4.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
@@ -36,7 +36,7 @@ DEPENDS+=     p5-Mail-DKIM>=0.40:../../mail/
 DEPENDS+=      p5-Mail-SPF-[0-9]*:../../mail/p5-Mail-SPF
 #DEPENDS+=     {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
 DEPENDS+=      p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP
-DEPENDS+=      p5-Net-DNS>=0.58:../../net/p5-Net-DNS
+DEPENDS+=      p5-Net-DNS>=1.01:../../net/p5-Net-DNS
 #DEPENDS+=     {perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
 DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=      re2c>=0.13.6:../../devel/re2c

Index: pkgsrc/mail/spamassassin/distinfo
diff -u pkgsrc/mail/spamassassin/distinfo:1.68 pkgsrc/mail/spamassassin/distinfo:1.69
--- pkgsrc/mail/spamassassin/distinfo:1.68      Fri Feb  5 16:08:54 2016
+++ pkgsrc/mail/spamassassin/distinfo   Thu Nov 10 20:25:50 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2016/02/05 16:08:54 prlw1 Exp $
+$NetBSD: distinfo,v 1.69 2016/11/10 20:25:50 roy Exp $
 
 SHA1 (Mail-SpamAssassin-3.4.1.tar.gz) = e7b342d30f4983f70f4234480b489ccc7d2aa615
 RMD160 (Mail-SpamAssassin-3.4.1.tar.gz) = 4b7d6a6def068eb015e8d4699db410ade76b28f3
@@ -11,6 +11,7 @@ Size (Mail-SpamAssassin-rules-3.4.1.r167
 SHA1 (patch-Makefile.PL) = d322d7fb7286d5cf87ca775f9c381db32626e060
 SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
+SHA1 (patch-lib_Mail_SpamAssassin_DnsResolver.pm) = 129386c70010f6005ff93d4c237c219fe5b8a4a9
 SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b
 SHA1 (patch-sa-update) = 59cba1287051042fc7f510f5e5ef462e2ee8d034
 SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4

Added files:

Index: pkgsrc/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm
diff -u /dev/null pkgsrc/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm:1.5
--- /dev/null   Thu Nov 10 20:25:50 2016
+++ pkgsrc/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm Thu Nov 10 20:25:50 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_Mail_SpamAssassin_DnsResolver.pm,v 1.5 2016/11/10 20:25:50 roy Exp $
+
+Taken from upstream to fix using newer Net::DNS
+
+--- lib/Mail/SpamAssassin/DnsResolver.pm.orig  2016-11-10 20:06:02.000000000 +0000
++++ lib/Mail/SpamAssassin/DnsResolver.pm
+@@ -592,6 +592,9 @@ sub new_dns_packet {
+   };
+ 
+   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) {