CVS commit: pkgsrc/mail/neomutt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 12 11:24:05 UTC 2025

Modified Files:
        pkgsrc/mail/neomutt: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/mail/neomutt/patches: patch-smime_Makefile.autosetup

Log Message:
neomutt: update to 20251211.

2025-12-11  Richard Russon  \<rich%flatcap.org@localhost\>
* Security
  - #4725       deprecate old ssl and tls options
* Features
  - #4718       add `$message_id_format`
  - Notmuch: hide some old/deprecated features
* Bug Fixes
  - #4666       limit: force refresh of index bar
  - #4671       Update the status bar on thread [un]collapse
  - #4673       shrink history file on every new entry
  - #4679       Flush S/MIME passkey on failure to sign
  - #4684       execute message-hook sooner
  - #4687       fix: exec auto-completion
  - #4688       Fix infinite loop in GnuTLS socket I/O when socket blocks
  - #4696       `cmd_parse_fetch()`: debug: avoid NULL dereference
  - #4697       expunge: guard against segfault
  - #4719       alias: complete when only one match
  - #4721       browser: fix select/descend folder/mailbox
  - #4726       imap: protect against crash on shutdown
  - fix resolve for tagged save
  - help: fix sorting of unbound functions
  - help: hide deprecated functions
* Changed Config
  - New: `message_id_format = "<%z@%f>"`
  - Deprecated `ssl_use_sslv2`
  - Deprecated `ssl_use_sslv3`
  - Deprecated `ssl_use_tlsv1`
  - Deprecated `ssl_use_tlsv1_1`
* Translations
  - 100% Esperanto
  - 100% Lithuanian
  - 100% Serbian
  - 100% Turkish
* Docs
  - #4665       Revamp the S/MIME docs
  - #4680       Document how to use S/MIME with GPGMe
  - #4692       update the contribution guidelines
  - fix deprecated $pager example
  - lots man pages fixes
  - update help for sort options
* Build
  - #4668       fix build for re-entrant ncurses
  - #4727       make openssl/gnutls mutually exclusive
  - libkey: light refactoring
  - lua: create liblua
* Code
  - #4695       Replace some `TAILQ` uses with `ARRAY`
  - convert the ctype wrappers to use `bool`
  - global invert `OptNoCurses` to `OptGui`
  - key: collapse redirector functions
  - move `km_init()` earlier in startup
  - opcodes: add flags to `MenuFuncOp`
  - pass focused window to global functions
  - Use `buf_at()` to get a char from a `Buffer`
  - use `StringArray` everywhere


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/mail/neomutt/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/neomutt/PLIST
cvs rdiff -u -r1.81 -r1.82 pkgsrc/mail/neomutt/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/neomutt/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/neomutt/patches/patch-smime_Makefile.autosetup

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

Modified files:

Index: pkgsrc/mail/neomutt/Makefile
diff -u pkgsrc/mail/neomutt/Makefile:1.109 pkgsrc/mail/neomutt/Makefile:1.110
--- pkgsrc/mail/neomutt/Makefile:1.109  Thu Oct 23 20:38:11 2025
+++ pkgsrc/mail/neomutt/Makefile        Fri Dec 12 11:24:05 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2025/10/23 20:38:11 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2025/12/12 11:24:05 wiz Exp $
 
-DISTNAME=              neomutt-20250905
-PKGREVISION=           1
+DISTNAME=              neomutt-20251211
 CATEGORIES=            mail
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=            ${PKGVERSION_NOREV}

Index: pkgsrc/mail/neomutt/PLIST
diff -u pkgsrc/mail/neomutt/PLIST:1.27 pkgsrc/mail/neomutt/PLIST:1.28
--- pkgsrc/mail/neomutt/PLIST:1.27      Sun Sep  7 09:22:59 2025
+++ pkgsrc/mail/neomutt/PLIST   Fri Dec 12 11:24:05 2025
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.27 2025/09/07 09:22:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2025/12/12 11:24:05 wiz Exp $
 bin/neomutt
 libexec/neomutt/pgpewrap
 ${PLIST.smime}libexec/neomutt/smime_keys
 man/man1/neomutt.1
 man/man1/pgpewrap_neomutt.1
-man/man1/smime_keys_neomutt.1
+${PLIST.smime}man/man1/smime_keys_neomutt.1
 man/man5/mbox_neomutt.5
 man/man5/mmdf_neomutt.5
 man/man5/neomuttrc.5
