From nobody Thu Oct 10 11:44:00 2024 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 4XPSZm4bfXz5YvVf; Thu, 10 Oct 2024 11:44:00 +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 4XPSZm42b3z46Tp; Thu, 10 Oct 2024 11:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728560640; 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=/tnV+chIvTpdROXTYFIlvSeye73rEVwVTGHxO/zlvA0=; b=jVsnhzdgdLfAdbWvwb3Wja3r4UkYavlnfTtXMZe3K+yl+N1U6wqWj6anBp1o46YuOuJjs+ C1Wz9K0bmeDY2RkVR76ABYOd4YXpEcZAxrky4osVa3Wfpt2h+xrj3GecDCNoQX+E5mK+W8 5QTqmzNSGPeXnP/QS6xiK39uRpo6IoopAPXAq989g/PdttfAf+ChtBIn/ZSGNR6R+b8k7n DukBvsGrhFq+x0W9g/3Z3ITe+US9GL49VRquzX86pNlRdemUGK34G/BegNTtNZ/Q1cfah+ myX/TgZoVbQRYis1tOXlwSEFA0PkQGBAOTu460KPhsvBCeI4eLVm+wjzhfWuqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728560640; 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=/tnV+chIvTpdROXTYFIlvSeye73rEVwVTGHxO/zlvA0=; b=xVqJfZNb1dyNsJi2hRV08McIfdFLyHI2bijefLkXqNeP4gTvaTQngs03xT5y0X4txjwCAm rx34VxlUg/V9Cxxg5BMUqUYrSqJYD8NzSTXSEqEIqkEWcakfyHgA2JVowVGJWjRhp2Oi8b DlGdPjQO20XVJAzDn2vjRDJFTpPn9RdSLP77wkvuGc3oZF59OibFiqE7bCg+aNAGz3q+K+ 5cILiCASTGG0BcMew66MFvHBd16209BE9ri/DSqhNoXIHDb72yJ9CI1/njY1ZBPZELqI4S U19NVZpbbpJiVqLSz90GfNSfVBxiGZFuLze+KQbpG6CoEb1oTy5v06V5ervutg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728560640; a=rsa-sha256; cv=none; b=hyYyaUtbG7W113YfwP30g+RIvqgTtbEYBCJigHS3H1+pBmmC79/gg9gQCgHX4vulstkvoD ukARl53UKwDBDffvjYVWVqJ0J3HhfYexLF3dZrDH669oExuLGzfYF0e0Jpj8a3HJviIr78 hzGBDSPz6lf8SoPJEJ4hYxNd7GB/1MSg9iX/vdIjctxGFvGe3bf7jSgEBdaF+QszK0k8kr aIiCFubIUvGmD37WGLl9N4byjoDp/gzggRyHawW23ytzFuFqDOwRb+v8Bl509dfLjnogq8 K1GVRUVo5YQHSlm4Z/TceTG80JjYvmppdgNf63Esafgjp8VevXsSnsfZTylNXA== 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 4XPSZm3fBmzwvH; Thu, 10 Oct 2024 11:44:00 +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 49ABi0dp021008; Thu, 10 Oct 2024 11:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ABi0e0021005; Thu, 10 Oct 2024 11:44:00 GMT (envelope-from git) Date: Thu, 10 Oct 2024 11:44:00 GMT Message-Id: <202410101144.49ABi0e0021005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 8751fbe36ff0 - main - rc.d/sendmail: Fix stopping service during shutdown 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8751fbe36ff02ed695f02132ee6eac723d2bbe3f Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=8751fbe36ff02ed695f02132ee6eac723d2bbe3f commit 8751fbe36ff02ed695f02132ee6eac723d2bbe3f Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-04 12:26:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-10 11:43:37 +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 --- 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 94100b6d00a9..af84c6d6b548 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.