From nobody Mon Nov 7 12:28:09 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N5VrG4c1Xz4gsS8; Mon, 7 Nov 2022 12:28:14 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N5VrG493mz3hBG; Mon, 7 Nov 2022 12:28:14 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667824094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YngRufyXCooXG1z9Ub9k2Isp3V1hhvADj5TTolLWOUA=; b=MriJArJ2T666rLGOwYPba+SIfr2isoNSwh6p0riDMIIuDZnlqYbyUdtLtNHBCWBUpeAbUe Jj1akRi3KxkvggzG7EV0sdpgUaZfYZMhauv4D8N3H7dx4xhbcyYtaLgsNI1ehYpp51TeQM ++NHCp56ZKxw11/tSgj+qXkQjnT2jLO32zH7NrWTaAYPhu4E6SL+nU0Cx+hVjit6lI1OU4 PQJmCzXd+cEhemVyULrnudia9VabAQQhIRLzt6WJ1C/NQabttwmriEziePsrAjZ7U66xdV o9BdLa3XWX1f8T7QQQrlFwvyJ5jQjY3WOE/fZD7EQORooeG7X2n4SXLnLYFqwg== Received: from [IPV6:2804:f1c:37:ae00:5d5a:ed1:a92:5c41] (unknown [IPv6:2804:f1c:37:ae00:5d5a:ed1:a92:5c41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4N5VrF453Vz1S0Z; Mon, 7 Nov 2022 12:28:13 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: <3faccc56-df6c-58bb-7e39-b0ae123a0059@FreeBSD.org> Date: Mon, 7 Nov 2022 09:28:09 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: git: a67b925ff3e5 - main - mail: make The Dragonfly Mail Agent (dma) the default mta. To: Baptiste Daroussin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202211071150.2A7BoeQL033816@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho In-Reply-To: <202211071150.2A7BoeQL033816@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667824094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YngRufyXCooXG1z9Ub9k2Isp3V1hhvADj5TTolLWOUA=; b=fQcPFFjUvb+j/9WAGlsCps7OPO3rJSzB37RryxnLdp1qjNUADnc+poeKBaGCq9m1kQGXsj 0NtAhC97VRCq71XZX5xF1qBPM4p4hOkiTP+PtLTLkqoc7/ypkDeqmubgxHbg9HzFQBr9DQ L5wrBLHuMhGLA5jp2voA5JNVREtYfO/h5sKbnwPTHd1vqeWrJCMfj6dOp8cslDis3GmK7I WZ1q+J3ZEIv5MvQIjR90W7JZP3kaBuTZeX8TytklfziB19VDGxzSf61bpPwJMG9v7hnxiv jEOlRpHb19gXlWBhad42LCGHX9VQUgnYZFsmkJeef0mIm4qi4SYRNKJ+ALNncw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667824094; a=rsa-sha256; cv=none; b=nrVLgi1v54YrP35Q/RB5oQrbEiHwhmgXgx2nxufx+kVoWEaRHx0lNcKAmTJOkpkPVdECuI Tzwj9Gs3Nz6azmev2kD/37M/FsSa08uP4x1x2/hJx2+wS9npb/d3DPFFpV3GMUDIwBbvuw Z6Kh9NQv0Xe4GEvo/wlrpKS3vx1A7F2zkA8shIoE+oG4lpg2UUAkaFgLDjkOGI2SPS9UYj QMTLqTwp+zRO6k5DMRU2Q9ARNdyt9mKRyDMcZZAv/YkshQuGNu0sBz1P3IlNt/XrO1sMXd Q6rOVODZXehbr28OQEzDbAFRAsZ7H+EUVT1idMb+TKtm+X0nmwcAtg+CAfP7bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 07/11/22 08:50, Baptiste Daroussin wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a67b925ff3e58b072a60b633e442ee1d33e47f7f > > commit a67b925ff3e58b072a60b633e442ee1d33e47f7f > Author: Baptiste Daroussin > AuthorDate: 2022-10-13 09:37:21 +0000 > Commit: Baptiste Daroussin > CommitDate: 2022-11-07 11:49:56 +0000 > > mail: make The Dragonfly Mail Agent (dma) the default mta. > > dma accepts mail from a local Mail User Agent (MUA) and delivers it > locally or to a smarthost for delivery. dma does not accept inbound > mail (i.e., it does not listen on port 25) and is not intended to > provide the same functionality as a full MTA like postfix or sendmail. > It is intended for use cases such as delivering cron(8) mail. which > is the default configuration and usage of sendmail in the default > setup of the base system. > > In order to switch the default from sendmail to dma, we teach > mailwrapper to fallback on dma directly if the mailer.conf file cannot > be opened. > We install by default a mailer.conf file which points at dma > We install a mailer.conf file for sendmail in the examples. > > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D37035 > --- > libexec/dma/dmagent/Makefile | 5 ----- > libexec/rc/rc.conf | 2 +- > usr.sbin/mailwrapper/Makefile | 19 +++++++++++++------ > usr.sbin/mailwrapper/pathnames.h | 2 +- > 4 files changed, 15 insertions(+), 13 deletions(-) > > diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile > index f7f127cf4e7e..9c440b32e50f 100644 > --- a/libexec/dma/dmagent/Makefile > +++ b/libexec/dma/dmagent/Makefile > @@ -24,11 +24,6 @@ YFLAGS+= -i > CLEANFILES= aliases_parse.i > FILES= mailer.conf > FILESDIR= ${SHAREDIR}/examples/dma > -.if ${MK_SENDMAIL} == no > -CONFGROUPS= CONFS MAILER > -MAILERDIR= /etc/mail > -MAILER= mailer.conf > -.endif > > BINMODE= 2555 > > diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf > index a71a3fa4063d..91b99780eae6 100644 > --- a/libexec/rc/rc.conf > +++ b/libexec/rc/rc.conf > @@ -596,7 +596,7 @@ allscreens_kbdflags="" # Set this kbdcontrol mode for all virtual screens > mta_start_script="/etc/rc.sendmail" > # Script to start your chosen MTA, called by /etc/rc. > # Settings for /etc/rc.sendmail and /etc/rc.d/sendmail: > -sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO). > +sendmail_enable="NONE" # Run the sendmail inbound daemon (YES/NO). > sendmail_pidfile="/var/run/sendmail.pid" # sendmail pid file > sendmail_procname="/usr/sbin/sendmail" # sendmail process name > sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) > diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile > index 3e5c46d7bdf4..0878a2f8c483 100644 > --- a/usr.sbin/mailwrapper/Makefile > +++ b/usr.sbin/mailwrapper/Makefile > @@ -16,10 +16,10 @@ SYMLINKS= ../sbin/mailwrapper /usr/bin/mailq \ > mailwrapper /usr/sbin/purgestat \ > mailwrapper /usr/sbin/sendmail > > -.if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no" > -SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper > -.elif ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} == "no" && ${MK_DMAGENT} != "no" > +.if ${MK_MAILWRAPPER} == "no" && ${MK_DMAGENT} != "no" > SYMLINKS+= ../libexec/dma ${BINDIR}/mailwrapper > +.elif ${MK_MAILWRAPPER} == "no" && ${MK_DMAGENT} == "no" && ${MK_SENDMAIL} != "no" > +SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper > .endif > .endif > > @@ -27,16 +27,23 @@ SYMLINKS+= ../libexec/dma ${BINDIR}/mailwrapper > SYMLINKS+= ..${BINDIR}/mailwrapper /bin/rmail > .endif > > +.if ${MK_SENDMAIL} != "no" > +FILES= ${SRCTOP}/etc/mail/mailer.conf > +FILESDIR= ${SHAREDIR}/examples/sendmail > +.endif > + > .if ${MK_MAILWRAPPER} != "no" > -# We install here if either sendmail(8) is enabled, or dma(8) isn't. In the > +# We install here if either dma(8) is enabled, or sendmail(8) isn't. In the > # latter scenario, we take care of the possibility that neither sendmail(8) nor > # dma(8) are installed and simply provide a default that can be changed for an > # alternative in ports. > -.if ${MK_SENDMAIL} != "no" || ${MK_DMAGENT} == "no" > +.if ${MK_DMAGENT} != "no" || ${MK_SENDMAIL} == "no" > +CONFS= ${SRCTOP}/libexec/dma/dmagent/mailer.conf > +.else > CONFS= ${SRCTOP}/etc/mail/mailer.conf > +.endif > CONFSDIR= /etc/mail > CONFSMODE= 644 > .endif > -.endif > > .include > diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h > index 5511d1eccff9..798648269f3e 100644 > --- a/usr.sbin/mailwrapper/pathnames.h > +++ b/usr.sbin/mailwrapper/pathnames.h > @@ -34,4 +34,4 @@ > */ > > #define _PATH_MAILERCONF "/etc/mail/mailer.conf" > -#define _PATH_DEFAULTMTA "/usr/libexec/sendmail/sendmail" > +#define _PATH_DEFAULTMTA "/usr/libexec/dma" > > Thank you! -- Renato Botelho