From nobody Mon May 18 16:22:22 2026 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 4gK33y1pjyz6fbn5 for ; Mon, 18 May 2026 16:22:22 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gK33y1JzBz3wL3 for ; Mon, 18 May 2026 16:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779121342; 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=4jzgq3k3pcKlm/824Lnk4SyYyzV5uABUazR3qHWJCcc=; b=QdvMElyV+Rmf3Z6xQl8uyw4Sdk3/+OhKDziL23KQd6QGbbopBHW9yEKkmMBPm0v/LzqLHk Fx1Am0a0i1XVyzlob4FJNzn86i0xgydkjChmFQVBznzCHT4EPbjTlrY62zis0sq5Fwy6pp zUhgJM6Y7n9BT9TwiwLkVO/4EuDWQiZxyrG7SbsXOUSn1knaoIARk1m5LYJrLZOFhQqXVj nZ72c0lEYqiT+d1Mrb2WttOhJM1RtPSST5x0k0RXdQqXJBFRyPIEbajnO2NXnWDlijo4Py caup8gutWU4vvYIHn5Xf6UYbnGlMh3UVZ+oM6vICwEyEh3jJGBxbncMnwp1HBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779121342; a=rsa-sha256; cv=none; b=EQ16ys6vqgSIcpTA1HRLcaYNSQhDTmBuPX1OCAHyHeEnWOc8MIv2oiifUl0X8ehc40XL8n UhJM/vuNa016A4/8OyPPrrM1j+imbwIzQjLKH1M+RpW60f7JzKQFAYobBCGvWQJPd1oSDO JBv8n2P/qMdNenHcN3L0UgjlvpbWC8sJdQNhR770XzG5K+fbLAIcdGPsMpIv+tloT3uqq8 bPRi/7c/x6+VUdWDtDOTRH8oShOoXbhY7qpQw3M84vF9pidjn1/YrWDAY7H9DTZ60r4m4G kirxxagtGPsyyh4zeuUDKQpDeb5qEjP764iTxlqQRV2a5tBmNqx7/u0sGdG2kw== 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=1779121342; 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=4jzgq3k3pcKlm/824Lnk4SyYyzV5uABUazR3qHWJCcc=; b=QCxBITre23uCeV6MPDyXBKns68dHe6MPdhN6xhQlQW9CVYA0wB95876Zev3u1wvod7cth5 25Hi9OKpNR1H4ZTUwI18kFfVGG6EZXczJNDbnsrU9KO0TU6t+s2QoszbVa4ji3eo56n5w/ gr5AvZUmLQAZ7aAjprGNuSeVoEbuzziI75NasOGR+ca43JBNjS2PY5zCnCH7FPelS3quLu 3nNzNJz/wMN8XDUy5dnJCj168hcL8D16dcURoxdastcMlMubMGmY0UNWtkZW9PdiSFiY84 ZQysvEVuIlcbvAHragoOSV2tn+tpJr2LjzDbFELZwf4ayBOTf6rWEqduQjesLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gK33y0rJGzcQX for ; Mon, 18 May 2026 16:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18077 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 18 May 2026 16:22:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2509ddee9bdb - main - freebsd-update: Skip /etc/ssl/cert.pem 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2509ddee9bdb2240ba2f622e3a55a98ebc2aa4ae Auto-Submitted: auto-generated Date: Mon, 18 May 2026 16:22:22 +0000 Message-Id: <6a0b3cbe.18077.1deb9f24@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2509ddee9bdb2240ba2f622e3a55a98ebc2aa4ae commit 2509ddee9bdb2240ba2f622e3a55a98ebc2aa4ae Author: Dag-Erling Smørgrav AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-18 16:22:04 +0000 freebsd-update: Skip /etc/ssl/cert.pem We already run `certctl rehash` at the end, there is no point in asking users upgrading from 15.0 to 15.1 to manually merge the trust store. MFC after: 3 days Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D57028 --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index b23ada60e8aa..a932cdb26965 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2581,7 +2581,7 @@ upgrade_merge () { # Some files need special treatment. case ${F} in - /etc/spwd.db | /etc/pwd.db | /etc/login.conf.db) + /etc/spwd.db | /etc/pwd.db | /etc/login.conf.db | /etc/ssl/cert.pem) # Don't merge these -- we're rebuild them # after updates are installed. cp merge/old/${F} merge/new/${F}