From nobody Wed May 20 19:39:00 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 4gLMKw48Xpz6fJlj for ; Wed, 20 May 2026 19:39:00 +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 4gLMKw1CnLz3WvC for ; Wed, 20 May 2026 19:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305940; 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=BQ6PdctypxJN1HBeZwb0JLZHGRBdoA51LKWLwryjbbk=; b=UpPr0Z+3kRViCngLRkcKXgUl3JZ7AJpaHgjRdGiMKUbHy4/vrOthtMGCKczWf/oQQBLhiX O8xxt0IOkbn3H8wVB5iRdPbWaOkfflUl7FgLDoQgbCoYLcbGHRLgcknTaFhK//Cw5GgyEa xGcbYW555FjS/L9MolSqObtpBtyWhh67uIeeC1c2OKQ8btJoRFRkVkMt6pLan7DE5ewobo 1ttyp+c5lloNvuc4uGscwOyctwTfENGjySks737KkHOoeAaiTJux0gCglo10BKrtxiLufD X3oUCLAaLawCVgfjCHp2PN3m5XS07Ye/c0utw1REqsDboCE2TljvwrL6h7lYaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305940; a=rsa-sha256; cv=none; b=Ktlvxk+/0wEPs+uZ5nXXu/0zp27keQ0ivxbsib5yTiAcSfs6oc8XlLCye9JC5BG3NEvPJS QoRSbEEndgKjRrZ6IWVkpehBM0+GvdUsjf5AMl8jxZ2UhIuLSSyYGq5ulLW7Re0N5oR8M2 jhgUZq1qpD7ThvMTz4WFripLIEeqUP2HbhDg4uC0RFS4/9zCnwMsFOPwqm4uD9nFdHgY7k tKt2Fb1cfqZ+Q2R8WkZt09mxyE4OpNykyCkzy/PsoV7+OWKo4dhMXNpimWueQg1cGwpnFW A1PrItSigz0bFM6mKjTkUhPXpyr1jLLmzulECW5OF1i0gADDqv8wwrNehctDEg== 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=1779305940; 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=BQ6PdctypxJN1HBeZwb0JLZHGRBdoA51LKWLwryjbbk=; b=E+UUvU83HHd+aWWVy7lNpPiDKWdJXXUhC6EKOuwE3XIjpn27Wx+SkS29z67JdTCZYIvO/Z 2CuOUCYz7UFKjJCrEGCl4WiXZxPIyrTojSB8WkmHDYx7N3pUU3fp7HGuJMb3gwYkXhwho7 yAXNF+hfNLO8fQUiLeQrCw8oxZqnOm6CHaRCtSyVwX6gP/6HBo8JWH6IEHI9jlHj9l+mfd BeCL3AXPtOiwO6ZKISlLsZMV+qtgYKqsmKN/R1AMc/IddXryzyGGqZcAxhNxZJgxMip2vT COJvPTaq/uunXSMcifBFdv0zT7FVqcB9Fi0ISWEQvYWBgPJz4npJwW5UBrqstQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMKw0qJvz1DfG for ; Wed, 20 May 2026 19:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3784b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:39:00 +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: 55b1142a3642 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 55b1142a3642aadbd31b64b821a4660b41551950 Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:39:00 +0000 Message-Id: <6a0e0dd4.3784b.7a70881@gitrepo.freebsd.org> 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 AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Mark Johnston 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}