CVS commit: pkgsrc/mail/msmtp

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Feb 21 17:50:05 UTC 2025

Modified Files:
        pkgsrc/mail/msmtp: DESCR Makefile PLIST distinfo options.mk

Log Message:
msmtp: update to 1.8.28. Changes:

- Build with libgsasl by default again (if found).
- Detect SMTPUTF8 server capability and use it if available.
- Add IDN support to --configure (build with libidn2 to enable this).
- Add special value 'none' to logfile_time_format to suppress time output.
- Add a testing infrastructure ('make check')
- Many improvements in the msmtpq script
- Many improvements to the vim scripts
- Add support for SCRAM-SHA-256-PLUS and SCRAM-SHA-1-PLUS authentication, and
  prefer SCRAM methods over the PLAIN method because of their superior
  properties.
- With --read-envelope-from, a Resent-From header is now used if it is present
  and appears before any From header
- Added a new configuration command 'from_full_name' to set a full name for the
  From header (like -F on the command line)
- Fixed the allow_from_override command

Packaging adjusted to more closely resemble mpop. Build-tested on NetBSD
and macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/msmtp/DESCR
cvs rdiff -u -r1.99 -r1.100 pkgsrc/mail/msmtp/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/msmtp/PLIST
cvs rdiff -u -r1.49 -r1.50 pkgsrc/mail/msmtp/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/msmtp/options.mk

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

Modified files:

Index: pkgsrc/mail/msmtp/DESCR
diff -u pkgsrc/mail/msmtp/DESCR:1.2 pkgsrc/mail/msmtp/DESCR:1.3
--- pkgsrc/mail/msmtp/DESCR:1.2 Wed Mar 17 14:20:16 2021
+++ pkgsrc/mail/msmtp/DESCR     Fri Feb 21 17:50:05 2025
@@ -1,17 +1,17 @@
-msmtp -- SMTP plugin for MUAs
+msmtp is an SMTP client.
 
-This is a simple program that works as an "SMTP plugin" for Mutt
-and probably other MUAs (mail user agents).  msmtp forwards mails
-to an SMTP server (for example at a free mail provider) which does
-the delivery.
+In the default mode, it transmits a mail to an SMTP server which takes
+care of further delivery. To use this program with your mail user agent
+(MUA), create a configuration file with your mail account(s) and tell
+your MUA to call msmtp instead of /usr/sbin/sendmail.
 
 Features include:
-    * SMTP AUTH methods PLAIN, LOGIN, CRAM-MD5 and XOAUTH2
-    * TLS encrypted connections
-    * IPv6 support
-    * robustness
-    * detailed error messages (including the full answer of the
-      SMTP server) if something goes wrong
-    * sendmail compatible exit codes (which most MUAs understand).
 
-Simply tell your MUA to call msmtp instead of /usr/sbin/sendmail.
+- Sendmail compatible interface (command line options and exit codes)
+- Support for multiple accounts
+- TLS/SSL support including client certificates
+- Support for Internationalized Domain Names (IDN)
+- Many authentication methods
+- Fast SMTP implementation using command pipelining
+- DSN (Delivery Status Notification) support
+- SOCKS proxy support

Index: pkgsrc/mail/msmtp/Makefile
diff -u pkgsrc/mail/msmtp/Makefile:1.99 pkgsrc/mail/msmtp/Makefile:1.100
--- pkgsrc/mail/msmtp/Makefile:1.99     Thu Nov 14 22:20:38 2024
+++ pkgsrc/mail/msmtp/Makefile  Fri Feb 21 17:50:05 2025
@@ -1,39 +1,39 @@
-# $NetBSD: Makefile,v 1.99 2024/11/14 22:20:38 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2025/02/21 17:50:05 schmonz Exp $
 
-DISTNAME=      msmtp-1.8.23
-PKGREVISION=   8
-CATEGORIES=    mail
-MASTER_SITES=  https://marlam.de/msmtp/releases/
-EXTRACT_SUFX=  .tar.xz
-
-MAINTAINER=    bcv%hub3.net@localhost
-HOMEPAGE=      https://marlam.de/msmtp/
-COMMENT=       SMTP plugin for MUAs
-LICENSE=       gnu-gpl-v3
+DISTNAME=              msmtp-1.8.28
+CATEGORIES=            mail
+MASTER_SITES=          ${HOMEPAGE}releases/
+EXTRACT_SUFX=          .tar.xz
+
+MAINTAINER=            bcv%hub3.net@localhost
+HOMEPAGE=              https://marlam.de/msmtp/
+COMMENT=               SMTP client for MUAs
+LICENSE=               gnu-gpl-v3
 
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            pkg-config msgfmt xgettext
+INFO_FILES=            yes
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS.Darwin+=        --with-macosx-keyring
 
