From nobody Mon Oct 14 10:24:06 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 4XRtcl16YRz5YKSf; Mon, 14 Oct 2024 10:24:07 +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 4XRtck71jBz4sd4; Mon, 14 Oct 2024 10:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728901447; 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=jA02FxEfrEzYSONxmdTouqklfVMXND3hMQ3HsRQfj+g=; b=cKOG6ULTiE+odd4dWZKK1H2gSMlFY4RyGKuhLnujTvG+1Nd/bhw5fIA7/11kO4qFxFEK3G et6k1iVvASdcsZd6sYzqte7OenLNyIY+4VwDAtC06phiBTci0/91387cXzWGwHxm+DWd1Y VGeLWbt1fBZLkYR3+bz+Eb+ujdBrnisWUCcIuS5TUO81mIt0uVfsfAqVBQtmrHgNoSBxY9 bTrmwrlx0akRI4u/rothGRAVALwGu3urgTsbGE/NX6RyvFDlg0GG+goJgTXUK3Lct2E/CX TTCcR1VXBWrVnczIyJevaHxbZG0ZeLWADYGCOy71vds2keHftciFqwNaM6t7/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728901447; 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=jA02FxEfrEzYSONxmdTouqklfVMXND3hMQ3HsRQfj+g=; b=iTv6OZEoqxUP7iIzzY5jcYYKA/R/PSYEDY9vAxFgTE91ECHm/7mU8Mr6AMduFFLLBc/NBd aBnfzbpXWcoHGBlGZt5m8J7xKj2evXj7UKSGxiBkBsQZxF6YKG71oWdY6BrrGnbpM6qI04 g7NdYVijh4X7+ZD+r7MHHD/qTjrJid7DXZ6qz1wHeS+HShsVOsAfK3EBtLj++QXHgmEeut moM5m9Wxa1qRLeKf4Ygv32IKI5ye56it0ibWmcN3JVCEiad4hup/iA5oWWdgp+GzSbWh3s BU9lEWuwtjFE0LrP1J5Sykz5+s+Htu5EsqCfA0Ga+p/gp9uYPYVM61o0rVK29Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728901447; a=rsa-sha256; cv=none; b=Bdu1fMSPt7XA0PJ9e6cta+UAt6u2iM9uOYRBHeOHItjcIy8X9wNxCxfE4SWG+IillLlrOQ XXlpybAaPhkYDdRat9vleai0InnoGmdJqHTo1niA1EaBWm4iF6wMqxSMh9IkEW1ysWLrR6 dsq/9hfOGRBKrgU2qh3Ja/9KdEwRZivNZ2fcuUf3v0H9efXzjQS6i5//ybWSJu7vJQWvHK wVYaNl7kdaQ62T8V88zJuEv1HIsL29ZNgjjSEnI/xtcuAnOucdXDy155Srx33MoaD9t/we ak5gVbLzhHnzcsXkqjjKYR6uR3QqBV5qMoELISCxCmEsGr1EhDCO0ytpRezpHg== 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 4XRtck5y54zZTv; Mon, 14 Oct 2024 10:24:06 +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 49EAO6Ag070010; Mon, 14 Oct 2024 10:24:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49EAO6KH070007; Mon, 14 Oct 2024 10:24:06 GMT (envelope-from git) Date: Mon, 14 Oct 2024 10:24:06 GMT Message-Id: <202410141024.49EAO6KH070007@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: f94127e3ee91 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: f94127e3ee9181f60576c823ecee6c85625b96e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f94127e3ee9181f60576c823ecee6c85625b96e1 commit f94127e3ee9181f60576c823ecee6c85625b96e1 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:46 +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.