From nobody Mon Nov 07 11:50:40 2022 X-Original-To: dev-commits-src-main@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 4N5V0w2YT6z4gn4v; Mon, 7 Nov 2022 11:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N5V0w23C7z3Vxw; Mon, 7 Nov 2022 11:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667821840; 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; bh=qKfhS2/N4wvKhREXgF5b3U9WqfIm+7XnTnZn9hxFYBQ=; b=W6NDt0Clq/lZk2FPE9sCPtwPNNN4hwPnZDQk0qIfDdBlHe2deQ5xKY52XaUXZQNkxRqdwD i0kHMPE4m0Od0O/I5uJFem+xvYwEQ/T8KK40xtlf+WleBTCRr3eC5Mp2hrutwvr9S0KLjt xKnHdDwEbma+CZYDmbZ5X3wbjbNQXq/VgRszP82CGDX2BLW51tsnbVl9dn21PgTyF41pbN auQEqln9DE56h1k/686smStO04fnfKFoPk7XvO909vONISJE8dXynBBQZwVC94RaNxo7+P qJlJHQwHa/AwBkHn5Y0dU8Rq7SNv7IbNqFMRKKDL1QVjLeaFmkfQGfl7nUKTyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N5V0w18mFz10X0; Mon, 7 Nov 2022 11:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A7BoeWQ033817; Mon, 7 Nov 2022 11:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A7BoeQL033816; Mon, 7 Nov 2022 11:50:40 GMT (envelope-from git) Date: Mon, 7 Nov 2022 11:50:40 GMT Message-Id: <202211071150.2A7BoeQL033816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a67b925ff3e5 - main - mail: make The Dragonfly Mail Agent (dma) the default mta. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a67b925ff3e58b072a60b633e442ee1d33e47f7f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667821840; 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; bh=qKfhS2/N4wvKhREXgF5b3U9WqfIm+7XnTnZn9hxFYBQ=; b=RODJ6sXWei5ceZrH5K1vB3g227BPg6WgEBRD5zU7i7up3VM9MlH2jZUqhFPzYGv5Zz8AT3 sjGmSH3eL1idKWHQg9nraHKJrJD57V5u4LXHekC2j6yP6gpzQw3bfjltf1apbWjPz25JD4 gY1XyUyuS6SqqkL7Qa/eR915iurnpYT61j4yR6xP90UcXGEk8cKTv2E9udBhk8u0ir/IJH sHMufzPC0VJ5/j9slhan45/04/wFbFETX4oxm1lGRtvfRHToCWBxPbkLIQtfSz4SwecCVl 9NekBnH+LkGvS73+CZWW//P5xUSgMDoHgh49eNTgL6eZi3o+ZhQQMzZXZPeRCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667821840; a=rsa-sha256; cv=none; b=klLl+yNrdIWKoaQdmwY2BPE67uKdqDjcTLCpbkbNFL3QuqC0n7KZPf2iVQtLu9+7U73E5/ WOv0SHmyDqUj5Ejmi/YTKUZpoSnWyuon/cTtqzkRV1Vx3ysA4SQ9UTR0k0cf8uqnG1C6Rz VJcPaUKH6zcU2qNBC/s6UI+tF8B7CgpaP4je1t/y6O98uXb18THTBCPlO3LuIotDkfcnjf dK1SbTUvcQALmNCD63KaORI5kqVYltnI3oq8/OXHo7pV6SjpiB118ZVBh3L6g2XPlofiF3 aeulAgzR74VGCtLlPcmyeQGbMkiedoDQzETA2DKq/vW/whGsijLKArjS2cPVKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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"