From nobody Thu Mar 13 19:41:49 2025 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 4ZDHv21H1Mz5r6n8; Thu, 13 Mar 2025 19:41: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDHv20QStz3xxS; Thu, 13 Mar 2025 19:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741894910; 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=AFisMRCa+5RoG8JE2TRDv5PCwPjcm3zb4SqpFoetwzk=; b=aB1fxTEyczymOIRpEGbmwxNdwRe8g3hQP2m5sMhfF/IULfSfYln41QT3dBwH08UNaRNI+N 60nTZO5k6UcRgbVDWsMA7IPeed5AdwhH/LREWJ2UDhAl2l4MDmHSGlsCi27rm4crmuPy0M xy2rLhU/tZQJeozGP4F1lS+icyxqOZWxtFzN9X8IZdvp1IU7inml4goEYUkHy/3wCD40kt biGg+KvfnbO04UC5ERkgkGFVH9t0mG+9/N3vfqUoZ8PSFbGkrImw3l0uxbRXcpK8ej6MY4 rYg0l+8yrD9Sls173dxgeR4drOtp4LRAIuC734UlHTpyP3k1jObKSTKQmwvCtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741894910; a=rsa-sha256; cv=none; b=Nps31+vxtnSTKTaFk0vX4OUowRHAW44S0HsBVmfriGwQDv0KMhWvBnTCAlzUNSxi2w+wHe u8VSwq6gVWJKTLv6ZuhrIhMVLES+/bVuhIcGNvdTOmOFVmOM71eGkuzXtvCO3WQA2tUM4k oqqBFYaZGf/zt7Ayl7tdI/aPzx8B6wqztHiqKB9/ZKS8jC+lO8WuZBa/PyvcpVrX+/3ejJ RLw3CM4Jw34py1nA7qjN70BrSsrK1/2JTLNGkgABYB9ai/CkuAegfBPLF74JtQwB13dyqK Q9c+CsY0S7CROCDmFghOY5dtk160wUULGpAVrNAFO9pHQIV9tuLWtY32gbpajg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741894910; 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=AFisMRCa+5RoG8JE2TRDv5PCwPjcm3zb4SqpFoetwzk=; b=HvsHMQ67M7WUMVum0Rgmc2voL7sXtBINsz3zlL4TUED0oYlaIdG1DvD/UoiM57WnwoOLlh jbvtyppbkt8m1MDiTi9Z+y2lldNUoY6IChEVKA3n9Xcdz/0OCJrJIKaSXxPLmx0pOoqbr+ WyyARlIax+B98KBjzCxSikxAt7gzURZ2HfQZbb3iVATgXEnEASRElPFrzGe8b6io7lMXmj qpKiW9of1dZNhRHequycbW5ce+LH+Ps8hP44vXYcfqcN3T44S91jF5SfDU1JG2bAgPLoxp V/ckkgs1lUGwoFeT31tfA0GcjYdPbH2A1EVy7PFY3jcYuolb/oJDQ6ixmICMMA== 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 4ZDHv201Vqz1BJX; Thu, 13 Mar 2025 19:41:50 +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 52DJfnr8057011; Thu, 13 Mar 2025 19:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DJfnjs057008; Thu, 13 Mar 2025 19:41:49 GMT (envelope-from git) Date: Thu, 13 Mar 2025 19:41:49 GMT Message-Id: <202503131941.52DJfnjs057008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d6c34d14443a - main - rc.d/sendmail: remove a obsolete upgrade seatbelt 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6c34d14443a391f066a6b3331aa659baec692ff Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d6c34d14443a391f066a6b3331aa659baec692ff commit d6c34d14443a391f066a6b3331aa659baec692ff Author: Brooks Davis AuthorDate: 2025-03-13 19:41:35 +0000 Commit: Brooks Davis CommitDate: 2025-03-13 19:41:35 +0000 rc.d/sendmail: remove a obsolete upgrade seatbelt This check was in place to aid the transition from sendmail pre-8.10. 8.10 was released in 2000. It's not possible to upgrade directly from such as system (Freebsd 3?) to FreeBSD 15 so we can drop this. Reviewed by: gshapiro, jhb Differential Revision: https://reviews.freebsd.org/D49308 --- libexec/rc/rc.d/sendmail | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index fa82d44ecc35..a9d37f3f7d69 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -180,17 +180,6 @@ sendmail_cert_create() sendmail_precmd() { - # Die if there's pre-8.10 custom configuration file. This check is - # mandatory for smooth upgrade. See NetBSD PR 10100 for details. - # - if checkyesno ${rcvar} && [ -f "/etc/sendmail.cf" ]; then - if ! cmp -s "/etc/mail/sendmail.cf" "/etc/sendmail.cf"; then - warn \ - "${name} was not started; you have multiple copies of sendmail.cf." - return 1 - fi - fi - # check modifications on /etc/mail/aliases if checkyesno sendmail_rebuild_aliases; then if [ -f "/etc/mail/aliases.db" ]; then