From nobody Tue May 19 13:59:57 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 4gKbsB0hP9z6fF3q for ; Tue, 19 May 2026 13:59:58 +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 4gKbs95glkz3fyk for ; Tue, 19 May 2026 13:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199197; 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=m8WihTfLabkkNVXdYtw9lA8U8DUwBkjryJ5n4JtbEVw=; b=gP7qRzD1xn+ReJhUFjGTbgaPuIUuDHN1bZ64U5CvzwVxd0Rk7JD/HLhhQx154+S6wNcAjZ 4osQImpLZk1GLguU/JrdxokeqjcVmD6e/XTLIpAxe7HBDoqXK18qCRCs1/+oZx+KPB4I1r VRBWDdKYOiXVK693w+EFUGt2T7LQWiK8o5EAQhY5OBh1eyr8I3QMXeHT36jBgyUzbe9f9r KHBW0FEOuyi0jq1Tsvj+ShahIU1J02/HKSd5xgP5R7ufI5XtwAh6VYLvbYSzh3zmEZZ8da 20kUHyQX41Q1akXRIaFBfXuvl2uxMDwanrpqIDlv0oicBbVrkOT/cUgKSd/R7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199197; a=rsa-sha256; cv=none; b=Tp6SwUZqNjINXWYj5jCFgNQf5LJQWALaasRUaiPHFeTHzMp1h9zUdZvTren06jwlugvRGe 68fzSrQbBcc2X22qGKOOSbBIKKa948krutaK77tVICm5oV0J1f1XwZuq2EddGOXp5O25MS D0CAQm8E+FV//fxxMclO2hKCJTo4Y3wPhSuTUa9Ldlta7DTP3ImffI3v586LXs8UJC3e1x XIZYKMQM50BUJcwmTxRiEEA8sA5KId7LR68KnHENtS9aBmjolLF9k5gNutLzxveWCln9Xj pMlWocX5dV6orQgIfsx16VNL2VHUQb71dO1Zqhnh5i5VgaYGhCVj2haPisfDnA== 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=1779199197; 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=m8WihTfLabkkNVXdYtw9lA8U8DUwBkjryJ5n4JtbEVw=; b=cLkk+z8DAnECZvIfC172wtanDla/TgMXefL+GaY0JVeGyT6oHt6t++YXiVcbTcVlDB5TTm EWaIG1Mggd4AHc1IilA2HSPB+074T+uSSwBekk6KYjcrnIN7T+ICw8M8bDOtsue1bjKXzj GanUwjGZXJ1PVbmkQgaIBZgxi6ZnKIH2hK3/8sLbMBzJ3jSteLyASQRO+xdf0raud3DIxG bX4pngfxFUZ92q6x5LfA42oSvvp+L5OxmdFpRhNlp+GyTFrTTRVPv9y8ovI/T9gcNwuSHY WSCGBBQFvkfQBH3OmXWssWPjp5OROb0DT1ofn9RIG5mpnSSHj8VYrAmjERgkUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKbs9512Cz2R7 for ; Tue, 19 May 2026 13:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a52e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 13:59:57 +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: 7d9c1d3895b3 - stable/14 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d9c1d3895b307085131f922d7e46a4812f04675 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 13:59:57 +0000 Message-Id: <6a0c6cdd.3a52e.5329476e@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7d9c1d3895b307085131f922d7e46a4812f04675 commit 7d9c1d3895b307085131f922d7e46a4812f04675 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-19 13:59:44 +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 1e9e6e63e992..5d52eb285fe0 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2523,7 +2523,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}