diff options
| author | roy <roy@pkgsrc.org> | 2016-11-10 20:25:50 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2016-11-10 20:25:50 +0000 |
| commit | 92cf17a3f9d98fd120905b2c8b45e4989a1f241c (patch) | |
| tree | da0ccbd1e657ef8e34c9538e4b0bb31b6edec13e /mail | |
| parent | a00e0f7c237f66214fd3f4d651b3f8b69dff06a1 (diff) | |
| download | pkgsrc-92cf17a3f9d98fd120905b2c8b45e4989a1f241c.tar.gz | |
Add patch to fix SA working with >=Net::DNS-1.01, taken from upstream.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/spamassassin/Makefile | 6 | ||||
| -rw-r--r-- | mail/spamassassin/distinfo | 3 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm | 16 |
3 files changed, 21 insertions, 4 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index c3691e29579..29a23d574ab 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -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/p5-Mail-DKIM 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 diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index 11ffa21c616..a98f1e73dff 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -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.r1675274.tgz) = 270622 bytes 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 diff --git a/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm new file mode 100644 index 00000000000..83b1ec62803 --- /dev/null +++ b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm @@ -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) { |