diff --git a/.gitignore b/.gitignore index a00c28f..475048d 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ 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 +/mutt-2.2.16.tar.gz 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..bcf2fc5 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: 1%{?dist} +Version: 2.2.16 +Release: 2%{?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,27 @@ 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) + +* 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) + +* 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 + +* 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) diff --git a/sources b/sources index 0595e3f..18c4529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-2.2.14.tar.gz) = 5c2aacc6a6be8e2be3ee5085c364383f7ed1b7fef730607c70d5e588f65a0fea8748b12b9cdadee7dabdaa5d3c5f94ebddc092737f0ce3b5022c8e5bc7e3c42f +SHA512 (mutt-2.2.16.tar.gz) = 5048aa9af6d928be59fe42b0bdbf22fc46c1dd47582cc7036782bff5756af2410ba80f2398c1edbf7be59a96eaa6736c8b8eff198f0dfc8841fb744093a39f80 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