From nobody Tue Nov 15 08:10:58 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 4NBJlk4GJxz4hHYx; Tue, 15 Nov 2022 08:10:58 +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 4NBJlk3qS1z3tMN; Tue, 15 Nov 2022 08:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668499858; 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=k7hkK7bColFRX7PyHxEz5q6QaUyEddKsaykuin3DGiE=; b=CSGncz8v9m1filmEmqMw7nAPo8QZHxqIdtC3rWalKrZvVCOlzTAzvOzAMuI73lLYbNqWzD f2TdnQ7qzTMcZAO+yrDlbNgQINRHD680D67lSKOgdoljaIWYXrmAy+kaSDVvZfDtkEaQ+J xgvZyokQCNgIO9WVKb8bu8QfQOMXdGzPtDPRIwU10bI4r6pAm6oU9J9Nkv7kTeoIWkYeA4 Rc+ZMu97tpBRobUnXNT/4WANI0WgZw67Fo2mmX0BNpPKEx00z/mU1uxPI3GhsNh84/CckD GrUkPbot4e20Ocpaz5KEt17GaesHo83XJJ8Lb6Nw4rfsbZbgYMiNQ2HQrDgrFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668499858; 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=k7hkK7bColFRX7PyHxEz5q6QaUyEddKsaykuin3DGiE=; b=LgoUDofKC2XkoOcVXQ4EKri2OEG694LBvDeZPZz5CpYqJksZCXvNn4+pA4i2LiIaYCEbKQ IABnax8A+Z9byn1e5jdno+ug/WhSV6xArER63oYEBm/xZdf7Er4p956x8R8IkRCuSfWaOf NKjD+dLH3/tjfEq7d8cHO4FxL2VG12MMxY2m4sD6Mc0BtYgVyxzfEqDo4XPm4Crn8Ee6gq bNqOTnJb61l36JtnCHDi8sqxEtH7KiGKZzlBHvzK6aM0SomekhS9HBwBJLueQFd0gGDJUC D9mvyNFOI1Qw0FMdnq4UisbW/F16CnhWIhB0pV1bM1mFc6uYnu3L+l4U6YqVPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668499858; a=rsa-sha256; cv=none; b=wUdfVgStiomy7M7gmNsjgtgz6He8JKTRwAm/qHK7hUfMOoB6r1pdx22z8/CKn8jjDXX/c6 P5Gduzm2GUiQBYL1kG7OwrExEdMxx1F5Zie8l/2Wyk5xkMIO8QQk5TwAGQCUW2RG2ZcuN4 K0b+PCdwNLb7cUGLwoL486VaU+KN4SwkfZmAptckbIA0/78IluL7I0GK3WVjjifeqlykwK UQpkyN/KgiVOOvVk+Hu8DFY9kZ5W5M9wq/mbtvnEwHT0H1U8W981rI+XKQJ1bezzGMsER/ tbuH7L+1Sgc4Ry6pgc9Jk3+/3E0nyk6aq1A3DZiRKO6d1LDO/HjYRn42ZML2eg== 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 4NBJlk2vTvzFTf; Tue, 15 Nov 2022 08:10:58 +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 2AF8AwIc013096; Tue, 15 Nov 2022 08:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AF8AwsH013095; Tue, 15 Nov 2022 08:10:58 GMT (envelope-from git) Date: Tue, 15 Nov 2022 08:10:58 GMT Message-Id: <202211150810.2AF8AwsH013095@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: e1184adecf3f - main - sendmail: remove leftovers from mta_start_script and rc.sendmail 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: e1184adecf3fd4937da20ecd4cb5ada101952a58 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e1184adecf3fd4937da20ecd4cb5ada101952a58 commit e1184adecf3fd4937da20ecd4cb5ada101952a58 Author: Baptiste Daroussin AuthorDate: 2022-11-15 08:08:07 +0000 Commit: Baptiste Daroussin CommitDate: 2022-11-15 08:10:53 +0000 sendmail: remove leftovers from mta_start_script and rc.sendmail Switch /etc/mail/Makefile to use /etc/rc.d/sendmail instead of /etc/rc.sendmail this switch should have been done 20 years ago. While here update the documentation to not refer anymore to mta_start_script Reported by: Jose Luis Duran --- etc/mail/Makefile | 2 +- share/man/man5/make.conf.5 | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/etc/mail/Makefile b/etc/mail/Makefile index cb63592804d3..a799a16a9c53 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -101,7 +101,7 @@ SENDMAIL_CF_DIR?= /usr/src/contrib/sendmail/cf # # The sendmail startup script # -SENDMAIL_START_SCRIPT?= /etc/rc.sendmail +SENDMAIL_START_SCRIPT?= /etc/rc.d/sendmail # # Some useful programs we need. diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index b3623b29a950..2a29eeb5f5bf 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 14, 2021 +.Dd November 15, 2022 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -573,11 +573,7 @@ The script used by to start, stop, and restart .Xr sendmail 8 . The default value is -.Pa /etc/rc.sendmail . -This value should match the -.Dq Li mta_start_script -setting in -.Xr rc.conf 5 . +.Pa /etc/rc.d/sendmail . .It Va SENDMAIL_SUBMIT_MC .Pq Vt str The default