@@ -28,7 +28,7 @@ share/doc/neomutt/miscellany.html
 share/doc/neomutt/optionalfeatures.html
 share/doc/neomutt/reference.html
 share/doc/neomutt/security.html
-share/doc/neomutt/smime-notes.txt
+${PLIST.smime}share/doc/neomutt/smime-notes.txt
 share/doc/neomutt/tuning.html
 share/examples/neomutt/neomuttrc
 share/locale/bg/LC_MESSAGES/neomutt.mo
@@ -82,5 +82,6 @@ share/neomutt/logo/neomutt.svg
 share/neomutt/mime.types
 share/neomutt/oauth2/README.md
 share/neomutt/oauth2/mutt_oauth2.py
+${PLIST.smime}share/neomutt/smime.rc
 share/neomutt/vim-keys/README.md
 share/neomutt/vim-keys/vim-keys.rc

Index: pkgsrc/mail/neomutt/distinfo
diff -u pkgsrc/mail/neomutt/distinfo:1.81 pkgsrc/mail/neomutt/distinfo:1.82
--- pkgsrc/mail/neomutt/distinfo:1.81   Sun Sep  7 09:22:59 2025
+++ pkgsrc/mail/neomutt/distinfo        Fri Dec 12 11:24:05 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.81 2025/09/07 09:22:59 wiz Exp $
+$NetBSD: distinfo,v 1.82 2025/12/12 11:24:05 wiz Exp $
 
-BLAKE2s (neomutt-20250905-20250905.tar.gz) = 0ba76d1fcddc7c73d1e70d73d3b4b3527333a4f1c3202bd0c9b85317c277e183
-SHA512 (neomutt-20250905-20250905.tar.gz) = 18203b0d1451ffaee17c5c03579b3672431601636c444da51f2911df13b752d1e24fd2b6b2fa846a3706176e9aca23a48f8b0a319b356f64b7b816c6de481a7f
-Size (neomutt-20250905-20250905.tar.gz) = 4185921 bytes
+BLAKE2s (neomutt-20251211-20251211.tar.gz) = 0b8e5df6516ed0b1c712c81e48e8bdde2652f79480b4c66e5d03384b0e94acf7
+SHA512 (neomutt-20251211-20251211.tar.gz) = 9290a3d6a6cc68bdc567e5f727679f7fee3d69098b10417eeeee974e9fe2b402c3bfd5d4596e2b82f45a416f15bf659c6080c3cf3f8e49270df1f451615a8965
+Size (neomutt-20251211-20251211.tar.gz) = 4194272 bytes
+SHA1 (patch-smime_Makefile.autosetup) = f5bd8d86e70ce66b7510fc112fb4038b9e49b172

Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.24 pkgsrc/mail/neomutt/options.mk:1.25
--- pkgsrc/mail/neomutt/options.mk:1.24 Mon May  6 13:46:13 2024
+++ pkgsrc/mail/neomutt/options.mk      Fri Dec 12 11:24:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2024/05/06 13:46:13 wiz Exp $
+# $NetBSD: options.mk,v 1.25 2025/12/12 11:24:05 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=      --disable-ssl
 PLIST_VARS+=           smime
 .if !empty(PKG_OPTIONS:Msmime)
 USE_TOOLS+=            perl:run
-REPLACE_PERL+=         contrib/smime_keys
+REPLACE_PERL+=         smime/smime_keys
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --smime
 PLIST.smime=           yes

Added files:

Index: pkgsrc/mail/neomutt/patches/patch-smime_Makefile.autosetup
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-smime_Makefile.autosetup:1.1
--- /dev/null   Fri Dec 12 11:24:05 2025
+++ pkgsrc/mail/neomutt/patches/patch-smime_Makefile.autosetup  Fri Dec 12 11:24:05 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-smime_Makefile.autosetup,v 1.1 2025/12/12 11:24:05 wiz Exp $
+
+build: fix smime (un)install
+https://github.com/neomutt/neomutt/commit/cddbd189aab68f1978ef0e361217514ec94321b3
+
+--- smime/Makefile.autosetup.orig      2025-12-11 12:31:58.000000000 +0000
++++ smime/Makefile.autosetup
+@@ -19,6 +19,6 @@ uninstall-smime:
+       $(RM) $(DESTDIR)$(datadir)/smime.rc
+       $(RM) $(DESTDIR)$(libexecdir)/$(PACKAGE)/smime_keys
+ @else
+-install-smine:
+-uninstall-smine:
++install-smime:
++uninstall-smime:
+ @endif