From 7910492691eab83dd7881cca7d5a0a87c4635d69 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 1 Dec 2020 16:56:11 +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/mutt.git#30ddbfff99696288cd986904794e58e354c55cb5 --- .gitignore | 1 + mutt-1.8.0-cabundle.patch | 4 ++-- mutt-1.9.0-ssl_ciphers.patch | 4 ++-- mutt-1.9.4-lynx_no_backscapes.patch | 2 +- mutt.spec | 8 ++++++-- sources | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 16592f0..a1cf8a6 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ mutt-1.5.23.tar.gz /mutt-1.14.5.tar.gz /mutt-1.14.6.tar.gz /mutt-1.14.7.tar.gz +/mutt-2.0.2.tar.gz diff --git a/mutt-1.8.0-cabundle.patch b/mutt-1.8.0-cabundle.patch index 95c60c4..4489978 100644 --- a/mutt-1.8.0-cabundle.patch +++ b/mutt-1.8.0-cabundle.patch @@ -7,9 +7,9 @@ diff -ur mutt-1.8.0.orig/contrib/Makefile.am mutt-1.8.0/contrib/Makefile.am sample.vimrc-sidebar colors.default colors.linux smime.rc \ - ca-bundle.crt smime_keys_test.pl mutt_xtitle markdown2html \ + smime_keys_test.pl mutt_xtitle markdown2html \ - bgedit-detectgui.sh bgedit-screen-tmux.sh + bgedit-detectgui.sh bgedit-screen-tmux.sh \ + mutt_oauth2.py mutt_oauth2.py.README - EXTRA_DIST = language.txt language50.txt \ diff -ur mutt-1.8.0.orig/doc/smime-notes.txt mutt-1.8.0/doc/smime-notes.txt --- mutt-1.8.0.orig/doc/smime-notes.txt 2017-02-25 15:28:22.119997501 +0000 +++ mutt-1.8.0/doc/smime-notes.txt 2017-02-25 16:06:38.986242390 +0000 diff --git a/mutt-1.9.0-ssl_ciphers.patch b/mutt-1.9.0-ssl_ciphers.patch index 7092014..4f72310 100644 --- a/mutt-1.9.0-ssl_ciphers.patch +++ b/mutt-1.9.0-ssl_ciphers.patch @@ -9,7 +9,7 @@ diff -ur mutt-1.9.0.orig/init.h mutt-1.9.0/init.h + { "ssl_ciphers", DT_STR, R_NONE, {.p=&SslCiphers}, {.p="@SYSTEM"} }, /* ** .pp - ** Contains a colon-seperated list of ciphers to use when using SSL. + ** Contains a colon-separated list of ciphers to use when using SSL. diff -ur mutt-1.9.0.orig/mutt_ssl_gnutls.c mutt-1.9.0/mutt_ssl_gnutls.c --- mutt-1.9.0.orig/mutt_ssl_gnutls.c 2017-09-04 16:48:21.403528134 +0200 +++ mutt-1.9.0/mutt_ssl_gnutls.c 2017-09-04 16:51:16.081679141 +0200 @@ -19,7 +19,7 @@ diff -ur mutt-1.9.0.orig/mutt_ssl_gnutls.c mutt-1.9.0/mutt_ssl_gnutls.c +if (SslCiphers && strcmp(SslCiphers, "@SYSTEM")) +{ - if (!option(OPTTLSV1_3)) + if (!option (OPTTLSV1_3)) { nproto--; @@ -313,6 +315,7 @@ diff --git a/mutt-1.9.4-lynx_no_backscapes.patch b/mutt-1.9.4-lynx_no_backscapes.patch index d9d7284..d22f63f 100644 --- a/mutt-1.9.4-lynx_no_backscapes.patch +++ b/mutt-1.9.4-lynx_no_backscapes.patch @@ -7,6 +7,6 @@ diff -up mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes mutt-1.9.1/doc/Makefile.a manual.txt: manual.html - -LC_ALL=C lynx -localhost -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ + -LC_ALL=C lynx -localhost -dump -nolist -display_charset=us-ascii manual.html > $@ || \ - LC_ALL=C w3m -dump manual.html > $@ || \ + LC_ALL=C w3m -T text/html -I utf-8 -O utf-8 -dump < manual.html > $@ || \ LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ diff --git a/mutt.spec b/mutt.spec index d02a6be..7326614 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,8 +19,8 @@ Summary: A text mode mail user agent Name: mutt -Version: 1.14.7 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -211,6 +211,10 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Tue Dec 01 2020 Matej Mužila - 5:2.0.2-1 +- Upgrade to 2.0.2 +- Resolves: #1895629, #1900827, CVE-2020-28896 + * Tue Sep 01 2020 Matej Mužila - 5:1.14.7-2 - Fix mutt-1.9.4-lynx_no_backscapes.patch diff --git a/sources b/sources index dbcc672..e1eae2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-1.14.7.tar.gz) = dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c +SHA512 (mutt-2.0.2.tar.gz) = 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29