From 49ad0e9e32f2bd4d4878bab90bf85103741ec362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Mon, 22 Mar 2021 12:48:24 +0100 Subject: [PATCH 1/4] Rebase to version 2.0.6 --- mutt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index b7a23cd..b3fe15f 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,7 +19,7 @@ Summary: A text mode mail user agent Name: mutt -Version: 2.0.5 +Version: 2.0.6 Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except @@ -212,6 +212,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Mon Mar 22 2021 Filip Januš 5:2.0.6-1 +- Rebase to upstream version 2.0.6 + * Mon Feb 1 2021 Filip Januš -5:2.0.5-1 - Rebase to upstream version 2.0.5 - Fix CVE-2021-3181 From 0fc9e7f1b9529ec779080dd82487ed2af8002b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Mon, 22 Mar 2021 12:54:17 +0100 Subject: [PATCH 2/4] Import sources v2.0.6 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 614ff9e..2cf3f28 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ mutt-1.5.23.tar.gz /mutt-1.14.7.tar.gz /mutt-2.0.2.tar.gz /mutt-2.0.5.tar.gz +/mutt-2.0.6.tar.gz diff --git a/sources b/sources index 68af11e..f0eeb3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-2.0.5.tar.gz) = 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740 +SHA512 (mutt-2.0.6.tar.gz) = dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6 From cec1ef408cab4ada3a4c3c6b2cd0391c172dd1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Thu, 6 May 2021 13:21:29 +0200 Subject: [PATCH 3/4] Rebase to v2.0.7 Bugfix release --- .gitignore | 1 + mutt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2cf3f28..b97333d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ mutt-1.5.23.tar.gz /mutt-2.0.2.tar.gz /mutt-2.0.5.tar.gz /mutt-2.0.6.tar.gz +/mutt-2.0.7.tar.gz diff --git a/mutt.spec b/mutt.spec index b3fe15f..4423116 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,7 +19,7 @@ Summary: A text mode mail user agent Name: mutt -Version: 2.0.6 +Version: 2.0.7 Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except @@ -212,6 +212,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Thu May 6 2021 Filip Januš 5:2.0.7-1 +-Rebase to v2.0.7 + * Mon Mar 22 2021 Filip Januš 5:2.0.6-1 - Rebase to upstream version 2.0.6 diff --git a/sources b/sources index f0eeb3e..d180af0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-2.0.6.tar.gz) = dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6 +SHA512 (mutt-2.0.7.tar.gz) = 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30 From 43a18e50334c5e9ebe3889c0bf0f2d9d226218a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 18 May 2021 14:38:12 +0200 Subject: [PATCH 4/4] Ship the mutt_oauth2.py script as well (cherry picked from commit f036dd59992ff258b68fbe71ae6532ba2b18aeed) --- mutt.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index 4423116..37d48f2 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ Summary: A text mode mail user agent Name: mutt Version: 2.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -150,6 +150,11 @@ rm -f mutt_ssl.c # remove unique id in manual.html because multilib conflicts sed -i -r 's///g' doc/manual.html +# fix the shebang in mutt_oauth2.py & preserve the time stamp +oauth2_script="contrib/mutt_oauth2.py" +t=$(stat -c %y "${oauth2_script}") +sed -i "s:^#\!/usr/bin/env\s\+python3\s\?$:#!%{python3}:" "${oauth2_script}" +touch -d "$t" "${oauth2_script}" %install %make_install @@ -195,6 +200,7 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %{!?_licensedir:%global license %doc} %license COPYRIGHT GPL %doc ChangeLog NEWS README* UPDATING mutt_ldap_query +%doc contrib/mutt_oauth2.py contrib/mutt_oauth2.py.README %doc contrib/*.rc contrib/sample.* contrib/colors.* %doc doc/manual.html doc/manual.txt doc/smime-notes.txt %config(noreplace) %{_sysconfdir}/Muttrc @@ -212,6 +218,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Wed May 19 2021 Dan Čermák - 5:2.0.7-2 +- Ship the mutt_oauth2.py script as well + * Thu May 6 2021 Filip Januš 5:2.0.7-1 -Rebase to v2.0.7