git: 55b1142a3642 - releng/15.1 - freebsd-update: Skip /etc/ssl/cert.pem

The branch releng/15.1 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=55b1142a3642aadbd31b64b821a4660b41551950

commit 55b1142a3642aadbd31b64b821a4660b41551950
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-05-18 16:22:04 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-05-20 13:52:59 +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:    re
    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 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}