add fix for SA bug 7223

diff --git a/debian/patches/bug_821385_dnsresolver b/debian/patches/bug_821385_dnsresolver
new file mode 100644 (file)
index 0000000..bc27430
--- /dev/null
+++ b/debian/patches/bug_821385_dnsresolver
@@ -0,0 +1,18 @@
+Origin: upstream, https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm?r1=1691992&r2=1691991&pathrev=1691992&view=patch
+Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821385
+
+Index: spamassassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm
+===================================================================
+--- spamassassin-3.4.1.orig/lib/Mail/SpamAssassin/DnsResolver.pm
++++ spamassassin-3.4.1/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) {

diff --git a/debian/patches/series b/debian/patches/series
index d2f17870161a4ff1cec295d62f24f9f600e69a65..3b4a0cd2dcba467fa162b95c297001dc3aa24b6e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-dkim.patch
 disable-dkim.patch

-bug_835494_perl_INC
\ No newline at end of file
+bug_835494_perl_INC
+bug_821385_dnsresolver