diff --git a/.gitignore b/.gitignore index d05ae8c..614ff9e 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ mutt-1.5.23.tar.gz /mutt-1.14.4.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 +/mutt-2.0.5.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 fefa8e6..d22f63f 100644 --- a/mutt-1.9.4-lynx_no_backscapes.patch +++ b/mutt-1.9.4-lynx_no_backscapes.patch @@ -5,8 +5,8 @@ diff -up mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes mutt-1.9.1/doc/Makefile.a check: manual.txt: manual.html -- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ -+ -LC_ALL=C lynx -dump -nolist -display_charset=us-ascii manual.html > $@ || \ - LC_ALL=C w3m -dump 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 -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 9891db7..fd6c2d3 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,7 +19,7 @@ Summary: A text mode mail user agent Name: mutt -Version: 1.14.6 +Version: 2.0.5 Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except @@ -38,9 +38,11 @@ Patch9: mutt-1.9.0-ssl_ciphers.patch Patch10: mutt-1.9.4-lynx_no_backscapes.patch Patch12: mutt-1.9.5-nodotlock.patch Patch13: mutt-1.12.1-optusegpgagent.patch +Patch14:mutt_disable_ssl_enforce.patch Url: http://www.mutt.org Requires: mailcap, urlview +BuildRequires: make BuildRequires: gcc BuildRequires: ncurses-devel, gettext, automake # manual generation @@ -93,6 +95,7 @@ autoreconf --install %patch8 -p1 -b .system_certs %patch9 -p1 -b .ssl_ciphers %patch13 -p1 -b .optusegpgagent +%patch14 -p1 sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure @@ -211,6 +214,25 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Mon Feb 1 2021 Filip Januš -5:2.0.5-1 +- Rebase to upstream version 2.0.5 +- Fix CVE-2021-3181 + +* Tue Jan 19 2020 Filip Januš - 5:2.0.2-2 +- Add patch for remove enforcing ssl +- Patch is based on upstream commit + https://gitlab.com/muttmua/mutt/-/commit/9204b24e99767ae06b5df25eca55c028d702528b + +* 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 + +* Mon Aug 31 2020 Matej Mužila - 5:1.14.7-1 +- Upgrade to 1.14.7 + * Wed Jul 22 2020 Fabio Alessandro Locati - 5:1.14.6-1 - Upgrade to 1.14.6 diff --git a/mutt_disable_ssl_enforce.patch b/mutt_disable_ssl_enforce.patch new file mode 100644 index 0000000..a51ff77 --- /dev/null +++ b/mutt_disable_ssl_enforce.patch @@ -0,0 +1,26 @@ +Based on https://gitlab.com/muttmua/mutt/-/commit/9204b24e99767ae06b5df25eca55c028d702528b +This patch disable enforcing of ssl +diff -ur mutt-2.0.2/doc/manual.xml.head mutt_patch/doc/manual.xml.head +--- mutt-2.0.2/doc/manual.xml.head 2020-11-07 21:30:03.000000000 +0100 ++++ mutt_patch/doc/manual.xml.head 2021-01-27 20:21:05.964647359 +0100 +@@ -9104,7 +9104,7 @@ + + When connecting through a $tunnel + and $tunnel_is_secure is +- set (the default), Mutt will assume the connection to the server ++ set (Not the default!), Mutt will assume the connection to the server + through the pipe is already secured. Mutt will ignore $ssl_starttls and $ssl_force_tls, behaving as if TLS +diff -ur mutt-2.0.2/init.h mutt_patch/init.h +--- mutt-2.0.2/init.h 2020-11-20 02:28:59.000000000 +0100 ++++ mutt_patch/init.h 2021-01-27 20:20:09.696052996 +0100 +@@ -4021,7 +4021,7 @@ + ** The file containing a client certificate and its associated private + ** key. + */ +- { "ssl_force_tls", DT_BOOL, R_NONE, {.l=OPTSSLFORCETLS}, {.l=1} }, ++ { "ssl_force_tls", DT_BOOL, R_NONE, {.l=OPTSSLFORCETLS}, {.l=0} }, + /* + ** .pp + ** If this variable is \fIset\fP, Mutt will require that all connections diff --git a/sources b/sources index c26cf91..68af11e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-1.14.6.tar.gz) = a442b3f6b8fc4c1a5ed9a870a321c883aeeb736ce58820d393ee6d9c646a607790ad8aeeb1efa4f5394586484f3181fa8cbb6c90d82bbf2a74a046b07d1467e6 +SHA512 (mutt-2.0.5.tar.gz) = 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740