From b11e357784bc358d541ece5c7a3da0177d9ff9f7 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Mon, 10 Jan 2022 11:35:08 +0100
Subject: [PATCH] Update to fetchmail-6.4.24 (fixes CVE-2021-36386 and
 CVE-2021-39272)

---
 .gitignore     | 4 ++--
 fetchmail.spec | 8 ++++++--
 sources        | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff42981..767227f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/fetchmail-6.4.18.tar.xz
-/fetchmail-6.4.18.tar.xz.asc
+/fetchmail-6.4.24.tar.xz
+/fetchmail-6.4.24.tar.xz.asc
diff --git a/fetchmail.spec b/fetchmail.spec
index 4d5289c..af5d64d 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,7 +1,7 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.4.18
-Release: 4%{?dist}
+Version: 6.4.24
+Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
 # systemd service file
@@ -62,6 +62,10 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
 %config(noreplace) %attr(0600, mail, mail) %{_sysconfdir}/fetchmailrc.example
 
 %changelog
+* Mon Jan 10 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.24-1
+- Update to fetchmail-6.4.24 (fixes CVE-2021-36386 and CVE-2021-39272)
+  Resolves: #2005307, #1999276
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.4.18-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/sources b/sources
index 39e398d..5da1f93 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fetchmail-6.4.18.tar.xz) = b42c23c184af68ac41e222cdb19536bf03de3da6a4357e065d203444e32c1c46a7f8d825421332ef61116cf0ef608211da0ad93ebe65d1ec45bce7289ee9e234
-SHA512 (fetchmail-6.4.18.tar.xz.asc) = ff1d6e9ed0e03809110ed81e6f1ac9f562ca082ad23a9dbee652d87006772b230ade41505ca640e94e305a67245fcf7aa0ca820b2925418b873831cd1210e892
+SHA512 (fetchmail-6.4.24.tar.xz) = 710d3c20ea8edacb7eefdc440eb67115baf0ba1ca3f8bfb7ba6e572b046029b94fc87e7cb5038280b9717fd2541b28b780b33c7ed0729cf0f0139ebfd7e9a132
+SHA512 (fetchmail-6.4.24.tar.xz.asc) = 2e4137e59b3eb1c80bfde998c3fa240923e711d43a6a6ae9a533721df7f53e5727d9ab3c938ccc34817a2ec3f781197028ed9db4f5a56a7d78a53eab58b447c6