From nobody Mon May 18 16:22:22 2026 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 4gK3436ZSjz6fc45 for ; Mon, 18 May 2026 16:22:27 +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 4gK3433ghRz3wSc for ; Mon, 18 May 2026 16:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779121347; 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=aiwwWmK41QsB9sJLyBuPemEIWL9pbk93xJ4RG6d60RTEwa+LmIUxEhfp00h6kQ7CHrCyHP E1tanRprOYuZU4DRsnY1t7xYR3niauFvoSXFCsqn5CMfsPtUgMPvrEJe0Af9PQe2QBElfK RPTwwcL0j86qLRh0OnOJMur3ZF2myHqdZWOlE8OIsv/1G1a57i28Wcf+LqcU+f21Zij6JA XsThxvGUvhJ+QNKsEQI2JRQQtpLjqZo1w6d/QMpvH7hIe7Y1pNZx10kMRGxvTjLqX5G+q+ NXEQjwoWecgCSSt98F/sq4nrbaUrk5DZwscdwxmmpDcUREk0gGKs//Yg7d88eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779121347; a=rsa-sha256; cv=none; b=jC5S1r9l4PXNLPADfxWMxDF5ip3vGYbl9oYmid+1qYm6IjducYg8JPp9HifJXfd3VcW8Ae +xM23CDsKZQp0FCNERWVVNLBn19AOoQc2FnUWUDimpzIE/E4YalVTCcN6vpxq3L4uhZ8Ds 2OdNyILojZf/hRvi3ZQsOQzi4LVqUP+xG3ypFOD6cff3IWiQBaNKpjXiCzPcUUXhk7mOEO M8kVRzhgm6kUtGj64ypWGDHgBp4OwhEi0tPNrF13S87w5JzQUMaY1+7BB1zrnoavuEzUHX wYwPIJlfYO+Bls2tOWxr6f05FrmUF9QpQkQhOPaRINyvcccfw7Zp0cfWHuGXqQ== 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=1779121347; 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=X4l0jCh7KUK/7nCLAUKdUFCrRqiv9UdvZNYz12RumP1Tp9CdZIxziomM1wH6tgLdB9W+/X dmv242JuOGXRMqXb1mvqWMDF2l7cqF+r0USd1M/vgy5OWI8IbTwE0sadVPMVN8KFYzdQ3Q cdybZow2lN0rb6arMP3h2vUvXCXm1pIljEEOxmRuBF+rJ5bZRgVe/kkz5HPk1JJHlpGFJ+ aI8A0SLdszy/uBEP8tZ/WXamg6DqecaDLz4uS7pWqNxw+78ztKoGjyDysRGuyDrUZ4lDT+ gtjlXcGoXJymI1zVIGbPAWDChQPsBo/TGwDKlQun8dqLesxY/dlaxoa8gtlc7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gK34332x8zcSv for ; Mon, 18 May 2026 16:22:27 +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 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 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}