From nobody Mon Nov 14 08:09:37 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 4N9hmf0MNxz4hPmr; Mon, 14 Nov 2022 08:09:38 +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 4N9hmd6xQlz4YDB; Mon, 14 Nov 2022 08:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668413378; 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=JQfgGCdQI9WwFrfbdw6ROt8vvfQUJEGoH5xq+NU7CrI=; b=vKmcQy9mi7rY8OqbhtjJVPvjwWbrKabpkvq5hgQryWHzb2FeF61US0cXk+gLvZxOrzpdM2 e+VuOVOS7hzPPTe4TAYUj5L6l4Ra02vMwhMy8baLdyvllxGENxmV3bL+XL9fr93BnLW/mw o1yOZH1PN69PzqVjLUNgLIefqgTlw7zzLn6gU1oCq7KkeRhph3RBt/uE+ncgQpEQN6ZYU5 9cwaxd5vdKZv6DW1DRblqIcG/qoJBQdrKQNx6D9RuLDv0JTZCtmDP0dIo/ov1znRKGv6DN 643xucEJL+4OyDpR094W9HFxzLXCmJsUzHgFBWuNeKLhUHv9V5mLqNqlQUGp0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668413378; 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=JQfgGCdQI9WwFrfbdw6ROt8vvfQUJEGoH5xq+NU7CrI=; b=deOrEEqJu8/M4PEgupMBfPiYbPB/yxQmgEtJ44JikibEX1PktBFTRHmxVWGPbQmijzskT8 cWCj+SUNH8yWZjuh0Ouju2tNPyjY1ZgI2+RD83ITef8vcQuXwsLKRCfUcRTGMZPccjxh9F oPR/sIU/hvimfrjIBSOY+fXM7bNkLpB7xn4wuUw87n4jIsHvj0LlblVE6zkHoW8T5I8JcZ hg6JYaTW/JqJxXN+WvKyb4Cny79kNrgizuOZhOA7IECT0t6plr/nJLIjEXHp0VOOFx8QCd kSBL+Vw1xROEB1pTdKY3i/737zU85bWyC0I4g8nAitAG1MdN7qau0xpWAj7kNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668413378; a=rsa-sha256; cv=none; b=StodLMan5/Jl5y0hJxoXkinQyPMeTR16kU7BrI0+anHQAwO5IbX3hB3nQQtAEpllyEUHZs gECqeDhUH6sx27wun6n93SQ2F7YjYXGZ01/rRkp/R9ztorqAQzcq1qy4EmX5vgxcGqMiIw pHUA0vdi5AjQVsi3+plrVlPQLbmXUm/leSpvnhF+jB2D9xRGgAuZMvEQMeKBLw3R7o24d6 bBr/D112W2X+PkIWgQLaaYGoVFbjzjFC0z5jrv4yS9dAUVabmKApupLuw2YJcWCXvX144k DDgV97kiVBqGVCxqE2xfm7+eqvwWvs06sF1LskKBMuOCyKPCjL8sxKkFJlvXGA== 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 4N9hmd5zv3zZtw; Mon, 14 Nov 2022 08:09:37 +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 2AE89bf3055985; Mon, 14 Nov 2022 08:09:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AE89br6055984; Mon, 14 Nov 2022 08:09:37 GMT (envelope-from git) Date: Mon, 14 Nov 2022 08:09:37 GMT Message-Id: <202211140809.2AE89br6055984@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: 616f32ea6da7 - main - othermta: remove leftover from 20 years ago 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: 616f32ea6da7f46eca5cbae757543bab45889791 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=616f32ea6da7f46eca5cbae757543bab45889791 commit 616f32ea6da7f46eca5cbae757543bab45889791 Author: Baptiste Daroussin AuthorDate: 2022-11-14 08:06:10 +0000 Commit: Baptiste Daroussin CommitDate: 2022-11-14 08:08:37 +0000 othermta: remove leftover from 20 years ago othermta (along with mta_start_script configuration entry in rc.conf) was a mechanism used to be able to run another mta than sendmail(8) before "rcng" time 20 years ago. othermta has not been used since. --- ObsoleteFiles.inc | 3 +++ libexec/rc/rc.conf | 2 -- libexec/rc/rc.d/Makefile | 4 ---- libexec/rc/rc.d/othermta | 18 ------------------ share/man/man5/rc.conf.5 | 10 +--------- tools/build/mk/OptionalObsoleteFiles.inc | 1 - 6 files changed, 4 insertions(+), 34 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6c65c3d469b1..5b0331bdc820 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20221114: remove othermta +OLD_FILES+=etc/rc.d/othermta + # 20221109: remove rc.sendmail(8) OLD_FILES+=etc/rc.sendmail OLD_FILES+=share/man/man8/rc.sendmail.8.gz diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 50fed07df127..63832505eade 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -593,8 +593,6 @@ allscreens_kbdflags="" # Set this kbdcontrol mode for all virtual screens ### Mail Transfer Agent (MTA) options ###################### ############################################################## -mta_start_script="/etc/rc.sendmail" - # Script to start your chosen MTA, called by /etc/rc. # Settings for /etc/rc.d/sendmail: sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO/NONE). # If NONE, don't start any sendmail processes. diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 0f0d87bdde80..36b86a6636d9 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -255,10 +255,6 @@ VAR_HEMIDAL= /var/heimdal VAR_HEMIDAL_MODE= 700 .endif -.if ${MK_MAIL} != "no" -CONFS+= othermta -.endif - .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif diff --git a/libexec/rc/rc.d/othermta b/libexec/rc/rc.d/othermta deleted file mode 100755 index 36292ae3f7b7..000000000000 --- a/libexec/rc/rc.d/othermta +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mail -# REQUIRE: LOGIN - -# XXX - TEMPORARY SCRIPT UNTIL YOU WRITE YOUR OWN REPLACEMENT. -# -. /etc/rc.subr - -load_rc_config - -if [ -n "${mta_start_script}" ]; then - [ "${mta_start_script}" != "/etc/rc.sendmail" ] && \ - sh ${mta_start_script} "$1" -fi diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 33390f77c8f3..e67273cf0ea2 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 10, 2022 +.Dd November 14, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -3551,14 +3551,6 @@ program. The default is .Dq Li -d , which causes missing directories to be created. -.It Va mta_start_script -.Pq Vt str -This variable specifies the full path to the script to run to start -a mail transfer agent. -The default is -.Pa /etc/rc.sendmail . -Note that it only executes a script if the value is set to something -different than the default. .It Va dumpdev .Pq Vt str Indicates the device (usually a swap partition) to which a crash dump diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a1094b2732bd..9a0b9b4bb1b2 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5684,7 +5684,6 @@ OLD_FILES+=etc/mail.rc OLD_FILES+=etc/mail/aliases OLD_FILES+=etc/mail/mailer.conf OLD_FILES+=etc/periodic/daily/130.clean-msgs -OLD_FILES+=etc/rc.d/othermta OLD_FILES+=usr/bin/Mail OLD_FILES+=usr/bin/biff OLD_FILES+=usr/bin/from