From nobody Tue Oct 18 14:42:49 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 4MsGmn4M5Jz4fy18; Tue, 18 Oct 2022 14:42:49 +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 4MsGmn3smYz3N8K; Tue, 18 Oct 2022 14:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666104169; 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=wxYG5bk6Ty6yKf21IrIi8SW7l3OLsmkGfTajklPPwxE=; b=W43wrkiQdBT4fQ8jjTbTjHWmNYUkEGomj41rCvyT0/0Dl5HkKck0aOp5zEdf4y/bfjARNf wtGeozdITIAgVIqHwXW48z7cdlIn+qogCuirB6eCUBandXgSckLjr8cBlaLhI4L3++d+OB I2oToUm/lYITQBhLRcYjp+gRF11xW60gqsdqsnzLISuoJQT5JNdhOcnknFOx7+DSiTabJ7 S9ZmToFgblkPOxgUDFeDW3J0e3AQLuG9EviFi9nH1lwkwo5JnrKMQCTIrOnEfSGptbUDFT N8ldWitP1jDDrERYf38VyIjzEwAZO7l4RROBMnSXE3zEukXR24M6S7z8ObcRZw== 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 4MsGmn2wFBz1C9R; Tue, 18 Oct 2022 14:42:49 +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 29IEgnl7041455; Tue, 18 Oct 2022 14:42:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29IEgnqg041454; Tue, 18 Oct 2022 14:42:49 GMT (envelope-from git) Date: Tue, 18 Oct 2022 14:42:49 GMT Message-Id: <202210181442.29IEgnqg041454@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: 3467e28f3d11 - main - mailwrapper: create mailwrapper symlinks for dma(8) 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 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: 3467e28f3d114f35bdfa87d6afd373f9d291dfb3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666104169; 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=wxYG5bk6Ty6yKf21IrIi8SW7l3OLsmkGfTajklPPwxE=; b=psyN+nREx5NkTDn82TTgdUAM2AnrzbRExcnfB3vbP4d00AyXEJsaO9WxiSqGXDWsHvycQ0 2qwQi3ys704v6pUt60Dw5Bf7MTljMAYC/W/MsPvkn5b8DZDJdeSegvnggfql3RzVHAjpGg a6o26OtCfDqDp5H9OTMjmzmEbaG41jwwxL3p0PUuuEfl+BJ65xYTzrSBEmljq/zpfTvWLA WdXa8bU48jgYv5yJQlB2YS51zSA1f1GjnSKnp4t+JBdivLNyCIHhZJpmHBvq9v5+4eAVn3 OWj8QJyujDmt3vAlz6Zkro4z97cKAQY1vdgaL5S8ws+ufxKXSXO2zC2rn7AbeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666104169; a=rsa-sha256; cv=none; b=jMj/6SaGFzgxongsUQN/D3uBTad6Ho0Zcw/CJXCico4EyDbIfuMh96PgOFzNj095nF1EIT k5fyTpLvTs0MKZNVUqJgETUZiG7QAUsh+x6HFzMczifxX0w9rJe6AJi9bpepg6tzyQi7VP 8JpCydEpPLLLubQnCXo7B+ADL5I1w5MD8CI9PAy/MyXG/6VtSiU9IOHnbW90bzQXeNdp8R LsCmCmZUNhIRaM25OTLTzJO9r1pVeT6POcqBQkGewkcXHhigneNgKcpN+vLaWZaACL0lE4 vU7QwzlncAvGb/QMvq+TBioZ8TWg2q2M9cHgZ04hz4DteFKb3qLGmMyovchWqw== 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=3467e28f3d114f35bdfa87d6afd373f9d291dfb3 commit 3467e28f3d114f35bdfa87d6afd373f9d291dfb3 Author: Baptiste Daroussin AuthorDate: 2022-10-18 14:37:53 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-18 14:42:27 +0000 mailwrapper: create mailwrapper symlinks for dma(8) The Dragonfy Mail Agent (dma) can be used with mailwrapper as a replacement for sendmail(8) Even if mailwrapper and sendmail are disabled from the build but dma is not create all the expect symlinks on mailwrapper and make mailwrapper a symlink to dma, the same way it was done before when mailwrapper is disabled by sendmail was not. Discussed with: emaste --- usr.sbin/mailwrapper/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index 28e0c3c1ce6d..3e5c46d7bdf4 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -9,7 +9,7 @@ MAN= mailwrapper.8 LIBADD= util .endif -.if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no" +.if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no" || ${MK_DMAGENT} != "no" SYMLINKS= ../sbin/mailwrapper /usr/bin/mailq \ ../sbin/mailwrapper /usr/bin/newaliases \ mailwrapper /usr/sbin/hoststat \ @@ -18,6 +18,8 @@ SYMLINKS= ../sbin/mailwrapper /usr/bin/mailq \ .if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no" SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper +.elif ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} == "no" && ${MK_DMAGENT} != "no" +SYMLINKS+= ../libexec/dma ${BINDIR}/mailwrapper .endif .endif