Dear ports maintainers, I have updated msmtp to the latest version (1.8.6) in ports. It includes the following changes:
* GnuTLS is recommended and deprecated OpenSSL. - So now GnuTLS is part of the build dependencies. * Use libidn2 instead of the older libidn. - Configure switch remains as "--with-libidn". * Refreshed patches to apply cleanly. I also have a few questions when working on this ports: * Many of the patches just replace "#!/usr/bin/env bash" to "#!/bin/sh". Now most of scripts are changed to use "#!/usr/bin/env sh" which should now be the same thing. Should we just drop those patches? * One of the patches changes the system /etc/msmtprc to provide an "account default" that listens on localhost:25, which will then use smtpd as server by default. I think the intention is to provide a working configure that works out of the box. However this may not do what you want because if one try to configure an account in a user configuration and somehow it contains errors (e.g. not properly provide a "from" address), msmtp will just send the mail through smtpd and returns OK which will result in the mail stuck in the system mail queue forever. So my suggestion is to leave this file untouched so that the system /etc/msmtprc will just provide a fake "account default" and any mail not handled with a user provided account will fail immediately. Tested on mips64el/loongson on 6.6-stable. Please let me know what you think. The diff is attached.
Index: Makefile =================================================================== RCS file: /cvs/ports/mail/msmtp/Makefile,v retrieving revision 1.47 diff -u -p -r1.47 Makefile --- Makefile 12 Jul 2019 20:47:30 -0000 1.47 +++ Makefile 21 Dec 2019 13:54:18 -0000 @@ -2,27 +2,27 @@ COMMENT = SMTP plugin for MUAs -DISTNAME = msmtp-1.6.6 +DISTNAME = msmtp-1.8.6 CATEGORIES = mail -REVISION = 1 HOMEPAGE = https://marlam.de/msmtp/ # GPLv3 PERMIT_PACKAGE = Yes -WANTLIB = c crypto iconv idn intl ssl +WANTLIB = c crypto iconv idn2 intl gnutls MASTER_SITES = https://marlam.de/msmtp/releases/ EXTRACT_SUFX = .tar.xz -LIB_DEPENDS = devel/libidn +LIB_DEPENDS = devel/libidn2 \ + security/gnutls SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --with-libgsasl=no \ --with-libidn=yes \ - --with-tls=openssl \ + --with-tls=gnutls \ --without-libsecret post-install: Index: distinfo =================================================================== RCS file: /cvs/ports/mail/msmtp/distinfo,v retrieving revision 1.30 diff -u -p -r1.30 distinfo --- distinfo 26 Mar 2017 13:34:06 -0000 1.30 +++ distinfo 21 Dec 2019 13:54:18 -0000 @@ -1,2 +1,2 @@ -SHA256 (msmtp-1.6.6.tar.xz) = 2hXbH2K9AgH85TEK24nIYYi+kc10W3yztiuBpQHn+14= -SIZE (msmtp-1.6.6.tar.xz) = 283744 +SHA256 (msmtp-1.8.6.tar.xz) = ZiXxR0MMZbqFJ/UsT+XU0zVS08D7bXk7p9+BmjswQuE= +SIZE (msmtp-1.8.6.tar.xz) = 339732 Index: patches/patch-doc_msmtprc-system_example =================================================================== RCS file: /cvs/ports/mail/msmtp/patches/patch-doc_msmtprc-system_example,v retrieving revision 1.1 diff -u -p -r1.1 patch-doc_msmtprc-system_example --- patches/patch-doc_msmtprc-system_example 13 Feb 2009 14:59:01 -0000 1.1 +++ patches/patch-doc_msmtprc-system_example 21 Dec 2019 13:54:18 -0000 @@ -1,16 +1,25 @@ $OpenBSD: patch-doc_msmtprc-system_example,v 1.1 2009/02/13 14:59:01 pirofti Exp $ ---- doc/msmtprc-system.example.orig Sat Apr 7 18:20:34 2007 -+++ doc/msmtprc-system.example Fri Feb 13 16:53:09 2009 -@@ -6,10 +6,10 @@ +--- doc/msmtprc-system.example.orig Thu Dec 13 00:22:06 2018 ++++ doc/msmtprc-system.example Sat Dec 21 01:17:17 2019 +@@ -6,15 +6,15 @@ account default - # The SMTP smarthost. + # The SMTP smarthost -host mailhub.oursite.example +host localhost - # Construct envelope-from addresses of the form "user@oursite.example". +-# Use TLS on port 465 +-port 465 +-tls on +-tls_starttls off ++## Use TLS on port 465 ++#port 465 ++#tls on ++#tls_starttls off + + # Construct envelope-from addresses of the form "user@oursite.example" -#auto_from on +auto_from on #maildomain oursite.example - # Use TLS. + # Syslog logging with facility LOG_MAIL instead of the default LOG_USER Index: patches/patch-scripts_msmtpq_msmtp-queue =================================================================== RCS file: /cvs/ports/mail/msmtp/patches/patch-scripts_msmtpq_msmtp-queue,v retrieving revision 1.1 diff -u -p -r1.1 patch-scripts_msmtpq_msmtp-queue --- patches/patch-scripts_msmtpq_msmtp-queue 11 Jan 2012 22:56:07 -0000 1.1 +++ patches/patch-scripts_msmtpq_msmtp-queue 21 Dec 2019 13:54:18 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-scripts_msmtpq_msmtp-que --- scripts/msmtpq/msmtp-queue.orig Tue Jan 10 16:47:20 2012 +++ scripts/msmtpq/msmtp-queue Tue Jan 10 16:49:07 2012 @@ -1,4 +1,4 @@ --#!/usr/bin/env bash +-#!/usr/bin/env sh +#!/bin/sh ##-------------------------------------------------------------- Index: patches/patch-scripts_msmtpqueue_msmtp-enqueue_sh =================================================================== RCS file: /cvs/ports/mail/msmtp/patches/patch-scripts_msmtpqueue_msmtp-enqueue_sh,v retrieving revision 1.1 diff -u -p -r1.1 patch-scripts_msmtpqueue_msmtp-enqueue_sh --- patches/patch-scripts_msmtpqueue_msmtp-enqueue_sh 19 Oct 2008 20:35:01 -0000 1.1 +++ patches/patch-scripts_msmtpqueue_msmtp-enqueue_sh 21 Dec 2019 13:54:18 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-scripts_msmtpqueue_msmtp --- scripts/msmtpqueue/msmtp-enqueue.sh.orig Mon Jul 28 00:20:50 2008 +++ scripts/msmtpqueue/msmtp-enqueue.sh Tue Oct 14 14:18:49 2008 @@ -1,4 +1,4 @@ --#!/usr/bin/env bash +-#!/usr/bin/env sh +#!/bin/sh QUEUEDIR=$HOME/.msmtpqueue Index: patches/patch-scripts_msmtpqueue_msmtp-listqueue_sh =================================================================== RCS file: /cvs/ports/mail/msmtp/patches/patch-scripts_msmtpqueue_msmtp-listqueue_sh,v retrieving revision 1.3 diff -u -p -r1.3 patch-scripts_msmtpqueue_msmtp-listqueue_sh --- patches/patch-scripts_msmtpqueue_msmtp-listqueue_sh 26 Mar 2017 13:34:06 -0000 1.3 +++ patches/patch-scripts_msmtpqueue_msmtp-listqueue_sh 21 Dec 2019 13:54:18 -0000 @@ -1,14 +1,14 @@ $OpenBSD: patch-scripts_msmtpqueue_msmtp-listqueue_sh,v 1.3 2017/03/26 13:34:06 rpe Exp $ --- scripts/msmtpqueue/msmtp-listqueue.sh.orig Mon Jul 28 00:20:57 2008 -+++ scripts/msmtpqueue/msmtp-listqueue.sh Tue Oct 14 14:15:51 2008 ++++ scripts/msmtpqueue/msmtp-listqueue.sh Sat Dec 21 02:43:13 2019 @@ -1,8 +1,8 @@ --#!/usr/bin/env bash +-#!/usr/bin/env sh +#!/bin/sh QUEUEDIR=$HOME/.msmtpqueue for i in $QUEUEDIR/*.mail; do -- egrep -s --colour -h '(^From:|^To:|^Subject:)' "$i" || echo "No mail in queue"; +- grep -E -s --colour -h '(^From:|^To:|^Subject:)' "$i" || echo "No mail in queue"; + egrep -s -h '(^From:|^To:|^Subject:)' "$i" || echo "No mail in queue"; echo " " done Index: patches/patch-scripts_msmtpqueue_msmtp-runqueue_sh =================================================================== RCS file: /cvs/ports/mail/msmtp/patches/patch-scripts_msmtpqueue_msmtp-runqueue_sh,v retrieving revision 1.1 diff -u -p -r1.1 patch-scripts_msmtpqueue_msmtp-runqueue_sh --- patches/patch-scripts_msmtpqueue_msmtp-runqueue_sh 19 Oct 2008 20:35:01 -0000 1.1 +++ patches/patch-scripts_msmtpqueue_msmtp-runqueue_sh 21 Dec 2019 13:54:18 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-scripts_msmtpqueue_msmtp --- scripts/msmtpqueue/msmtp-runqueue.sh.orig Mon Jul 28 00:21:43 2008 +++ scripts/msmtpqueue/msmtp-runqueue.sh Tue Oct 14 14:18:56 2008 @@ -1,4 +1,4 @@ --#!/usr/bin/env bash +-#!/usr/bin/env sh +#!/bin/sh QUEUEDIR="$HOME/.msmtpqueue"
signature.asc
Description: PGP signature
