Date: Mon, 14 Nov 2022 08:09:37 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 616f32ea6da7 - main - othermta: remove leftover from 20 years ago Message-ID: <202211140809.2AE89br6055984@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=616f32ea6da7f46eca5cbae757543bab45889791 commit 616f32ea6da7f46eca5cbae757543bab45889791 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2022-11-14 08:06:10 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211140809.2AE89br6055984>