From 9c0682008eba577cdf19474feedcc22985d6b37f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 01:47:58 -0500 Subject: [PATCH] import mutt-2.2.6-1.el9 --- .gitignore | 2 +- .mutt.metadata | 2 +- SOURCES/mutt-1.5.23-system_certs.patch | 2 +- SPECS/mutt.spec | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a9439c6..d2a2115 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mutt-2.1.5.tar.gz +SOURCES/mutt-2.2.6.tar.gz diff --git a/.mutt.metadata b/.mutt.metadata index 3aba02a..02256f1 100644 --- a/.mutt.metadata +++ b/.mutt.metadata @@ -1 +1 @@ -39910bb724a53518a26bc44a12cc6075eb216e2f SOURCES/mutt-2.1.5.tar.gz +3dabf53ea1a45e67fe77a5072bb4c104afb2ad1e SOURCES/mutt-2.2.6.tar.gz diff --git a/SOURCES/mutt-1.5.23-system_certs.patch b/SOURCES/mutt-1.5.23-system_certs.patch index b569788..dd1dc7f 100644 --- a/SOURCES/mutt-1.5.23-system_certs.patch +++ b/SOURCES/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/SPECS/mutt.spec b/SPECS/mutt.spec index 064e140..90d3b77 100644 --- a/SPECS/mutt.spec +++ b/SPECS/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