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

@@ -14,3 +14,49 @@ mutt-1.5.23.tar.gz
 /mutt-1.8.3.tar.gz
 /mutt-1.9.0.tar.gz
 /mutt-1.9.1.tar.gz
+/mutt-1.9.2.tar.gz
+/mutt-1.9.3.tar.gz
+/mutt-1.9.4.tar.gz
+/mutt-1.9.5.tar.gz
+/mutt-1.10.0.tar.gz
+/mutt-1.10.1.tar.gz
+/mutt-1.11.2.tar.gz
+/mutt-1.11.3.tar.gz
+/mutt-1.11.4.tar.gz
+/mutt-1.12.0.tar.gz
+/mutt-1.12.1.tar.gz
+/mutt-1.12.2.tar.gz
+/mutt-1.13.0.tar.gz
+/mutt-1.13.2.tar.gz
+/mutt-1.13.3.tar.gz
+/mutt-1.13.4.tar.gz
+/mutt-1.13.5.tar.gz
+/mutt-1.14.0.tar.gz
+/mutt-1.14.2.tar.gz
+/mutt-1.14.3.tar.gz
+/mutt-1.14.4.tar.gz
+/mutt-1.14.5.tar.gz
+/mutt-1.14.6.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
+/mutt-2.0.7.tar.gz
+/mutt-2.1.1.tar.gz
+/mutt-2.1.3.tar.gz
+/mutt-2.1.5.tar.gz
+/mutt-2.2.0.tar.gz
+/mutt-2.2.1.tar.gz
+/mutt-2.2.2.tar.gz
+/mutt-2.2.3.tar.gz
+/mutt-2.2.5.tar.gz
+/mutt-2.2.6.tar.gz
+/mutt-2.2.7.tar.gz
+/mutt-2.2.9.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.10.0-muttrc.patch

@@ -1,7 +1,7 @@
 diff -ur mutt-1.8.0.orig/doc/Muttrc.head mutt-1.8.0/doc/Muttrc.head
 --- mutt-1.8.0.orig/doc/Muttrc.head	2017-02-25 15:28:22.120997474 +0000
 +++ mutt-1.8.0/doc/Muttrc.head	2017-02-25 15:30:10.643079681 +0000
-@@ -24,11 +24,15 @@
+@@ -24,13 +24,17 @@
  
  # Show documentation when pressing F1
  macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
@@ -9,7 +9,9 @@ diff -ur mutt-1.8.0.orig/doc/Muttrc.head mutt-1.8.0/doc/Muttrc.head
 +macro generic,pager <F2> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
  
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
- macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
+ # note: these macros have been subsumed by the <browse-mailboxes> function.
+ # macro index y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
+ # macro pager y "<exit><change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  bind browser y exit
  
 +bind editor <delete> delete-char

mutt-1.12.1-optusegpgagent.patch

