From nobody Mon Oct 14 10:23:49 2024 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 4XRtcQ1HlBz5YKVS; Mon, 14 Oct 2024 10:23:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRtcQ071Sz4sH7; Mon, 14 Oct 2024 10:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728901430; 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=kRcou48fpNwyobDs3thOXJ1KnXljTlJn/dzTo4IZO2k=; b=yFZsSv+0sC2Tb1PEXztywIPByoMs6ByXvkrlf5Q+7FsTj7nPKcwDtUXAher3Z1331zwj8c 8kljZ+15taHdTGoTXxRLL3O1pwNh4A0REQPabcLuOkTZcZMAZg238kU1VK3qrD7/9r7tYz PxX0abRSUT4Ze0x1I7z5B/a0dXYls4sgIg/kfXYSz8wCwYG7QZRKC4HwOp/OPRcFV6/hu/ NXPSG5TqQn0kGiVZY+JwF4lC+QYs4OrHXuXW4AYmu+jxkM4nIqGNz8bLpA9tlaZ80H5Luy /ftqtbgl+WwPIb4PUqYraQZDBQGq+i8yqG/NPS8fA0uVX5DltCo97cA04/23yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728901430; 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=kRcou48fpNwyobDs3thOXJ1KnXljTlJn/dzTo4IZO2k=; b=HFov6K5D2XA65tOPeSgMkqOHiYliH77NhulVAvqhBmhJyPlzIJAw5EGh/wHBP3g9q362CM mzqiFV+oj8z5BZ1bBcqRtdE1FpGuiIneVOvy8bwaV1wMqDYypY8PLfzL2JCH/axkH5iHMd AjSsLNJ3K9d58hxZ+4bopsxoFcLBvEqHIYcMKO6nuVsqqK7ELEhiU/wazoCXtXI9GrQNf2 omZVj8YiXeYFrmrV/zKD3Y8FPSz9n9ZYw0QcA27jawZIZ6YpdrPSdb2h7N8u7bgwY0DaNd CTYx2Mfp0KzHlaXKHFNmNZacCzchuCKjhFXkLFgbDCIDbDxwaCq9rQeXPg6bpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728901430; a=rsa-sha256; cv=none; b=cBDUdQSQvX+U+XPWlwFcJas9uzmBz40YP5LWK5aABOGPOUahIQiOmseTacOvkfKKUe3Rx0 oKIUI1X4mZ64ykEpbnqfd3bzFPmK3hTdr2OY8+bgoJE/QzW3HIS1QzKZ+OC/fLQEG+sTdD S94vk6vdXAu0POO6up9OaoMxu9ZhcEzsHibB9VDrZWOdrBbhXVoZDU4JphStMGHM+S/FCu sbjZuVOHthgvlvosgedltPa/TtpDPHbH40Mux2Q8Y75hWmVbvf36VbNMzYAe7hxzaaRGcb ChttyyE/5MaYp4BJQWmu0DVnn53Zftfm5H1iySit9jdyXsZNPqHx1cPqRRgBLg== 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 4XRtcP6q9VzZby; Mon, 14 Oct 2024 10:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49EANnce069701; Mon, 14 Oct 2024 10:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49EANnVY069698; Mon, 14 Oct 2024 10:23:49 GMT (envelope-from git) Date: Mon, 14 Oct 2024 10:23:49 GMT Message-Id: <202410141023.49EANnVY069698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 4fc260561e84 - stable/13 - rc.d/sendmail: Fix stopping service during shutdown 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4fc260561e84edf5df13d4ba3aa829e5750c9f6e Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=4fc260561e84edf5df13d4ba3aa829e5750c9f6e commit 4fc260561e84edf5df13d4ba3aa829e5750c9f6e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-04 12:26:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-14 10:23:44 +0000 rc.d/sendmail: Fix stopping service during shutdown The sendmail service script needs to be stopped during shutdown to ensure a clean shutdown of active SMTP connections (and writing any in memory queue files). rcorder(8) requires the rcorder block to be an uninterrupted sequence of REQUIRE, PROVIDE, BEFORE, and KEYWORD lines. Having a comment in between REQUIRE and KEYWORD makes rcorder stop parsing the block when it reaches the comment. Fix that by moving the comment out from the rcorder block. Reviewed by: bnovkov, christos, gshapiro, markj Approved by: bnovkov (mentor), christos (mentor), markj (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46924 (cherry picked from commit 8751fbe36ff02ed695f02132ee6eac723d2bbe3f) --- libexec/rc/rc.d/sendmail | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index 68803a957952..ea97503890f9 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -4,9 +4,10 @@ # PROVIDE: mail # REQUIRE: LOGIN FILESYSTEMS -# we make mail start late, so that things like .forward's are not -# processed until the system is fully operational # KEYWORD: shutdown +# +# We make mail start late, so that things like .forward's are not processed +# until the system is fully operational. # XXX - Get together with sendmail mantainer to figure out how to # better handle SENDMAIL_ENABLE and 3rd party MTAs.