CVS commit: pkgsrc/mail/mutt

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Sun Jun 21 07:31:00 UTC 2026

Modified Files:
        pkgsrc/mail/mutt: Makefile distinfo
        pkgsrc/mail/mutt/patches: patch-color.c

Log Message:
mail/mutt: Update to version 2.4.0

Changes since version 2.3.3:
  ! Maildir folders are now only recognized if they contain cur, new, and tmp
    subfolders.  Previously mutt only checked for the cur subfolder when
    opening.
  ! --without-wc-funcs configure option is deprecated.
  + New functions <open-thread>, <open-all-threads>, <close-thread>,
    <close-all-threads> were added to explicitly open/close a thread, in
    addition to the thread toggle functions.
  + $tmpdraftdir, defaulting /var/tmp, sets the directory where message
    composition drafts are saved.
  ! --textmode is no longer required for pgp classic mode signing, although
    mutt still keeps the flags in the sample config files.
  ! ~C and ~L patterns match Bcc recipient lists too.
  ! When querying for addresses, via <query> or <complete-query>,
    the query menu can be exiting via <quit> after tagging entries.
    Previously, <select-entry> had to be used for tagged entries to be
    processed.
  ! Classic S/MIME now generates application/pkcs7-mime and
    application/pkcs7-signature types instead of the deprecated
    x-pkcs7-mime and x-pkcs7-signature types.
  ! Saving attachments will sanitize filenames by substituting '_' for '/'.
  ! Regular expression handling when searching in the pager has been
    improved slightly.  (REG_NEWLINE mode has been turned off, and
    newlines are excluded from searches).  This means searches such
    as /^$ now work properly.
  ! When compiled with OpenSSL, Mutt follows RFC6125, and does not match
    against CN entries in the certificate if there are any DNS entries.


To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.126 -r1.127 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/mutt/patches/patch-color.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.298 pkgsrc/mail/mutt/Makefile:1.299
--- pkgsrc/mail/mutt/Makefile:1.298     Fri Jun 12 06:45:18 2026
+++ pkgsrc/mail/mutt/Makefile   Sun Jun 21 07:31:00 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.298 2026/06/12 06:45:18 tron Exp $
+# $NetBSD: Makefile,v 1.299 2026/06/21 07:31:00 tron Exp $
 
-DISTNAME=              mutt-2.3.3
+DISTNAME=              mutt-2.4.0
 CATEGORIES=            mail
 MASTER_SITES=          http://ftp.mutt.org/pub/mutt/
 

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.126 pkgsrc/mail/mutt/distinfo:1.127
--- pkgsrc/mail/mutt/distinfo:1.126     Fri Jun 12 06:45:18 2026
+++ pkgsrc/mail/mutt/distinfo   Sun Jun 21 07:31:00 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.126 2026/06/12 06:45:18 tron Exp $
+$NetBSD: distinfo,v 1.127 2026/06/21 07:31:00 tron Exp $
 
-BLAKE2s (mutt-2.3.3.tar.gz) = 77800b4deeb8a8f209559be151cd4ffef5bae527fc1c674d8e587aa680b3fffb
-SHA512 (mutt-2.3.3.tar.gz) = 80c2e7e9c76d1434df35bad11ccbf4a12b6c00b2fa59c27974bb74605ec23c7a09b25b0b0cc421870e01cef3d1c7b086d45f8c7f8eac93204c2002643a86e3e2
-Size (mutt-2.3.3.tar.gz) = 5570769 bytes
+BLAKE2s (mutt-2.4.0.tar.gz) = 98706cdf1c10c714bf996e118fc903657aff5768b1a1bfcff5589c01984d1bd9
+SHA512 (mutt-2.4.0.tar.gz) = c0c849136be8eb8dcc4b45c5a602e17e3f4405cb1d9bb82f18ca01d7fd2e0bef176b67676528e340e430ae00632925d255b5a4cd195cb4addaa2341a71e2b23d
+Size (mutt-2.4.0.tar.gz) = 5624762 bytes
 SHA1 (patch-Makefile.in) = 646eab10790053fff80bf8012ea85f40412b330c
-SHA1 (patch-color.c) = fc3777cace89e615b13118561ba133c504741bd0
+SHA1 (patch-color.c) = 36ba13d3fb1a034ed464397c61679bdb8e2cc2e5
 SHA1 (patch-configure) = 214197f399431f25ca57e2567be88e7b4fb02e9a
 SHA1 (patch-doc_Makefile.in) = 8086887afeec554d0c78047a48ec3eb33d38f26c

Index: pkgsrc/mail/mutt/patches/patch-color.c
diff -u pkgsrc/mail/mutt/patches/patch-color.c:1.2 pkgsrc/mail/mutt/patches/patch-color.c:1.3
--- pkgsrc/mail/mutt/patches/patch-color.c:1.2  Sat Dec  5 13:02:03 2020
+++ pkgsrc/mail/mutt/patches/patch-color.c      Sun Jun 21 07:31:00 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-color.c,v 1.2 2020/12/05 13:02:03 tonio Exp $
+$NetBSD: patch-color.c,v 1.3 2026/06/21 07:31:00 tron Exp $
 
 Fix build under NetBSD
 
---- color.c.orig       2020-11-03 17:50:37.000000000 +0000
-+++ color.c    2020-11-08 16:39:21.085043268 +0000
-@@ -119,7 +119,7 @@
+--- color.c.orig       2026-06-12 06:03:22.000000000 +0100
++++ color.c    2026-06-21 08:25:36.282919578 +0100
+@@ -133,7 +133,7 @@
  
- #define COLOR_QUOTE_INIT      8
+ #define COLOR_QUOTE_INIT        8
  
 -#ifdef NCURSES_VERSION
 +#if defined(NCURSES_VERSION) || (defined(__NetBSD__) && !defined(USE_SLANG_CURSES))
  #define ATTR_MASK (A_ATTRIBUTES ^ A_COLOR)
- #elif defined (USE_SLANG_CURSES)
+ #elif defined(USE_SLANG_CURSES)
  #define ATTR_MASK (~(unsigned int)A_NORMAL ^ (A_CHARTEXT | A_UNUSED | A_COLOR))