git: a1b3818746e3 - releng/14.3 - freebsd-update: Skip /etc/ssl/cert.pem

[Mark Johnston]

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 <d...@freebsd.org>
AuthorDate: 2026-05-18 16:22:04 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
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}