From c1edad2c54b0ddd860d880b80622487436c51eee Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 23 Oct 2017 16:13:57 -0700
Subject: [PATCH] Add upstream patch to stop sa-learn warnings. Fixes bug
 #1505317 Add upstream patch to stop DNS warnings. Fixes bug #1364932

---
 spamassassin-3.4.1-dns-warnings.patch | 28 +++++++++++++++++++++++++++
 spamassassin-3.4.1-salearn.patch      | 24 +++++++++++++++++++++++
 spamassassin.spec                     | 15 +++++++++++++-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 spamassassin-3.4.1-dns-warnings.patch
 create mode 100644 spamassassin-3.4.1-salearn.patch

diff --git a/spamassassin-3.4.1-dns-warnings.patch b/spamassassin-3.4.1-dns-warnings.patch
new file mode 100644
index 0000000..69ca539
--- /dev/null
+++ b/spamassassin-3.4.1-dns-warnings.patch
@@ -0,0 +1,28 @@
+diff -Nur Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+--- Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2015-04-28 12:56:47.000000000 -0700
++++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2017-10-23 16:02:04.798386891 -0700
+@@ -942,9 +942,8 @@
+     next unless (defined($str) && defined($dom));
+     dbg("uridnsbl: got($j) NS for $dom: $str");
+ 
+-    if ($str =~ /IN\s+NS\s+(\S+)/) {
+-      my $nsmatch = lc $1;
+-      $nsmatch =~ s/\.$//;
++    if ($rr->type eq 'NS') {
++      my $nsmatch = lc $rr->nsdname;  # available since at least Net::DNS 0.14
+       my $nsrhblstr = $nsmatch;
+       my $fullnsrhblstr = $nsmatch;
+ 
+@@ -1025,9 +1024,9 @@
+     }
+     dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
+ 
+-    local $1;
+-    if ($str =~ /IN\s+A\s+(\S+)/) {
+-      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1);
++    if ($rr->type eq 'A') {
++      my $ip_address = $rr->rdatastr;
++      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address);
+     }
+   }
+ }
diff --git a/spamassassin-3.4.1-salearn.patch b/spamassassin-3.4.1-salearn.patch
new file mode 100644
index 0000000..016fca4
--- /dev/null
+++ b/spamassassin-3.4.1-salearn.patch
@@ -0,0 +1,24 @@
+diff -Nur Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm
+--- Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm	2015-04-28 12:56:49.000000000 -0700
++++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm	2017-10-23 16:05:06.703069400 -0700
+@@ -914,16 +914,16 @@
+     $str .= shift @{$ary};
+   }
+   undef $ary;
+-  chomp ($str); $str .= " [...]\n";
+ 
+   # in case the last line was huge, trim it back to around 200 chars
+   local $1;
+-  $str =~ s/^(.{,200}).*$/$1/gs;
++  $str =~ s/^(.{200}).+$/$1 [...]/gm;
++  chomp ($str); $str .= "\n";
+ 
+   # now, some tidy-ups that make things look a bit prettier
+-  $str =~ s/-----Original Message-----.*$//gs;
++  $str =~ s/-----Original Message-----.*$//gm;
+   $str =~ s/This is a multi-part message in MIME format\.//gs;
+-  $str =~ s/[-_\*\.]{10,}//gs;
++  $str =~ s/[-_*.]{10,}//gs;
+   $str =~ s/\s+/ /gs;
+ 
+   # add "Content preview:" ourselves, so that the text aligns
diff --git a/spamassassin.spec b/spamassassin.spec
index 8427957..0fb2d0b 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -63,7 +63,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.4.1
 #Release: 0.8.%{prerev}%{?dist}
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -100,6 +100,13 @@ Patch100: spamassassin-3.4.1-netdns.patch
 # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7361
 Patch101: CRYPTO_malloc.patch
 Patch102: spamassassin-3.4.1-Fix-building-on-Perl-without-dot-in-INC.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1364932
+# https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?r1=1676616&r2=1694126&pathrev=1694126&view=patch
+Patch103: spamassassin-3.4.1-dns-warnings.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1505317
+# https://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?r1=1791010&r2=1791009&pathrev=1791010&view=patch
+Patch104: spamassassin-3.4.1-salearn.patch
+
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -185,6 +192,8 @@ To filter spam for all users, add that line to /etc/procmailrc
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
+%patch104 -p1
 # end of patches
 
 echo "RHEL=%{rhel} FEDORA=%{fedora}"
@@ -361,6 +370,10 @@ exit 0
 %endif
 
 %changelog
+* Mon Oct 23 2017 Kevin Fenzi <kevin@scrye.com> - 3.4.1-17
+- Add upstream patch to stop sa-learn warnings. Fixes bug #1505317
+- Add upstream patch to stop DNS warnings. Fixes bug #1364932
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild