Rebase to upstream version 2.2.6

Resolves: rhbz#2032988 rhbz#1959896

.gitignore

@@ -0,0 +1,45 @@
+mutt-1.5.20-20100718hg1a35f0.tar.bz2
+mutt-1.5.21.tar.gz
+mutt-1.5.22.tar.gz
+mutt-1.5.23.tar.gz
+/mutt-1.5.23-20150609hg17a4f92e4a95.tar.gz
+/mutt-1.5.24.tar.gz
+/mutt-1.6.0.tar.gz
+/mutt-1.6.1.tar.gz
+/mutt-1.6.2.tar.gz
+/mutt-1.7.0.tar.gz
+/mutt-1.7.1.tar.gz
+/mutt-1.7.2.tar.gz
+/mutt-1.8.2.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.1.5.tar.gz
+/mutt-2.2.6.tar.gz

.mutt.metadata

@@ -0,0 +1 @@
+3dabf53ea1a45e67fe77a5072bb4c104afb2ad1e mutt-2.2.6.tar.gz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

mutt-1.10.0-muttrc.patch

@@ -0,0 +1,21 @@
+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,13 +24,17 @@
+ 
+ # Show documentation when pressing F1
+ macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
++# and also F2, as some terminals use F1
++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"
+ # 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
++
+ # Handler for gzip compressed mailboxes
+ # open-hook   '\.gz$'  "gzip -cd  '%f' >  '%t'"
+ # close-hook  '\.gz$'  "gzip -c   '%t' >  '%f'"

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-system_certs.patch

@@ -0,0 +1,12 @@
+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/ssl/certs/ca-bundle.crt"} },
+   /*
+   ** .pp
+   ** This variable specifies a file containing trusted CA certificates.

mutt-1.7.0-syncdebug.patch

@@ -0,0 +1,12 @@
+diff -ur mutt-1.7.0-orig/imap/imap.c mutt-1.7.0/imap/imap.c
+--- mutt-1.7.0-orig/imap/imap.c	2016-08-20 11:06:26.266272415 +0100
++++ mutt-1.7.0/imap/imap.c	2016-08-20 11:07:42.874509429 +0100
+@@ -1143,7 +1143,7 @@
+   if (!idata->ctx)
+     return -1;
+ 
+-  if (!mutt_bit_isset (idata->ctx->rights, right))
++  if (!idata->ctx || !mutt_bit_isset (idata->ctx->rights, right))
+     return 0;
+ 
+   if (right == MUTT_ACL_WRITE && !imap_has_flag (idata->flags, name))

mutt-1.8.0-cabundle.patch

@@ -0,0 +1,28 @@
+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
+@@ -6,7 +6,7 @@
+ 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
+ 	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
+ 
+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
+@@ -40,8 +40,10 @@
+ - Edit the smime_sign_as line in your muttrc, replacing the keyid with your
+   own.
+ 
+-- You probably want to import the trusted roots in
+-  contrib/ca-bundle.crt. This makes you trust anything that was ultimately
++- There is no more ca-bundle.crt file with the trusted roots to import shipped 
++  in mutt. The upstream file is out-dated and user is encouraged to use 
++  ca-bundle.crt from ca-certificate package.
++  This makes you trust anything that was ultimately
+   signed by one of them. You can use "smime_keys add_root" to do so, or
+   just copy ca-bundle.crt into the place you point mutt's smime_ca_location
+   variable to.

mutt-1.9.0-ssl_ciphers.patch

@@ -0,0 +1,32 @@
+diff -ur mutt-1.9.0.orig/init.h mutt-1.9.0/init.h
+--- mutt-1.9.0.orig/init.h	2017-09-04 16:48:21.409528002 +0200
++++ mutt-1.9.0/init.h	2017-09-04 16:49:26.505093636 +0200
+@@ -3510,7 +3510,7 @@
+   */
+ #  endif /* defined HAVE_SSL_PARTIAL_CHAIN */
+ # endif /* defined USE_SSL_OPENSSL */
+-  { "ssl_ciphers", DT_STR, R_NONE, {.p=&SslCiphers}, {.p=0} },
++  { "ssl_ciphers", DT_STR, R_NONE, {.p=&SslCiphers}, {.p="@SYSTEM"} },
+   /*
+   ** .pp
+   ** 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
+     mutt_buffer_strcpy (priority, "NORMAL");
+ 
++if (SslCiphers && strcmp(SslCiphers, "@SYSTEM"))
++{
+   if (!option (OPTTLSV1_3))
+   {
+     nproto--;
+@@ -313,6 +315,7 @@
+     mutt_error (_("All available protocols for TLS/SSL connection disabled"));
+     goto cleanup;
+   }
++}
+ 
+   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_ldap_query

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+#  Last modified: 30 October 2000
+#
+
+FLAGS=
+
+# Create two temporary files.
+umask 077
+TMPFILE=`mktemp /tmp/mutt.ldap.XXXXXX`
+RESULTS=`mktemp /tmp/mutt.ldap.XXXXXX`
+
+if [ -n "$LDAPSERVER" ]; then
+	FLAGS="$FLAGS -h $LDAPSERVER"
+fi
+if [ -n "$LDAPBASEDN" ]; then
+	FLAGS="$FLAGS -b $LDAPBASEDN"
+fi
+
+# Search.
+ldapsearch $FLAGS '(&(objectclass=inetorgperson)(|(cn='"$1"'*)(givenname='"$1"'*)(surname='"$1"'*)(mail='"$1"'*)))' mail cn roomNumber 2> /dev/null >> $TMPFILE
+ldapsearch -x $FLAGS '(&(objectclass=inetorgperson)(|(cn='"$1"'*)(givenname='"$1"'*)(surname='"$1"'*)(mail='"$1"'*)))' mail cn roomNumber 2> /dev/null >> $TMPFILE
+
+# Parse.
+cat $TMPFILE | awk '
+	/^mail:/ {MAIL=substr($0,6)}
+	/^cn:/ {NAME=substr($0,4)}
+	/^roomNumber:/ {ROOM=substr($0,12)}
+	/^$/ { MAIL=gensub("^ *| *$","","g",MAIL) }
+	/^$/ { NAME=gensub("^ *| *$","","g",NAME) }
+	/^$/ { ROOM=gensub("^ *| *$","","g",ROOM) }
+	/^$/ { if(length(NAME) > 0) print MAIL "\t" NAME "\t" ROOM}
+	/^$/ { NAME = "" }
+' > $RESULTS
+
+# Sort and present results.
+sort -u $RESULTS > $TMPFILE
+echo Querying ${LDAPSERVER}.... `cat $TMPFILE | wc -l` entries found.
+cat $TMPFILE
+
+# Clean up.
+rm -f $TMPFILE $RESULTS

sources

@@ -0,0 +1 @@
+SHA512 (mutt-2.2.6.tar.gz) = 07d473b6e6774f3988538e799fcc73ad35efceb5b1a3ee377754332f34db664d40ffa650711c7720ddc5c248e5379bba19fc5fd3dc7418a25305780e25f3b52b