From nobody Wed May 20 19:39:27 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 4gLMLR62mQz6fJkk for ; Wed, 20 May 2026 19:39: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 4gLMLR3xVrz3XqH for ; Wed, 20 May 2026 19:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FCCLIEtyA4yYodkZUwuUqp3cEhIo6bdCSmL694DfAbI=; b=IygaoKzqjokODd2oU5pgCZlVVNl73J6MqO8JcqfNyeusWvRfH1wmqVP+Xk946l6hnJxO9m tf8SFos+eRXGiuRYv39l5VfcQnFwyw2Ox9HH3KI+u+cnXFuchQMKyL/kO2+Vzn898zNLX3 4smOBlX83C2/unQ0UHGgJlIIKi8fDFoHxUmOgMEbezSDnZaPAnYGCGLnKCxF0YKdeMm2Px NxvrPAr+Eqfv8rATSjHh77kq9egEqK/Z0qgwugax8sNvRn07MRHrpEEwHJeMt2eL5ny4lQ fPwIK60H8LZdSaF/mvE7mPbttn/klWjnpEpNuxYUhmcaCfvbE4TGeJf5Cdf7jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305967; a=rsa-sha256; cv=none; b=P5BbJGuUePzoaZC+HzAqq+PxYdmOJMzPgGytnUfi6eIgEGxM+81ZAY2WAe1MwthZKmct+I 4e+bzr6qlhkx++ORyQ84lVJQP3tIz+sk1Sruzy9ts8UUPvnOsTymwTomGiNx1wz5lyOEpx 9vVhLJdDz6GscMmROfKJD80GtZ2ImLNkOw3m0nwRVrDhCa4h+VYQ3Ox4HOCGfWsRH5Afsl +T/IanZ+2sCW6ZtgJMIsHgvhsU1nfLwfAzLKQDIM05IrJhWKSqach6/p9Vrni4OkT/+aOg Mv+iPTo5JZ+o38+9fyUanLNDMHIDXtbCXWqTk5KJm0YOoXpOcy630xn1eSRZZA== 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=1779305967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FCCLIEtyA4yYodkZUwuUqp3cEhIo6bdCSmL694DfAbI=; b=PrQ4xTrQh49xmhN+y4RYLqeujwFV28DI1kicWDZkFioscBNQCsPx8q3fH//nRKKtgMnQ/Q VjF4V5OnpxgBN6Yl5VitFqUyQ1Js8A/7YPNFneRtScRhmXY/VBiLAYKyirakqV2LqaSQa+ YKMaVmA8ceNixP1pCdwoqKYvpvXi1Q7pg/pNB4erxdnyaUtZDYbZSzX3oXTMkiEBDyitTo 7NZsWvXJwlZmvxwhSflHS/d1EO0fr7Ca7HS7pg4ma1mmDnqCXxDmWWufEvbP90R5dXGVXj Ndaxk6SR5YSZ7n7frVw0ufxo8SwB0Ft1wFOdd1y/rpc9Q9rm2+budY8RcaWd5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMLR3L5zz1F3h for ; Wed, 20 May 2026 19:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 388c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:39:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Mark Johnston Subject: git: 2709755d39f5 - releng/15.0 - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2709755d39f5df1f9d0e12eeb447535e23080d6d Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:39:27 +0000 Message-Id: <6a0e0def.388c4.54e8c15c@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2709755d39f5df1f9d0e12eeb447535e23080d6d commit 2709755d39f5df1f9d0e12eeb447535e23080d6d Author: Dag-Erling Smørgrav AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 23:51:24 +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. Approved by: so Security: FreeBSD-EN-26:13.freebsd-update MFC after: 3 days Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D57028 (cherry picked from commit 2509ddee9bdb2240ba2f622e3a55a98ebc2aa4ae) (cherry picked from commit b97f143b6ca97ea767383fc96cbf50d4f4394ddb) --- 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 23f1106e3bde..e0df876cba67 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2576,7 +2576,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}