diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 475048d..f4959c6 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,3 @@ mutt-1.5.23.tar.gz /mutt-2.2.10.tar.gz /mutt-2.2.11.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/ci.fmf b/ci.fmf deleted file mode 100644 index d9bf436..0000000 --- a/ci.fmf +++ /dev/null @@ -1,9 +0,0 @@ -/test: - summary: - Basic set of quick tests for mutt. - discover: - - name: fedora - how: fmf - url: "https://src.fedoraproject.org/tests/mutt.git" - execute: - how: tmt diff --git a/mutt-1.5.23-system_certs.patch b/mutt-1.5.23-system_certs.patch index 2cb75fc..dd1dc7f 100644 --- a/mutt-1.5.23-system_certs.patch +++ b/mutt-1.5.23-system_certs.patch @@ -1,21 +1,12 @@ -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[] = { +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[] = { */ #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/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"} }, ++ { "ssl_ca_certificates_file", DT_PATH, R_NONE, {.p=&SslCACertFile}, {.p="/etc/ssl/certs/ca-bundle.crt"} }, /* ** .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 bcf2fc5..7b50be4 100644 --- a/mutt.spec +++ b/mutt.spec @@ -19,14 +19,14 @@ Summary: A text mode mail user agent Name: mutt -Version: 2.2.16 +Version: 2.2.12 Release: 2%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain -License: GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain +License: GPLv2+ and Public Domain # hg snapshot created from http://dev.mutt.org/hg/mutt -Source: http://ftp.mutt.org/pub/%{name}/%{name}-%{version}.tar.gz +Source: ftp://ftp.mutt.org/pub/%{name}/%{name}-%{version}.tar.gz Source1: mutt_ldap_query Patch1: mutt-1.10.0-muttrc.patch Patch2: mutt-1.8.0-cabundle.patch @@ -49,6 +49,7 @@ BuildRequires: ncurses-devel, gettext, automake BuildRequires: /usr/bin/xsltproc, docbook-style-xsl, perl-interpreter BuildRequires: perl-generators BuildRequires: lynx +BuildRequires: docbook2X %if %{with hcache} %{?with_tokyocabinet:BuildRequires: tokyocabinet-devel} @@ -84,17 +85,17 @@ for selecting groups of messages. %setup -q # do not run ./prepare -V, because it also runs ./configure -%patch -P10 -p1 -b .lynx_no_backscapes -%patch -P12 -p1 -b .nodotlock -%patch -P14 -p1 +%patch10 -p1 -b .lynx_no_backscapes +%patch12 -p1 -b .nodotlock +%patch14 -p1 -autoreconf -fiv -%patch -P1 -p1 -b .muttrc -%patch -P2 -p1 -b .cabundle -%patch -P3 -p1 -b .syncdebug -%patch -P8 -p1 -b .system_certs -%patch -P9 -p1 -b .ssl_ciphers -%patch -P13 -p1 -b .optusegpgagent +autoreconf --install +%patch1 -p1 -b .muttrc +%patch2 -p1 -b .cabundle +%patch3 -p1 -b .syncdebug +%patch8 -p1 -b .system_certs +%patch9 -p1 -b .ssl_ciphers +%patch13 -p1 -b .optusegpgagent sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure @@ -189,7 +190,7 @@ rm -f %{buildroot}%{_mandir}/man5/mmdf.5* rm -rf %{buildroot}%{_pkgdocdir} # remove /usr/share/info/dir -rm -f %{buildroot}%{_infodir}/dir +rm %{buildroot}%{_infodir}/dir # provide muttrc.local(5): the same as muttrc(5) ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 @@ -219,49 +220,6 @@ 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) - -* Fri Jan 17 2025 Fedora Release Engineering - 5:2.2.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 5:2.2.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 22 2024 Ondrej Sloup - 5:2.2.13-2 -- Remove docbookX2 BuildRequire dependency as it is being deprecated - -* Wed Mar 20 2024 Matej Mužila - 5:2.2.13-1 -- Upgrade to 2.2.13 -- Resolves: #2268671 - -* Thu Jan 25 2024 Fedora Release Engineering - 5:2.2.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5:2.2.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Thu Dec 7 2023 Florian Weimer - 5:2.2.12-2 - Fix C99 compatibility issue diff --git a/sources b/sources index 18c4529..4e3ecd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutt-2.2.16.tar.gz) = 5048aa9af6d928be59fe42b0bdbf22fc46c1dd47582cc7036782bff5756af2410ba80f2398c1edbf7be59a96eaa6736c8b8eff198f0dfc8841fb744093a39f80 +SHA512 (mutt-2.2.12.tar.gz) = 75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index fad7c5d..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,9 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - simple: - dir: . - run: mutt --help