From 53234dce601b5be6f61da44ebd3e7d84054a539f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Mu=C5=BEila?= Date: Mon, 1 Apr 2019 17:03:23 +0200 Subject: [PATCH 1/8] Add smoke test --- tests/tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 tests/tests.yml diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..fad7c5d --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,9 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + tests: + - simple: + dir: . + run: mutt --help From f523ad5d1b44552ce1696647657186a491869493 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 22 Jul 2025 23:42:31 +0200 Subject: [PATCH 2/8] adjust to Dropping of cert.pem file system change --- mutt-1.5.23-system_certs.patch | 19 ++++++++++++++----- mutt.spec | 5 ++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mutt-1.5.23-system_certs.patch b/mutt-1.5.23-system_certs.patch index dd1dc7f..2cb75fc 100644 --- a/mutt-1.5.23-system_certs.patch +++ b/mutt-1.5.23-system_certs.patch @@ -1,12 +1,21 @@ -diff -rup mutt-17a4f92e4a95-orig/init.h mutt-17a4f92e4a95-new/init.h ---- mutt-17a4f92e4a95-orig/init.h 2015-06-07 22:59:32.000000000 +0200 -+++ mutt-17a4f92e4a95-new/init.h 2015-06-25 15:28:56.095570332 +0200 -@@ -2989,7 +2989,7 @@ struct option_t MuttVars[] = { +diff -up mutt-2.2.14/init.h.system_certs mutt-2.2.14/init.h +--- mutt-2.2.14/init.h.system_certs 2025-02-20 06:31:10.000000000 +0100 ++++ mutt-2.2.14/init.h 2025-07-22 23:31:06.259171517 +0200 +@@ -4315,7 +4315,7 @@ struct option_t MuttVars[] = { */ #if defined(USE_SSL) # 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"} }, ++ { "ssl_ca_certificates_file", DT_PATH, R_NONE, {.p=&SslCACertFile}, {.p="/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"} }, /* ** .pp ** This variable specifies a file containing trusted CA certificates. +@@ -4324,7 +4324,7 @@ struct option_t MuttVars[] = { + ** .pp + ** Example: + ** .ts +- ** set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt ++ ** set ssl_ca_certificates_file=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + ** .te + */ + # endif /* USE_SSL_GNUTLS */ diff --git a/mutt.spec b/mutt.spec index 1057756..3f76e10 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ Summary: A text mode mail user agent Name: mutt Version: 2.2.14 -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 @@ -219,6 +219,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Tue Jul 22 2025 Michal Hlavinka - 5:2.2.14-2 +- adjust to Dropping of cert.pem file system change + * Mon Feb 24 2025 Michal Hlavinka - 5:2.2.14-1 - updated to 2.2.14 (#2346767) From 22697dfee7b89365795f893cd7801f4c2a95293b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:31:33 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mutt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index 3f76e10..f049d30 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ Summary: A text mode mail user agent Name: mutt Version: 2.2.14 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -219,6 +219,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 5:2.2.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 22 2025 Michal Hlavinka - 5:2.2.14-2 - adjust to Dropping of cert.pem file system change From a369e6f586ec82bae110ee579270b5a1e6797cfc Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 1 Aug 2025 07:48:48 +0200 Subject: [PATCH 4/8] fix FTBFS (rhbz#2385201) --- mutt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mutt.spec b/mutt.spec index f049d30..0a45312 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ Summary: A text mode mail user agent Name: mutt Version: 2.2.14 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -88,7 +88,7 @@ for selecting groups of messages. %patch -P12 -p1 -b .nodotlock %patch -P14 -p1 -autoreconf --install +autoreconf -fiv %patch -P1 -p1 -b .muttrc %patch -P2 -p1 -b .cabundle %patch -P3 -p1 -b .syncdebug @@ -219,6 +219,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Fri Aug 01 2025 Michal Hlavinka - 5:2.2.14-4 +- fix FTBFS (rhbz#2385201) + * Thu Jul 24 2025 Fedora Release Engineering - 5:2.2.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 339844f64d8dc0796e34ca6b27e1edd2c76a7603 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 3 Nov 2025 11:59:54 +0100 Subject: [PATCH 5/8] updated to 2.2.15 (#2400970) --- .gitignore | 1 + mutt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a00c28f..ce59f3b 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ mutt-1.5.23.tar.gz /mutt-2.2.12.tar.gz /mutt-2.2.13.tar.gz /mutt-2.2.14.tar.gz +/mutt-2.2.15.tar.gz diff --git a/mutt.spec b/mutt.spec index 0a45312..60631b0 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,8 +19,8 @@ Summary: A text mode mail user agent Name: mutt -Version: 2.2.14 -Release: 4%{?dist} +Version: 2.2.15 +Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -219,6 +219,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Mon Nov 03 2025 Michal Hlavinka - 5:2.2.15-1 +- updated to 2.2.15 (#2400970) + * Fri Aug 01 2025 Michal Hlavinka - 5:2.2.14-4 - fix FTBFS (rhbz#2385201) diff --git a/sources b/sources index 0595e3f..0f6eba1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-2.2.14.tar.gz) = 5c2aacc6a6be8e2be3ee5085c364383f7ed1b7fef730607c70d5e588f65a0fea8748b12b9cdadee7dabdaa5d3c5f94ebddc092737f0ce3b5022c8e5bc7e3c42f +SHA512 (mutt-2.2.15.tar.gz) = f72c6d372242e2e9a2f8cdd0e38db8acc5311a85a58f90791d2725aa033ca7dbcc68dddea65d3750c9ac53b3b8606e32bf7aef8f9e1586c2d312602e13c0159a From ad5864bed4274c510ccd63d7d938a56f25b1c055 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 20 Nov 2025 10:43:25 +0100 Subject: [PATCH 6/8] rebuilt for new gpgme --- mutt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index 60631b0..2ba5482 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ Summary: A text mode mail user agent Name: mutt Version: 2.2.15 -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 @@ -219,6 +219,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Thu Nov 20 2025 Michal Hlavinka - 5:2.2.15-2 +- rebuilt for new gpgme + * Mon Nov 03 2025 Michal Hlavinka - 5:2.2.15-1 - updated to 2.2.15 (#2400970) From 2c6e217b88f5fb143f3e88fd4a308d8637ef1519 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Sat, 27 Dec 2025 16:48:26 +0100 Subject: [PATCH 7/8] updated to 2.2.16 (#2416539) --- .gitignore | 1 + mutt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ce59f3b..475048d 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ mutt-1.5.23.tar.gz /mutt-2.2.13.tar.gz /mutt-2.2.14.tar.gz /mutt-2.2.15.tar.gz +/mutt-2.2.16.tar.gz diff --git a/mutt.spec b/mutt.spec index 2ba5482..6ad28e0 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,8 +19,8 @@ Summary: A text mode mail user agent Name: mutt -Version: 2.2.15 -Release: 2%{?dist} +Version: 2.2.16 +Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -219,6 +219,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Sat Dec 27 2025 Michal Hlavinka - 5:2.2.16-1 +- updated to 2.2.16 (#2416539) + * Thu Nov 20 2025 Michal Hlavinka - 5:2.2.15-2 - rebuilt for new gpgme diff --git a/sources b/sources index 0f6eba1..18c4529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-2.2.15.tar.gz) = f72c6d372242e2e9a2f8cdd0e38db8acc5311a85a58f90791d2725aa033ca7dbcc68dddea65d3750c9ac53b3b8606e32bf7aef8f9e1586c2d312602e13c0159a +SHA512 (mutt-2.2.16.tar.gz) = 5048aa9af6d928be59fe42b0bdbf22fc46c1dd47582cc7036782bff5756af2410ba80f2398c1edbf7be59a96eaa6736c8b8eff198f0dfc8841fb744093a39f80 From 791bd84bf6c519a7ea164ed146902c42f3e5bbed Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 8 Jan 2026 15:58:44 +0100 Subject: [PATCH 8/8] rebuild --- mutt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index 6ad28e0..bcf2fc5 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ Summary: A text mode mail user agent Name: mutt Version: 2.2.16 -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 @@ -219,6 +219,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Thu Jan 08 2026 Michal Hlavinka - 5:2.2.16-2 +- rebuild + * Sat Dec 27 2025 Michal Hlavinka - 5:2.2.16-1 - updated to 2.2.16 (#2416539)