[rpms/mutt] f43: updated to 2.4.0 (#2488254)

[rpms/mutt] f43: updated to 2.4.0 (#2488254)

[Michal Hlavinka]

A new commit has been pushed.

Repo   : rpms/mutt
Branch : f43
Commit : 5c1c9864c65d56636fef91bcc71777761d699b97
Author : Michal Hlavinka <mhlavink@redhat.com>
Date   : 2026-06-28T23:17:28+02:00
Stats  : +26/-36 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/mutt/c/5c1c9864c65d56636fef91bcc71777761d699b97?branch=f43

Log:
updated to 2.4.0 (#2488254)

---
diff --git a/.gitignore b/.gitignore
index 4c8378a..a1226f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ mutt-1.5.23.tar.gz
 /mutt-2.3.0.tar.gz
 /mutt-2.3.1.tar.gz
 /mutt-2.3.2.tar.gz
+/mutt-2.4.0.tar.gz

diff --git a/mutt-1.7.0-syncdebug.patch b/mutt-1.7.0-syncdebug.patch
deleted file mode 100644
index 4b757b1..0000000
--- a/mutt-1.7.0-syncdebug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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))

diff --git a/mutt-1.9.0-ssl_ciphers.patch b/mutt-1.9.0-ssl_ciphers.patch
index 4f72310..f070710 100644
--- a/mutt-1.9.0-ssl_ciphers.patch
+++ b/mutt-1.9.0-ssl_ciphers.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -up mutt-2.4.0/init.h.ssl_ciphers mutt-2.4.0/init.h
+--- mutt-2.4.0/init.h.ssl_ciphers	2026-06-28 23:11:35.422009688 +0200
++++ mutt-2.4.0/init.h	2026-06-28 23:11:35.424291610 +0200
+@@ -4492,7 +4492,7 @@ struct option_t MuttVars[] = {
    */
  #  endif /* defined HAVE_SSL_PARTIAL_CHAIN */
  # endif /* defined USE_SSL_OPENSSL */
@@ -10,23 +10,24 @@ diff -ur mutt-1.9.0.orig/init.h mutt-1.9.0/init.h
    /*
    ** .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 @@
+diff -up mutt-2.4.0/mutt_ssl_gnutls.c.ssl_ciphers mutt-2.4.0/mutt_ssl_gnutls.c
+--- mutt-2.4.0/mutt_ssl_gnutls.c.ssl_ciphers	2026-06-12 07:03:22.000000000 +0200
++++ mutt-2.4.0/mutt_ssl_gnutls.c	2026-06-28 23:14:48.314207958 +0200
+@@ -321,6 +321,8 @@ static int tls_set_priority(tlssockdata
    else
-     mutt_buffer_strcpy (priority, "NORMAL");
+     mutt_buffer_strcpy(priority, "NORMAL");
  
 +if (SslCiphers && strcmp(SslCiphers, "@SYSTEM"))
 +{
-   if (!option (OPTTLSV1_3))
+   if (!option(OPTTLSV1_3))
    {
      nproto--;
-@@ -313,6 +315,7 @@
-     mutt_error (_("All available protocols for TLS/SSL connection disabled"));
+@@ -352,7 +354,7 @@ static int tls_set_priority(tlssockdata
+     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)
+   if ((err = gnutls_priority_set_direct(data->state, mutt_b2s(priority), NULL)) < 0)
    {
+     mutt_error("gnutls_priority_set_direct(%s): %s", mutt_b2s(priority), gnutls_strerror(err));

diff --git a/mutt-1.9.4-lynx_no_backscapes.patch b/mutt-1.9.4-lynx_no_backscapes.patch
index 6faffd3..871069b 100644
--- a/mutt-1.9.4-lynx_no_backscapes.patch
+++ b/mutt-1.9.4-lynx_no_backscapes.patch
@@ -1,9 +1,9 @@
-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:
+diff -up mutt-2.4.0/doc/Makefile.am.lynx_no_backscapes mutt-2.4.0/doc/Makefile.am
+--- mutt-2.4.0/doc/Makefile.am.lynx_no_backscapes	2026-06-12 07:03:22.000000000 +0200
++++ mutt-2.4.0/doc/Makefile.am	2026-06-28 22:59:45.674628590 +0200
+@@ -150,7 +150,7 @@ uninstall-local:
+ 	fi
  
- 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 > $@ || \

diff --git a/mutt.spec b/mutt.spec
index f680826..825072b 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -19,7 +19,7 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 2.3.2
+Version: 2.4.0
 Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
@@ -30,8 +30,6 @@ 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
-# 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
@@ -89,7 +87,6 @@ for selecting groups of messages.
 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
@@ -217,6 +214,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
 
 
 %changelog
+* Sun Jun 28 2026 Michal Hlavinka <mhlavink@redhat.com> - 5:2.4.0-1
+- updated to 2.4.0 (#2488254)
+
 * Tue May 26 2026 Michal Hlavinka <mhlavink@redhat.com> - 5:2.3.2-1
 - updated to 2.3.2 (#2461889)
 

diff --git a/sources b/sources
index 512a7d1..51e653b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutt-2.3.2.tar.gz) = 78d7bcce1466bc7e188c579c00df0f308ea73b3f574b6fdecd399dc5f361ced971a6cecb09877b689a15aac8d02271b13d1f61e0d3197d79b6a348e6bf04f3ea
+SHA512 (mutt-2.4.0.tar.gz) = c0c849136be8eb8dcc4b45c5a602e17e3f4405cb1d9bb82f18ca01d7fd2e0bef176b67676528e340e430ae00632925d255b5a4cd195cb4addaa2341a71e2b23d