From 56cb3ffec6ef2165ae2ccca70c08ea6153c9d0a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Mu=C5=BEila?= Date: Mon, 25 Jul 2022 11:10:45 +0200 Subject: [PATCH] Rebase to upstream version 2.2.6 Resolves: CVE-2022-1328 --- .gitignore | 1 + mutt-1.5.23-system_certs.patch | 2 +- mutt.spec | 6 +++++- sources | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 02e8a58..038b026 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ mutt-1.5.23.tar.gz /mutt-2.0.5.tar.gz /mutt-2.0.6.tar.gz /mutt-2.1.5.tar.gz +/mutt-2.2.6.tar.gz diff --git a/mutt-1.5.23-system_certs.patch b/mutt-1.5.23-system_certs.patch index b569788..dd1dc7f 100644 --- a/mutt-1.5.23-system_certs.patch +++ b/mutt-1.5.23-system_certs.patch @@ -4,7 +4,7 @@ diff -rup mutt-17a4f92e4a95-orig/init.h mutt-17a4f92e4a95-new/init.h @@ -2989,7 +2989,7 @@ struct option_t MuttVars[] = { */ #if defined(USE_SSL) - #ifdef USE_SSL_GNUTLS + # ifdef USE_SSL_GNUTLS - { "ssl_ca_certificates_file", DT_PATH, R_NONE, {.p=&SslCACertFile}, {.p=0} }, + { "ssl_ca_certificates_file", DT_PATH, R_NONE, {.p=&SslCACertFile}, {.p="/etc/ssl/certs/ca-bundle.crt"} }, /* diff --git a/mutt.spec b/mutt.spec index 064e140..90d3b77 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,7 +19,7 @@ Summary: A text mode mail user agent Name: mutt -Version: 2.1.5 +Version: 2.2.6 Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except @@ -212,6 +212,10 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Mon Jul 25 2022 Matej Mužila - 5:2.2.6-1 +- Rebase to upstream version 2.2.6 + Resolves: CVE-2022-1328 + * Tue Jan 11 2022 Matej Mužila - 5:2.1.5-1 - Rebase to upstream version 2.1.5 Resolves: rhbz#2032988 rhbz#1959896 diff --git a/sources b/sources index 5ffca84..aebe759 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-2.1.5.tar.gz) = 8daf534ef6b8f97bdbbc1bccb64dad51de6fe0fbdb41d3d5cbe418fe234000dc09ea2b790d2529c205f16b89c6963b6de98eaa2fdc6e3f5b55a3cb5f7962e0d5 +SHA512 (mutt-2.2.6.tar.gz) = 07d473b6e6774f3988538e799fcc73ad35efceb5b1a3ee377754332f34db664d40ffa650711c7720ddc5c248e5379bba19fc5fd3dc7418a25305780e25f3b52b