From nobody Tue May 19 14:00:13 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 4gKbsT5fmkz6fF5f for ; Tue, 19 May 2026 14:00:13 +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 4gKbsT3cJTz3fvf for ; Tue, 19 May 2026 14:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199213; 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=qBf0ArWONBQzmaQtTRBRC0htR6iqpR4zgKBxqcmR7KY=; b=sa0G59F3aPc2XteoW9tGAuHMiKgIgjUmDehjWQty1RiDY8Ov+Ajtzj3lm+gImymyYxKCsh pEWq5vjRr8eSIlxIQk8RnJZ3GSptRtCF/HNnZAxFKPfuBdN2NTyg8jRQO45doZXkkxWQ5z 3UztB87ENrftbjhl11nbIfGP/m9bD3vTfGy2RThs27+6luOKyi1tyng9uSeU/emC9rfGZL /2uxFLmSiX4T0h3iDe+KJkDGRdiAsihlqtiDs0t7Ne39JYT5T63A7Vf2UZLotNoB6veIS2 73hxcABw7XwtlD4QCCq91anJJNCQXRvs+YMtrpFpzmJP5QwDtOubEf1wn/0Q4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199213; a=rsa-sha256; cv=none; b=J1xcms2oEHcIQPd2FcQaihjmy4QUkfZPL05SiB/7IoAWBZnqnQK6PJADtwriPC68hvhPSp BYQPjYYTBzc3M/1tyix0FbAqtMYyOyvc+3I1g+flh5g3gRBLPV0tVcBIOYgRmVa/wJ64ll nnpcjfah5W2ToiiqMvHafn50NbkINXbj3CQtNn+EK4xdGP4YQ7YyrX2cR7t1VBVAPuX+Bl jlbBB6kNVngN4REmSRnmiItWf1lDDYnMo/YrrNessw+ZdFcqZoaTCUskqFwuKfqzlw5JNE kFEbxfNS4//aOL+Z8JodtDt9LcbhWo5GM7ylGSNYanr6VnPiJzghWDwK87NJZw== 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=1779199213; 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=qBf0ArWONBQzmaQtTRBRC0htR6iqpR4zgKBxqcmR7KY=; b=WTaf+D9+dGMbjBwDGsd3vlTj3+Qfkh60vzViJEvrtwHuJtKlYQRWVeZVyaRfO2cGpuHBLw dhAkrVB/bwIGsayUg7Ex6XzGlO2E61+XFiK5rulZRwROQza+4HVh66BBwZn0ITAbq8PbWW beluGgnDoQ9AA9aUoj6v0LdZ4iG0Z/dO4fceiqoIFNu4z3MR5wR+Macuh8hxmkxVwh/5b1 6dLdi0EGqvMBhJhfpVfzCEtvFM/gHwj+iyQLST3giuD1rEJ3RlL+wcVi4Gx63AY1v2OWBb 2wTfVHmikk0kyy0wujXosB9qHKXEUuahkwTbk/+HJDKkQrbuLYNuHK8ce1tEpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKbsT2xwnz2jV for ; Tue, 19 May 2026 14:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3adcf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:00:13 +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: adf56b3107c4 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: adf56b3107c41654056ba08d612700875438294c Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:00:13 +0000 Message-Id: <6a0c6ced.3adcf.5cc2ec01@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=adf56b3107c41654056ba08d612700875438294c commit adf56b3107c41654056ba08d612700875438294c Author: Dag-Erling Smørgrav AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-19 14:00:07 +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 e1712ff8b356..29322e864068 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2508,7 +2508,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}