@@ -0,0 +1,12 @@
+diff -up mutt-1.12.1/init.h.optusegpgagent mutt-1.12.1/init.h
+--- mutt-1.12.1/init.h.optusegpgagent	2019-08-29 09:29:38.868810511 +0200
++++ mutt-1.12.1/init.h	2019-08-29 09:30:29.899395370 +0200
+@@ -2444,7 +2444,7 @@ struct option_t MuttVars[] = {
+   ** not used.
+   ** (PGP only)
+   */
+-  { "pgp_use_gpg_agent", DT_BOOL, R_NONE, {.l=OPTUSEGPGAGENT}, {.l=1} },
++  { "pgp_use_gpg_agent", DT_BOOL, R_NONE, {.l=OPTUSEGPGAGENT}, {.l=0} },
+   /*
+   ** .pp
+   ** If \fIset\fP, mutt expects a \fCgpg-agent(1)\fP process will handle

mutt-1.5.23-sendlib.patch

@@ -1,43 +0,0 @@
-# HG changeset patch
-# User Kevin McCarthy <kevin@8t8.us>
-# Date 1417472364 28800
-#      Mon Dec 01 14:19:24 2014 -0800
-# Branch stable
-# Node ID 54c59aaf88b9f6b50f1078fc6f7551fa9315ac3e
-# Parent  1b583341d5ad677c8a1935eb4110eba27606878a
-Revert write_one_header() to skip space and tab.  (closes #3716)
-
-This patch fixes CVE-2014-9116 in the stable branch.  It reverts
-write_one_header() to the pre [f251d523ca5a] code for skipping
-whitespace.
-
-Thanks to Antonio Radici and Tomas Hoger for their analysis and patches
-to mutt, which this patch is based off of.
-
-diff --git a/sendlib.c b/sendlib.c
---- a/sendlib.c
-+++ b/sendlib.c
-@@ -1809,17 +1809,22 @@
-     {
-       tagbuf = NULL;
-       valbuf = mutt_substrdup (start, end);
-     }
-     else
-     {
-       tagbuf = mutt_substrdup (start, t);
-       /* skip over the colon separating the header field name and value */
--      t = skip_email_wsp(t + 1);
-+      ++t;
-+
-+      /* skip over any leading whitespace (WSP, as defined in RFC5322) */
-+      while (*t == ' ' || *t == '\t')
-+        t++;
-+
-       valbuf = mutt_substrdup (t, end);
-     }
-     dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "
- 	      "max width = %d > %d\n",
- 	      NONULL(pfx), valbuf, max, wraplen));
-     if (fold_one_header (fp, tagbuf, valbuf, pfx, wraplen, flags) < 0)
-       return -1;
-     FREE (&tagbuf);

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, UL &SslCACertFile, 0 },
-+  { "ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, "/etc/ssl/certs/ca-bundle.crt" },
+ # 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"} },
    /*
    ** .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-1.8.0-cabundle.patch

@@ -1,15 +1,15 @@
 diff -ur mutt-1.8.0.orig/contrib/Makefile.am mutt-1.8.0/contrib/Makefile.am
 --- mutt-1.8.0.orig/contrib/Makefile.am	2017-02-25 15:28:22.124997366 +0000
 +++ mutt-1.8.0/contrib/Makefile.am	2017-02-25 15:48:10.834036861 +0000
-@@ -5,7 +5,7 @@
- SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
+@@ -6,7 +6,7 @@
  	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
- 	sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \
--	ca-bundle.crt smime_keys_test.pl mutt_xtitle
-+	smime_keys_test.pl mutt_xtitle
+ 	sample.muttrc-compress sample.muttrc-starter \
+ 	sample.vimrc-sidebar colors.default colors.linux smime.rc \
+-	ca-bundle.crt smime_keys_test.pl mutt_xtitle markdown2html \
++	smime_keys_test.pl mutt_xtitle markdown2html \
+ 	bgedit-detectgui.sh bgedit-screen-tmux.sh \
+ 	mutt_oauth2.py mutt_oauth2.py.README
  
- EXTRA_DIST = language.txt language50.txt  \
- 	patch.slang-1.2.2.keypad.1	\
 diff -ur mutt-1.8.0.orig/doc/smime-notes.txt mutt-1.8.0/doc/smime-notes.txt
 --- mutt-1.8.0.orig/doc/smime-notes.txt	2017-02-25 15:28:22.119997501 +0000
 +++ mutt-1.8.0/doc/smime-notes.txt	2017-02-25 16:06:38.986242390 +0000

mutt-1.9.0-ssl_ciphers.patch

@@ -5,28 +5,28 @@ diff -ur mutt-1.9.0.orig/init.h mutt-1.9.0/init.h
    */
  #  endif /* defined HAVE_SSL_PARTIAL_CHAIN */
  # endif /* defined USE_SSL_OPENSSL */
--  { "ssl_ciphers", DT_STR, R_NONE, UL &SslCiphers, UL 0 },
-+  { "ssl_ciphers", DT_STR, R_NONE, UL &SslCiphers, UL "@SYSTEM" },
+-  { "ssl_ciphers", DT_STR, R_NONE, {.p=&SslCiphers}, {.p=0} },
++  { "ssl_ciphers", DT_STR, R_NONE, {.p=&SslCiphers}, {.p="@SYSTEM"} },
    /*
    ** .pp
-   ** Contains a colon-seperated list of ciphers to use when using SSL.
+   ** Contains a colon-separated list of ciphers to use when using SSL.
 diff -ur mutt-1.9.0.orig/mutt_ssl_gnutls.c mutt-1.9.0/mutt_ssl_gnutls.c
 --- mutt-1.9.0.orig/mutt_ssl_gnutls.c	2017-09-04 16:48:21.403528134 +0200
 +++ mutt-1.9.0/mutt_ssl_gnutls.c	2017-09-04 16:51:16.081679141 +0200
 @@ -286,6 +286,8 @@
    else
-     safe_strcat (priority, priority_size, "NORMAL");
+     mutt_buffer_strcpy (priority, "NORMAL");
  
 +if (SslCiphers && strcmp(SslCiphers, "@SYSTEM"))
 +{
-   if (! option(OPTTLSV1_2))
+   if (!option (OPTTLSV1_3))
    {
      nproto--;
 @@ -313,6 +315,7 @@
-     FREE (&priority);
-     return -1;
+     mutt_error (_("All available protocols for TLS/SSL connection disabled"));
+     goto cleanup;
    }
 +}
  
-   if ((err = gnutls_priority_set_direct (data->state, priority, NULL)) < 0)
+   if ((err = gnutls_priority_set_direct (data->state, mutt_b2s (priority), NULL)) < 0)
    {

mutt-1.9.4-lynx_no_backscapes.patch

@@ -0,0 +1,12 @@
+diff -up mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes mutt-1.9.1/doc/Makefile.am
+--- mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes	2018-04-12 15:30:14.881812698 +0200
++++ mutt-1.9.1/doc/Makefile.am	2018-04-12 15:30:25.632968018 +0200
+@@ -109,7 +109,7 @@ uninstall-local:
+ 
+ check:
+ manual.txt: manual.html
+-	-LC_ALL=C lynx -localhost -dump -nolist -nonumbers -with_backspaces -display_charset=us-ascii manual.html > $@ || \
++	-LC_ALL=C lynx -localhost -dump -nolist -display_charset=us-ascii manual.html > $@ || \
+ 	LC_ALL=C w3m -T text/html -I utf-8 -O utf-8 -dump < manual.html > $@ || \
+ 	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
+ 

mutt-1.9.5-nodotlock.patch

@@ -0,0 +1,43 @@
+diff -up mutt-1.10.0/configure.ac.nodotlock mutt-1.10.0/configure.ac
+--- mutt-1.10.0/configure.ac.nodotlock	2018-05-14 23:51:53.000000000 +0200
++++ mutt-1.10.0/configure.ac	2018-05-23 15:09:21.186613968 +0200
+@@ -528,9 +528,7 @@ int main (int argc, char **argv)
+ }]])],[mutt_cv_worldwrite=yes],[mutt_cv_worldwrite=no],[mutt_cv_worldwrite=no])])
+ 
+         mutt_cv_setgid=no
+-        if test $mutt_cv_worldwrite = yes; then
+-                AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
+-        else
++        if test $mutt_cv_worldwrite != yes; then
+ 
+                 AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
+ #include <sys/stat.h>
+@@ -546,7 +544,6 @@ int main (int argc, char **argv)
+ }]])],[mutt_cv_groupwrite=yes],[mutt_cv_groupwrite=no],[mutt_cv_groupwrite=no])])
+ 
+                 if test $mutt_cv_groupwrite = yes; then
+-                        AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
+                         AC_DEFINE(USE_SETGID,1,[ Define if mutt should run setgid "mail". ])
+                         mutt_cv_setgid=yes
+                 fi
+diff -up mutt-1.10.0/Makefile.am.nodotlock mutt-1.10.0/Makefile.am
+--- mutt-1.10.0/Makefile.am.nodotlock	2018-05-23 15:11:05.477977659 +0200
++++ mutt-1.10.0/Makefile.am	2018-05-23 15:11:20.252170843 +0200
+@@ -154,17 +154,6 @@ hcversion.h: $(srcdir)/mutt.h $(srcdir)/
+ patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
+ 	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
+ 
+-install-exec-hook:
+-	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then	\
+-		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
+-		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
+-	fi
+-	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
+-		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
+-		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
+-		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
+-	fi
+-
+ install-data-local:
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
+ 	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist

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

@@ -5,7 +5,8 @@
 %bcond_without gnutls
 %bcond_without gss
 %bcond_without sasl
-%bcond_without idn
+%bcond_with idn
+%bcond_without idn2
 %bcond_without hcache
 %bcond_without tokyocabinet
 %bcond_with bdb
@@ -18,31 +19,36 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.9.1
-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
-Group: Applications/Internet
+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.8.0-muttrc.patch
+Patch1: mutt-1.10.0-muttrc.patch
 Patch2: mutt-1.8.0-cabundle.patch
 # https://dev.mutt.org/trac/ticket/3569
 Patch3: mutt-1.7.0-syncdebug.patch
 # FIXME make it to upstream
 Patch8: mutt-1.5.23-system_certs.patch
 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
+BuildRequires: make
+BuildRequires: gcc
 BuildRequires: ncurses-devel, gettext, automake
 # manual generation
 BuildRequires: /usr/bin/xsltproc, docbook-style-xsl, perl-interpreter
 BuildRequires: perl-generators
-# html manual -> txt manual conversion (lynx messes up the encoding)
-BuildRequires: w3m
+BuildRequires: lynx
 
 %if %{with hcache}
 %{?with_tokyocabinet:BuildRequires: tokyocabinet-devel}
@@ -61,6 +67,7 @@ BuildRequires: w3m
 %endif
 
 %{?with_idn:BuildRequires: libidn-devel}
+%{?with_idn2:BuildRequires: libidn2-devel}
 %{?with_gpgme:BuildRequires: gpgme-devel}
 
 
@@ -75,19 +82,21 @@ for selecting groups of messages.
 %prep
 # unpack; cd
 %setup -q
-# disable mutt_dotlock program - disable post-install mutt_dotlock checking
-sed -i -r 's|install-exec-hook|my-useless-label|' Makefile.am
 # do not run ./prepare -V, because it also runs ./configure
-autoreconf --install
-%patch1 -p1 -b .muttrc
-%patch2 -p1 -b .cabundle
-%patch3 -p1 -b .syncdebug
-%patch8 -p1 -b .system_certs
-%patch9 -p1 -b .ssl_ciphers
+
+%patch -P10 -p1 -b .lynx_no_backscapes
+%patch -P12 -p1 -b .nodotlock
+%patch -P14 -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
 
 sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
-# disable mutt_dotlock program - remove support from mutt binary
-sed -i -r 's|^(.*USE_DOTLOCK.*)$|//\1|' configure
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
@@ -128,19 +137,28 @@ rm -f mutt_ssl.c
     %{?with_gss:	--with-gss} \
     %endif
 \
+    %{?with_idn:	--with-idn} \
     %{!?with_idn:	--without-idn} \
+    %{?with_idn2:   --with-idn2} \
+    %{!?with_idn2:  --without-idn2} \
+\
     %{?with_gpgme:	--enable-gpgme} \
     %{?with_sidebar: --enable-sidebar} \
     --with-docdir=%{_pkgdocdir}
 
-make %{?_smp_mflags}
+%make_build
 
 # remove unique id in manual.html because multilib conflicts
 sed -i -r 's/<a id="id[a-z0-9]\+">/<a id="id">/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 DESTDIR=%{buildroot}
+%make_install
 
 # we like GPG here
 cat contrib/gpg.rc >> \
@@ -170,6 +188,9 @@ rm -f %{buildroot}%{_mandir}/man5/mbox.5*
 rm -f %{buildroot}%{_mandir}/man5/mmdf.5*
 rm -rf %{buildroot}%{_pkgdocdir}
 
+# remove /usr/share/info/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
 
@@ -180,22 +201,290 @@ 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
 %config(noreplace) %{_sysconfdir}/Muttrc.local
 %{_bindir}/mutt
-%{_bindir}/pgpring
+%{_bindir}/mutt_pgpring
 %{_bindir}/pgpewrap
 %{_bindir}/smime_keys
 %{_mandir}/man1/mutt.*
 %{_mandir}/man1/smime_keys.*
-%{_mandir}/man1/pgpring.*
+%{_mandir}/man1/mutt_pgpring.*
 %{_mandir}/man1/pgpewrap.*
 %{_mandir}/man5/muttrc.*
+%{_infodir}/mutt.info.*
 
 
 %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
+
+* Tue Sep 05 2023 Matej Mužila <mmuzila@redhat.com> - 5:2.2.11-1
+- Upgrade to 2.2.11
+- Resolves: #2232712
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Apr 17 2023 Matej Mužila <mmuzila@redhat.com> - 5:2.2.10-1
+- Upgrade to 2.2.10
+- Resolves: #2181780
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Nov 23 2022  Matej Mužila <mmuzila@redhat.com> - 5:2.2.9-1
+- Upgrade to 2.2.9
+- Resolves: 2140353
+
+* Thu Aug 11 2022  Matej Mužila <mmuzila@redhat.com> - 5:2.2.7-1
+- Upgrade to 2.2.7
+- Resolves: 2116172
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 15 2022  Matej Mužila <mmuzila@redhat.com> - 5:2.2.6-1
+- Upgrade to 2.2.6
+- Resolves: 2093746
+
+* Mon May 30 2022  Matej Mužila <mmuzila@redhat.com> - 5:2.2.5-1
+- Upgrade to 2.2.5
+- Resolves: 2068653
+
+* Thu Apr 21 2022 Matej Mužila <mmuzila@redhat.com> - 5:2.2.3-1
+- Upgrade to 2.2.3
+  Resolves: CVE-2022-1328
+
+* Mon Mar 28 2022 Matej Mužila <mmuzila@redhat.com> - 5:2.2.2-1
+- Upgrade to 2.2.2
+  Resolves: #2068653
+
+* Tue Feb 22 2022 Matej Mužila <mmuzila@redhat.com> - 5:2.2.1-1
+- Upgrade to 2.2.1
+  Resolves: #2053874
+
+* Wed Feb 16 2022 Matej Mužila <mmuzila@redhat.com> - 5:2.2.0-1
+- Upgrade to 2.2.0
+  Resolves: #2053874
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan 03 2022 Matej Mužila <mmuzila@redhat.com> - 5:2.1.5-1
+- Upgrade to 2.1.5
+
+* Mon Oct 25 2021 Matej Mužila <mmuzila@redhat.com> - 5:2.1.3-1
+- Upgrade to 2.1.3
+
+* Tue Aug 10 2021 Matej Mužila <mmuzila@redhat.com> - 5:2.1.1-1
+- Upgrade to 2.1.1
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May  7 2021 Dan Čermák <dan.cermak@cgc-instruments.com> - 5:2.0.7-2
+- Ship the mutt_oauth2.py script as well
+
+* Thu May 6 2021 Filip Januš <fjanus@redhat.com> 5:2.0.7-1
+-Rebase to v2.0.7
+
+* Mon Mar 22 2021 Filip Januš <fjanus@redhat.com> 5:2.0.6-1
+- Rebase to upstream version 2.0.6
+
+* Mon Feb 1 2021 Filip Januš <fjanus@redhat.com> -5:2.0.5-1
+- Rebase to upstream version 2.0.5
+- Fix CVE-2021-3181
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Dec 01 2020 Matej Mužila <mmuzila@redhat.com> - 5:2.0.2-1
+- Upgrade to 2.0.2
+- Resolves: #1895629, #1900827, CVE-2020-28896
+
+* Tue Sep 01 2020 Matej Mužila <mmuzila@redhat.com> - 5:1.14.7-2
+- Fix mutt-1.9.4-lynx_no_backscapes.patch
+
+* Mon Aug 31 2020 Matej Mužila <mmuzila@redhat.com> - 5:1.14.7-1
+- Upgrade to 1.14.7
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.14.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 22 2020 Fabio Alessandro Locati <fale@fedoraproject.org> - 5:1.14.6-1
+- Upgrade to 1.14.6
+
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 5:1.14.5-2
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Wed Jun 24 2020 Fabio Alessandro Locati <fale@fedoraproject.org> - 5:1.14.5-1
+- Upgrade to 1.14.5
+
+* Fri Jun 19 2020 Fabio Alessandro Locati <fale@fedoraproject.org> - 5:1.14.4-1
+- Upgrade to 1.14.4
+- Resolves: #1848768
+
+* Mon Jun 15 2020 Fabio Alessandro Locati <fale@fedoraproject.org> - 5:1.14.3-1
+- Upgrade to 1.14.3
+- Resolves: #1836550
+
+* Tue May 26 2020 Matej Mužila <mmuzila@redhat.com> - 5:1.14.2-1
+- Upgrade to 1.14.2
+- Resolves: #1836550
+
+* Sat May 09 2020 Fabio Alessandro Locati <fale@fedoraproject.org> - 5:1.14.0-1
+- Upgrade to 1.14.0
+- Resolves: #1818513
+
+* Tue Apr 07 2020 Matej Mužila <mmuzila@redhat.com> - 5:1.13.5-1
+- Upgrade to 1.13.5
+- Resolves: #1818513
+
+* Mon Feb 17 2020 Matej Mužila <mmuzila@redhat.com> - 5:1.13.4-1
+- Upgrade to 1.13.4
+- Resolves: #1803392
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.13.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan 15 2020 Matej Mužila <mmuzila@redhat.com> - 5:1.13.3-1
+- Upgrade to 1.13.3
+- Resolves: #1783717, #1785500
+
+* Fri Jan 03 2020 Matej Mužila <mmuzila@redhat.com> - 5:1.13.2-1
+- Upgrade to 1.13.2
+- Resolves: #1783717
+
+* Mon Dec 02 2019 Matej Mužila <mmuzila@redhat.com> - 5:1.13.0-1
+- Upgrade to 1.13.0
+- Resolves: #1754211
+
+* Tue Sep 24 2019 Matej Mužila <mmuzila@redhat.com> - 5:1.12.2-1
+- Upgrade to 1.12.2
+- Resolves: #1754211
+
+* Thu Aug 29 2019 Matej Mužila <mmuzila@redhat.com> - 5:1.12.1-3
+- Make mutt to ask for GPG passphrase
+- Resolves: #1731854
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 17 2019 Matej Mužila <mmuzila@redhat.com> - 5:1.12.1-1
+- Upgrade to 1.12.1
+- Resolves #1720848
+
+* Tue May 28 2019 Matej Mužila <mmuzila@redhat.com> - 5:1.12.0-1
+- Upgrade to 1.12.0
+- Resolves #1710398,#1713910
+
+* Wed Apr 24 2019 Björn Esser <besser82@fedoraproject.org> - 5:1.11.4-2
+- Remove hardcoded gzip suffix from GNU info pages
+
+* Wed Feb 06 2019 Matej Mužila <mmuzila@redhat.com> - 5:1.11.4-1
+- Upgrade to 1.11.4
+- Resolves #1688091
+
+* Wed Feb 06 2019 Matej Mužila <mmuzila@redhat.com> - 5:1.11.3-1
+- Upgrade to 1.11.3
+- Resolves #1659217
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 17 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.10.1-1
+- Upgrade to 1.10.1
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu May 24 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.10.0-2
+- Disable post-install mutt_dotlock checking by patch, not by sed.
+
+* Tue May 22 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.10.0-1
+- Upgrade to 1.10.0
+
+* Thu Apr 19 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-4
+- Disable dotlock by patch instead of sed
+- Resolves: #1568597
+
+* Wed Apr 18 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-3
+- Apply patches of autoreconf related configuration files before running
+  autoreconf
+
+* Mon Apr 16 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-2
+- Use libidn2 instead of libidn
+
+* Mon Apr 16 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-1
+- Upgrade to 1.9.5
+
+* Fri Apr 13 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.4-2
+- Use lynx to generate documentation
+
+* Mon Apr 09 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.4-1
+- Upgrade to 1.9.4
+
+* Tue Feb 13 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.3-1
+- Upgrade to 1.9.3
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Dec 20 2017 Matej Mužila <mmuzila@redhat.com> - 5:1.9.2-1
+- Upgrade to 1.9.2
+
 * Sun Sep 24 2017 Fabio Alessandro Locati <fale@fedoraproject.org> - 5:1.9.1-1
 - Upgrade to 1.9.1
 
@@ -250,7 +539,7 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
 * Fri Sep 04 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.24-1
-- Updated to 1.5.24 (Resolves: rhbz#1259332)
+- Updated to 1.5.24 (Resolves: rhbz#1259332)
 - Utilize system-wide crypto-policies (Resolves: rhbz#1179324)
 
 * Thu Jun 25 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.23-9

sources

@@ -1 +1 @@
-SHA512 (mutt-1.9.1.tar.gz) = 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095
+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