From 6fcfa7813d2ec800ca294246441f682717b7f494 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 23 Nov 2020 06:17:25 +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#8b9eaf3e02170562bff58fc8acc1b1f369e1ca8d
---
 GeoIP-fix.patch   | 22 ++++++++++++++++++++++
 spamassassin.spec |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 GeoIP-fix.patch

diff --git a/GeoIP-fix.patch b/GeoIP-fix.patch
new file mode 100644
index 0000000..2123d96
--- /dev/null
+++ b/GeoIP-fix.patch
@@ -0,0 +1,22 @@
+--- 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/spamassassin.spec b/spamassassin.spec
index 1f76db4..a814fbf 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.4.4
 #Release: 0.8.%%{prerev}%%{?dist}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: ASL 2.0
 URL: https://spamassassin.apache.org/
 Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2
@@ -91,6 +91,8 @@ Source17: sa-update.timer
 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
@@ -210,6 +212,7 @@ To filter spam for all users, add that line to /etc/procmailrc
 %patch0 -p1
 %patch1 -p1
 # Patches 100+ are SVN backports (DO NOT REUSE!)
+%patch100 -p3
 # end of patches
 
 echo "RHEL=%{?rhel} FEDORA=%{?fedora}"
@@ -389,6 +392,9 @@ exit 0
 %endif
 
 %changelog
+* Sat Nov 21 2020 Kevin Fenzi <kevin@scrye.com> - 3.4.4-7
+- Add upstreamed patch for GeoIP handling.
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild