From nobody Tue May 19 13:59:37 2026 X-Original-To: dev-commits-src-branches@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 4gKbrn4YL5z6fFCf for ; Tue, 19 May 2026 13:59:37 +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 4gKbrn27z7z3fjf for ; Tue, 19 May 2026 13:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199177; 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=fAQc5rG0LZnrKqTBYfkOTlV4RLDSc0DwZF6QY7CwG8c=; b=Whg+WF4qjVQC9S2jP72ADeXGZ6pGbHgg37VE1O/fsbIndHwu8V1ze86kd1KfmFAw2mjho0 xN5t2efBmw3PhCYQDn999McPVAPs587HE//VL88GlI/akd917KgBeBqN42f/NKrYFbk9oN BYf+34kMMEuX4zlzlEQDD39wk7n0f8U+p3A+KUdjQpY7kUWiFXdySW8a0SJLTbF2u/L31T 1iqW7+tLiteTe1xXSDRjz4YRZjyU6nTgjrznFye6sefzi9U1vnXv/H7ntMmEp394I594wx VVT2FeGH7CRBpYsfiRnk3/KySyvVNvLeeozuCYCJzuLAAccK1lFMHsYfI1f7Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199177; a=rsa-sha256; cv=none; b=Hpx0hTm9D3bSdEmKTwZTBhFgLzj3kgjNAg3dVDv+ElcRVlj1I5i1Q7iZpqwB1Yvabim82P exhoZqWMF39CWPyc03UgabwIdyJ0HdMwsI73+MREtLqKGDcXa4oTUXCX/5VNmZeg93sxNm L96JwhdXvxX5TJgapuCwD9iH4mvLivoceaPVzcEd0wATYODD3bDRKre04gGDdA+druoVq0 PBYwLEltLtX6sdbHnUtoBxbZq6lO9S8YtYiBlu67oGmp8luTmg9c0cEHTooy2aObojqomh Cw2EG1VuOynHpNjhxofSEWfZ9DW+4sATJMtC3LGdwqR6UT2Z4XjghX4Yvf/PQA== 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=1779199177; 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=fAQc5rG0LZnrKqTBYfkOTlV4RLDSc0DwZF6QY7CwG8c=; b=HoAjxnUcLu3jioDW8wxo/EPhU9wVgfRo5ipOxI4v9aUPSc9JUpttqUV18uAlrIop46NawI oKOpcsReI51onvCGPvX0Tk9dHa4O2H5GczLvZbiYMmmGa5CpivCnHSNVYtF9+cB9g0ApL0 pdQlEXUI79uK0f0UpnSgY3Gp8N1vyBvWQhb4acJJJNT/ZPnht9Od+OKPzZHl6bAq1e78pb 84VLAPUF5lhKnVGGK4Ff3LFLF9Aoa2EEs+srQxDW1+WZieryP3rM5x9PR4T3mAfeWfR+Tp 8f0p2N9w3sTDPH4aSA9VTm1rnQKBPfbaChOIlMEyBwSAXlXbfH+XRcuCaGeWWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKbrn1Jkbz2jT for ; Tue, 19 May 2026 13:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b458 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 13:59:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b97f143b6ca9 - stable/15 - freebsd-update: Skip /etc/ssl/cert.pem List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: b97f143b6ca97ea767383fc96cbf50d4f4394ddb Auto-Submitted: auto-generated Date: Tue, 19 May 2026 13:59:37 +0000 Message-Id: <6a0c6cc9.3b458.5894585f@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b97f143b6ca97ea767383fc96cbf50d4f4394ddb commit b97f143b6ca97ea767383fc96cbf50d4f4394ddb Author: Dag-Erling Smørgrav AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-19 13:59:21 +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 (cherry picked from commit 2509ddee9bdb2240ba2f622e3a55a98ebc2aa4ae) --- 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 09b81d1a28cd..5fd6a377d46c 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}