From c993b4c279b7d96bca98c73cc308dc4384b5e029 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Jul 18 2022 11:55:50 +0000
Subject: Update to fetchmail-6.4.31


Signed-off-by: Vitezslav Crhonek <vcrhonek@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index b39e7a4..6147758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/fetchmail-6.4.30.tar.xz
-/fetchmail-6.4.30.tar.xz.asc
+/fetchmail-6.4.31.tar.xz
+/fetchmail-6.4.31.tar.xz.asc
diff --git a/fetchmail-6.4.31-fix-man-version.patch b/fetchmail-6.4.31-fix-man-version.patch
new file mode 100644
index 0000000..cccc2e9
--- /dev/null
+++ b/fetchmail-6.4.31-fix-man-version.patch
@@ -0,0 +1,12 @@
+diff -up fetchmail-6.4.31/fetchmail.man.orig fetchmail-6.4.31/fetchmail.man
+--- fetchmail-6.4.31/fetchmail.man.orig	2022-07-16 13:49:31.000000000 +0200
++++ fetchmail-6.4.31/fetchmail.man	2022-07-18 09:14:14.211429683 +0200
+@@ -10,7 +10,7 @@
+ .\" Load www macros to process .URL requests, this requires groff:
+ .mso www.tmac
+ .\"
+-.TH fetchmail 1 2022-02-18 "fetchmail 6.4.30" "fetchmail reference manual"
++.TH fetchmail 1 2022-07-16 "fetchmail 6.4.31" "fetchmail reference manual"
+ 
+ .SH NAME
+ fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
diff --git a/fetchmail.spec b/fetchmail.spec
index 72b6e79..176593d 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,12 +1,14 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.4.30
+Version: 6.4.31
 Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
 URL: http://www.fetchmail.info/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
+# Patch0: fixes version in manpage, backported from upstream
+Patch0: fetchmail-6.4.31-fix-man-version.patch
 BuildRequires: gcc gettext-devel krb5-devel openssl-devel python3-devel
 BuildRequires: make
 
@@ -23,6 +25,7 @@ connections.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-man-version
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --without-hesiod \
@@ -48,6 +51,9 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
 %{_mandir}/man1/fetchmail.1*
 
 %changelog
+* Mon Jul 18 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.31-1
+- Update to fetchmail-6.4.31
+
 * Thu May 05 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.30-1
 - Update to fetchmail-6.4.30
 
diff --git a/sources b/sources
index 1a65eec..ba3e62e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fetchmail-6.4.30.tar.xz) = 0ec540c4102267e6e72fefa5e76aa76f45d25a0e68ec40f1fd834719f2a4b5f3f78c587b050fc33d97dd8fc6f674950949e5c23f960ebcd3046d5cc2e06db1d0
-SHA512 (fetchmail-6.4.30.tar.xz.asc) = d9be26a06c7ee16565555b82225aae2955cb989ab6d914b35c127129dcf1df167fedfd7a2f8190cc9afd0f7561281e381e7ce39cab16508a416be5065e7ae013
+SHA512 (fetchmail-6.4.31.tar.xz) = 08aa8dc2c09d59aad5815479e3b6d449a0e65a1d3e8f62fe0cc30d15d9ac94d780b8e88074f43941a7e442b536808260794ac39d6257e24dea4f16ac0627d539
+SHA512 (fetchmail-6.4.31.tar.xz.asc) = fdac149deb54d1e86f20a0bbee7c53a07fae633e7675b0912c305c759ad1989d23a42f72292fdfa3a87f902469a5bf3c5a5a831566c4179f68a5e2c206e5e2cb