-EGDIR=         ${PREFIX}/share/examples/msmtp
-CONF_FILES=    ${EGDIR}/msmtprc-user.example \
-               ${PKG_SYSCONFDIR}/msmtprc
-
-INFO_FILES=    yes
-PLIST_VARS+=   scripts
-
 CPPFLAGS.Interix+=     -D__WINSOCK
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
+TEST_TARGET=           check
+
+EGDIR=                 ${PREFIX}/share/examples/msmtp
+INSTALLATION_DIRS+=    ${EGDIR}
+CONF_FILES=            ${EGDIR}/msmtprc-user.example \
+                       ${PKG_SYSCONFDIR}/msmtprc
+
 .include "options.mk"
 
-.PHONY: install-msmtp-scripts
 post-install: install-msmtp-scripts
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${DESTDIR}${EGDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/msmtp/PLIST
diff -u pkgsrc/mail/msmtp/PLIST:1.16 pkgsrc/mail/msmtp/PLIST:1.17
--- pkgsrc/mail/msmtp/PLIST:1.16        Fri Mar  3 09:00:52 2023
+++ pkgsrc/mail/msmtp/PLIST     Fri Feb 21 17:50:05 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2023/03/03 09:00:52 fcambus Exp $
+@comment $NetBSD: PLIST,v 1.17 2025/02/21 17:50:05 schmonz Exp $
 bin/msmtp
 bin/msmtpd
 info/msmtp.info
@@ -7,8 +7,11 @@ man/man1/msmtpd.1
 share/examples/msmtp/msmtprc-user.example
 share/locale/de/LC_MESSAGES/msmtp.mo
 share/locale/eo/LC_MESSAGES/msmtp.mo
+share/locale/es/LC_MESSAGES/msmtp.mo
 share/locale/fr/LC_MESSAGES/msmtp.mo
 share/locale/pt_BR/LC_MESSAGES/msmtp.mo
+share/locale/ro/LC_MESSAGES/msmtp.mo
+share/locale/ru/LC_MESSAGES/msmtp.mo
 share/locale/sr/LC_MESSAGES/msmtp.mo
 share/locale/sv/LC_MESSAGES/msmtp.mo
 share/locale/ta/LC_MESSAGES/msmtp.mo
@@ -25,4 +28,6 @@ ${PLIST.scripts}share/msmtp/msmtpqueue/m
 ${PLIST.scripts}share/msmtp/set_sendmail/set_sendmail.conf
 ${PLIST.scripts}share/msmtp/set_sendmail/set_sendmail.sh
 ${PLIST.scripts}share/msmtp/vim/README
-${PLIST.scripts}share/msmtp/vim/msmtp.vim
+${PLIST.scripts}share/msmtp/vim/ftdetect/msmtp.vim
+${PLIST.scripts}share/msmtp/vim/ftplugin/msmtp.vim
+${PLIST.scripts}share/msmtp/vim/syntax/msmtp.vim

Index: pkgsrc/mail/msmtp/distinfo
diff -u pkgsrc/mail/msmtp/distinfo:1.49 pkgsrc/mail/msmtp/distinfo:1.50
--- pkgsrc/mail/msmtp/distinfo:1.49     Fri Mar  3 09:00:52 2023
+++ pkgsrc/mail/msmtp/distinfo  Fri Feb 21 17:50:05 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.49 2023/03/03 09:00:52 fcambus Exp $
+$NetBSD: distinfo,v 1.50 2025/02/21 17:50:05 schmonz Exp $
 
-BLAKE2s (msmtp-1.8.23.tar.xz) = 10607de6a7b8b74dff7f957c1f039bb4df4d1b649b2806afc7d610d2991dccf7
-SHA512 (msmtp-1.8.23.tar.xz) = 69675cb539fa5c78b83e90a460e8215e56b1d0fa7a18729eb058b8d51414d13b88fbcdb2092767e7e96c325a143230ac09e041ea74d068bf267e508418cf674a
-Size (msmtp-1.8.23.tar.xz) = 401656 bytes
+BLAKE2s (msmtp-1.8.28.tar.xz) = 3d67fc40dd169dfac0f283c724c80293114b29868fd4464f08e921eef483cc2f
+SHA512 (msmtp-1.8.28.tar.xz) = 4e02e984bed897d950b4ff66b5b759f05471a19f0074c604a68a8227cd6736ecce2c22ff5e00b12acf1cbd138920c7f032c5456edac9e013a432a8e293a0ae0d
+Size (msmtp-1.8.28.tar.xz) = 442768 bytes

Index: pkgsrc/mail/msmtp/options.mk
diff -u pkgsrc/mail/msmtp/options.mk:1.17 pkgsrc/mail/msmtp/options.mk:1.18
--- pkgsrc/mail/msmtp/options.mk:1.17   Wed Jan 31 15:31:27 2024
+++ pkgsrc/mail/msmtp/options.mk        Fri Feb 21 17:50:05 2025
@@ -1,41 +1,31 @@
-# $NetBSD: options.mk,v 1.17 2024/01/31 15:31:27 ryoon Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.msmtp
+# $NetBSD: options.mk,v 1.18 2025/02/21 17:50:05 schmonz Exp $
 
+PKG_OPTIONS_VAR=               PKG_OPTIONS.msmtp
+PKG_SUPPORTED_OPTIONS=         gsasl idn scripts secret
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls ssl
-
-PKG_SUPPORTED_OPTIONS= gsasl idn scripts secret
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS=         ssl
 
 .include "../../mk/bsd.options.mk"
 
-###
-### SSL support
-###
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-tls=openssl
-.elif !empty(PKG_OPTIONS:Mgnutls)
-.  include "../../security/gnutls/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnutls)
 CONFIGURE_ARGS+=       --with-tls=gnutls
+.  include "../../security/gnutls/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=       --with-tls=openssl
+.  include "../../security/openssl/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=       --with-tls=no
+CONFIGURE_ARGS+=       --disable-tls
 .endif
 
-###
-### GNUsasl support
-###
 .if !empty(PKG_OPTIONS:Mgsasl)
-.  include "../../security/gsasl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-libgsasl
+BUILDLINK_API_DEPENDS.gsasl+=  gsasl>=2.1
+.  include "../../security/gsasl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-libgsasl
 .endif
 
-###
-### Internationalized Domain Names (IDN) support
-###
 .if !empty(PKG_OPTIONS:Midn)
 .  include "../../devel/libidn2/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-libidn
@@ -43,9 +33,6 @@ CONFIGURE_ARGS+=      --with-libidn
 CONFIGURE_ARGS+=       --without-libidn
 .endif
 
-###
-### GNOME keyring support (via libsecret)
-###
 .if !empty(PKG_OPTIONS:Msecret)
 .  include "../../security/libsecret/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-libsecret
@@ -53,20 +40,19 @@ CONFIGURE_ARGS+=    --with-libsecret
 CONFIGURE_ARGS+=       --without-libsecret
 .endif
 
-###
-### Install additional scripts
-###
+.PHONY: install-msmtp-scripts
+PLIST_VARS+=           scripts
 .if !empty(PKG_OPTIONS:Mscripts)
-REPLACE_BASH+= scripts/find_alias/find_alias_for_msmtp.sh
-REPLACE_BASH+= scripts/msmtpq/msmtp-queue
-REPLACE_SH+=   scripts/msmtpq/msmtpq
-REPLACE_SH+=   scripts/msmtpqueue/msmtp-enqueue.sh
-REPLACE_SH+=   scripts/msmtpqueue/msmtp-listqueue.sh
-REPLACE_SH+=   scripts/msmtpqueue/msmtp-runqueue.sh
-REPLACE_BASH+= scripts/set_sendmail/set_sendmail.sh
 PLIST.scripts=         yes
 USE_TOOLS+=            bash:run pax
 INSTALLATION_DIRS+=    share/msmtp
+REPLACE_BASH+=         scripts/find_alias/find_alias_for_msmtp.sh
+REPLACE_BASH+=         scripts/msmtpq/msmtp-queue
+REPLACE_SH+=           scripts/msmtpq/msmtpq
+REPLACE_SH+=           scripts/msmtpqueue/msmtp-enqueue.sh
+REPLACE_SH+=           scripts/msmtpqueue/msmtp-listqueue.sh
+REPLACE_SH+=           scripts/msmtpqueue/msmtp-runqueue.sh
+REPLACE_BASH+=         scripts/set_sendmail/set_sendmail.sh
 install-msmtp-scripts:
        cd ${WRKSRC}/scripts && \
                pax -rw find_alias msmtpq msmtpqueue \