rebuild

docbook2X is being deprecated in RHEL10, and as the mutt is the only package that requires it, the config has been edited, so it is not being used anymore. The build process is not changed otherwise as the build still passes, and no changes in the log have been observed, which seems to indicate that the package does not require it.

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -56,3 +56,7 @@ 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

ci.fmf

@@ -0,0 +1,9 @@
+/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

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 */

mutt-configure-c99.patch

@@ -0,0 +1,24 @@
+The standard iconv function uses char ** even for its input
+argument. With a const char ** argument, ICONV_NONTRANS is incorrectly
+set to 1 if the compiler produces an error for such incompatible
+pointer types.
+
+Submitted upstream: <https://gitlab.com/muttmua/mutt/-/merge_requests/175>
+
+diff --git a/configure.ac b/configure.ac
+index 9fe461df2a5af3a8..443da363081343c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1322,10 +1322,10 @@ AC_CACHE_CHECK([whether iconv is non-transcribing], mutt_cv_iconv_nontrans,
+ int main()
+ {
+   iconv_t cd;
+-  const char *ib;
++  char *ib;
+   char *ob;
+   size_t ibl, obl;
+-  const char *s = "\304\211";
++  char *s = (char *) "\304\211";
+ changequote(, )dnl
+   char t[3];
+ changequote([, ])dnl

mutt.spec

@@ -19,14 +19,14 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 2.2.12
-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
-License: GPLv2+ and Public Domain
+License: GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain
 # hg snapshot created from http://dev.mutt.org/hg/mutt
-Source: ftp://ftp.mutt.org/pub/%{name}/%{name}-%{version}.tar.gz
+Source: http://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
@@ -38,6 +38,7 @@ 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-configure-c99.patch
 
 Url: http://www.mutt.org
 Requires: mailcap, urlview
@@ -48,7 +49,6 @@ 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,16 +84,17 @@ for selecting groups of messages.
 %setup -q
 # do not run ./prepare -V, because it also runs ./configure
 
-%patch10 -p1 -b .lynx_no_backscapes
-%patch12 -p1 -b .nodotlock
+%patch -P10 -p1 -b .lynx_no_backscapes
+%patch -P12 -p1 -b .nodotlock
+%patch -P14 -p1
 
-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
+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
 
 sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
 
@@ -188,7 +189,7 @@ rm -f %{buildroot}%{_mandir}/man5/mmdf.5*
 rm -rf %{buildroot}%{_pkgdocdir}
 
 # remove /usr/share/info/dir
-rm %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
 
 # provide muttrc.local(5): the same as muttrc(5)
 ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
@@ -218,6 +219,52 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
 
 
 %changelog
+* Thu Jan 08 2026 Michal Hlavinka <mhlavink@redhat.com> - 5:2.2.16-2
+- rebuild
+
+* Sat Dec 27 2025 Michal Hlavinka <mhlavink@redhat.com> - 5:2.2.16-1
+- updated to 2.2.16 (#2416539)
+
+* Thu Nov 20 2025 Michal Hlavinka <mhlavink@redhat.com> - 5:2.2.15-2
+- rebuilt for new gpgme
+
+* Mon Nov 03 2025 Michal Hlavinka <mhlavink@redhat.com> - 5:2.2.15-1
+- updated to 2.2.15 (#2400970)
+
+* Fri Aug 01 2025 Michal Hlavinka <mhlavink@redhat.com> - 5:2.2.14-4
+- fix FTBFS (rhbz#2385201)
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Jul 22 2025 Michal Hlavinka <mhlavink@redhat.com> - 5:2.2.14-2
+- adjust to Dropping of cert.pem file system change
+
+* Mon Feb 24 2025 Michal Hlavinka <mhlavink@redhat.com> - 5:2.2.14-1
+- updated to 2.2.14 (#2346767)
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jun 22 2024 Ondrej Sloup <osloup@redhat.com> -  5:2.2.13-2
+- Remove docbookX2 BuildRequire dependency as it is being deprecated
+
+* Wed Mar 20 2024 Matej Mužila <mmuzila@redhat.com> - 5:2.2.13-1
+- Upgrade to 2.2.13
+- Resolves: #2268671
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Dec  7 2023 Florian Weimer <fweimer@redhat.com> - 5:2.2.12-2
+- Fix C99 compatibility issue
+
 * Mon Nov 13 2023 Matej Mužila <mmuzila@redhat.com> - 5:2.2.12-1
 - Upgrade to 2.2.12
 - Resolves: #2232712

sources

@@ -1 +1 @@
-SHA512 (mutt-2.2.12.tar.gz) = 75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006
+SHA512 (mutt-2.2.16.tar.gz) = 5048aa9af6d928be59fe42b0bdbf22fc46c1dd47582cc7036782bff5756af2410ba80f2398c1edbf7be59a96eaa6736c8b8eff198f0dfc8841fb744093a39f80

tests/tests.yml

@@ -0,0 +1,9 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - simple:
+        dir: .
+        run: mutt --help