From nobody Wed May 20 19:40:31 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 4gLMMg6LCvz6fK6B for ; Wed, 20 May 2026 19:40:31 +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 4gLMMg4cKPz3b5g for ; Wed, 20 May 2026 19:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779306031; 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=V5abASC8sR56fMBEOI6D3qyFAEsiAw3ZyJioalMTMOs=; b=C1vJv0RNvYefBLaFwFiS0M4To19/C+lsCSwxX3XxpUjggeN7jLX6XpgFaeU3hMiOrZAtA5 5E2O2l/OM/C+fRdvV6Cw79rHl6+RDTfpeULQDRMchgJmoZULb5/jApgYY/kvpbtIapFnuA oOEurqfuF8F7yWEKcawHpKyTAc1sCXy1Op4ZvUDCAewQwN/NAdj+5/ZWkW6JEwSY2g7yJt LwNCtpLHhFClkpQCvH0QbNaTKljugWkcuKHPXbn84uDVf5mZAFMht1E/ASf2cYf5y6Xi1/ rL4uP+0sNh2UuG8EdEh01rmi8LjEr/LlzUTa9dXny1F9CEAWPdjEXrrTrI/B/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779306031; a=rsa-sha256; cv=none; b=jVHK5zwyczythJZAWYOlDWEh7T0AokSWG7Y0+UsWx766HPpAiq46wPTPwPREVLO96uZjix YQJZuRG+2krJWP6j/y6oieFtBLSsJqf/HSj+HStABfYrlj5xpGFitSWHRiqhB2sefHiGMp q45c6IHVOE99JllJ3RjbGB4Jmenggpr/RNqdU+p/RprXbOIVRUzGeRHsrc8dMyvQBwEKKq Wq33CElSwKGSolh2fJGFrkcZEl6stOQrqj/u16F5+TCx+o7KHFFNFAmLVIlc/Ec4u8G4Qy WvRimmFUTQpYLeWMvm2I7ywx3RmiU4lDxF2tKjjp1q8plvFOPuXvhVgTdMognA== 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=1779306031; 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=V5abASC8sR56fMBEOI6D3qyFAEsiAw3ZyJioalMTMOs=; b=xi2yhX9H8BRShZwuLd7VExj/xhIl62M5prQf+X5d312/jqCJippgr3plDrEIVO5A8RZE7p utGro3f/2XRzildAgn4Er3m7L6EwuFKDpTROyDQuyAxxH/OJJ5DH5BE/RPexc3jWBvA0dB F4HCVGPj9rAc/e1X82ijT51WDz/84LK84MJsAByX5bi2KuRf7mYFsXumH+lAPCh0nCerlI yqZnYnP6AKMATqL7nVxGV3/n+KEEPpCv6h6eyYslXGHPVdc12MRy6Yc3st3Yl2S/j/+skG tKbR3ejFpMLOwr/Km0TY0BUQjeD+heTo81dWak2JDnDLZLO1cwZZfZrYatfwtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMMg48X6z1DfS for ; Wed, 20 May 2026 19:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39938 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:40:31 +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: a1b3818746e3 - releng/14.3 - 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/14.3 X-Git-Reftype: branch X-Git-Commit: a1b3818746e3a3c75aa8f1ad5c4b8eb04542112b Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:40:31 +0000 Message-Id: <6a0e0e2f.39938.51396809@gitrepo.freebsd.org> The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a1b3818746e3a3c75aa8f1ad5c4b8eb04542112b commit a1b3818746e3a3c75aa8f1ad5c4b8eb04542112b Author: Dag-Erling Smørgrav AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 23:48:36 +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 7d9c1d3895b307085131f922d7e46a4812f04675) --- 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 cf314a256b81..8629a97187fc 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2528,7 +2528,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}