From 51dfec534f4715251b61ac4b70baf9d36f832104 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 30 Mar 2021 04:20:29 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/spamassassin.git#98f2e5374b2882c503ea95ae9e274c84ad06312f
---
 GeoIP-fix.patch   | 22 ----------------------
 sources           |  4 ++--
 spamassassin.spec | 15 +++++++--------
 3 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 GeoIP-fix.patch

diff --git a/GeoIP-fix.patch b/GeoIP-fix.patch
deleted file mode 100644
index 2123d96..0000000
--- a/GeoIP-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm	2020/11/20 06:45:02	1883659
-+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm	2020/11/20 07:33:00	1883660
-@@ -480,14 +480,14 @@
-     my $flags = 0;
-     my $flag_isp = 0;
-     my $flag_silent = 0;
--    eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_wanted >= $gip_have);
--    eval '$flag_silent = Geo::IP::GEOIP_SILENCE' if ($gip_wanted >= $gip_have);
--    eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_wanted >= $gip_have);
-+    eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_have >= $gip_wanted);
-+    eval '$flag_silent = GEOIP_SILENCE' if ($gip_have >= $gip_wanted);
-+    eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_have >= $gip_wanted);
- 
-    eval {
--    if ($flag_silent && $gic_wanted >= $gic_have) {
-+    if ($flag_silent && $gic_have >= $gic_wanted) {
-       $self->{geoip} = Geo::IP->new($flags | $flag_silent);
--      $self->{geoisp} = Geo::IP->open_type($flag_isp | $flag_silent | $flags);
-+      $self->{geoisp} = Geo::IP->open_type($flag_isp, $flag_silent | $flags);
-     } else {
-       open(OLDERR, ">&STDERR");
-       open(STDERR, ">", "/dev/null");
diff --git a/sources b/sources
index ebd67e8..d8bc842 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Mail-SpamAssassin-3.4.4.tar.bz2) = 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
-SHA512 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = cc2f6949db4662cdcaf5dcef922e69d18320a591deb7fb98c1fb729d91d37f5164052ab6cd2e294657334874fbfc0cccdefc750910e0453cb8da0b3f263b3ede
+SHA512 (Mail-SpamAssassin-3.4.5.tar.bz2) = 46096019ef3d2b6dadb7af0d076c22526786cccb669cd4bed131b64fa935863630ca9f3e78277bebba0ed75099be9fbce97a30a6478ed84093896a1ad3d8387a
+SHA512 (Mail-SpamAssassin-rules-3.4.5.r1887800.tgz) = d759ff2d6941a997e0b3f8db189d414c04eb07f63330f074a829bc0de26d8ea6c8c0e8e3d7efaabd0a1cede8ecc645059c7fd83333c1ce5409656e0ca23b06e1
diff --git a/spamassassin.spec b/spamassassin.spec
index 9af8d58..9b7c52a 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -58,14 +58,14 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
-Version: 3.4.4
+Version: 3.4.5
 #Release: 0.8.%%{prerev}%%{?dist}
-Release: 8%{?dist}
+Release: 1%{?dist}
 License: ASL 2.0
 URL: https://spamassassin.apache.org/
 Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2
 #Source0: %%{real_name}-%%{version}-%%{prerev}.tar.bz2
-Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1873061.tgz
+Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1887800.tgz
 #Source1: %%{real_name}-rules-%%{version}.%%{prerev}.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
@@ -90,9 +90,6 @@ Source17: sa-update.timer
 # Switch to using gnupg2 instead of gnupg1
 Patch0: spamassassin-3.3.2-gnupg2.patch
 Patch1: spamassassin-3.4.1-add-logfile-homedir-options.patch
-# Patches 100+ are SVN backports (DO NOT REUSE!)
-# https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7871
-Patch100: GeoIP-fix.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %if %{use_systemd} == 0
@@ -212,8 +209,6 @@ To filter spam for all users, add that line to /etc/procmailrc
 # Patches 0-99 are RH specific
 %patch0 -p1
 %patch1 -p1
-# Patches 100+ are SVN backports (DO NOT REUSE!)
-%patch100 -p3
 # end of patches
 
 echo "RHEL=%{?rhel} FEDORA=%{?fedora}"
@@ -393,6 +388,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Mar 25 2021 Kevin Fenzi <kevin@scrye.com> - 3.4.5-1
+- Update to 3.4.5. Fixes rhbz#1942575
+- Fixes CVE-2020-1946
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild