From nobody Thu Sep 25 19:27:06 2025 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 4cXkHZ720mz68Trd; Thu, 25 Sep 2025 19:27:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXkHZ4tPwz43X4; Thu, 25 Sep 2025 19:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758828426; 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=uw4mPz/rsLI4Li+nZb2MiuOCX3mWs1E08WEMjx/VzpI=; b=RH9MW99sm5D9UGw8mkT65thXD8QP9nOeyTD66vJmEagfSaZMBCEiZHJn/k/jtIn8KgOEtu hpz0XoJRGYM6AbRC8gb6z37AANJFjy9fHI/6WNWM4vvl1zYWKoyhjQif1q5ckPD3nuKCPb RkvpU70gKOIlVJyxeySp5qVq7OrUVI7hpI3eZaMynBwVqAOcRgfltMd1iqSTX2x83mdWNM 6PHmtNwN4ehhUwIVb+mUlH/ZOG5zFnGqU0+90oX6y4zetzE77FwvY/YLhoPN+Ubk+QISYu wGdR4lgJrSQot6m1FXAR8o+5kmDPQFkWyNTajKB2Si1PKrwQYFWIaP7SvOUbgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758828426; 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=uw4mPz/rsLI4Li+nZb2MiuOCX3mWs1E08WEMjx/VzpI=; b=nR0F4d2GAgk2cblf5myRX1ry9kyIAxeKI6gu0MQGCsApP3aa6eO1QtTDbOEgM3Qru9cfaw AqxhFL37nL/p0E/Ad+3ELP9w9QvZyF5RLMJiKbO+hzbeBWSShINujNKV3ku4PxjTphgzY7 +Kw8YlOL4yRBJuCvDRmdWLdHxhqC1q7ctvPLQN3u0v8oWsn3CshhsaQmH/SqBxy3nubUfa 9WsT+ahh5mlfMNwzSSCfuv17lA0JWm7kediSoPlUPOYYcOb4brwimT6lbTcvOHS8WdogeY gCZzs5TauERLwCRcNt3iF8TD38fiqtlQ1qag2722jZrnvRuxC+KmlY4kzW/nbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758828426; a=rsa-sha256; cv=none; b=bInHnzYTaK2tcDoqZ5hIH7jZcdYJOXgULkbtxggQvcK6AEavtZ72J99++sQJFbGXV7fGAo fAWGchjJ5z5QA2WhPi076nAXRtoBZz7tH4r48jnXDNPhkcXKmClGEHJL701ZxnQZbJlIiJ FRiRgWgn1YcvbpkRV9PKMdk7NcPKI0qDf5QTgDuJ6+SnTlagScpONLHPecFbMg0L4wWaqs DXL+uUReUO6vb300OrVvA1+hxVeGZaBxeKc9lt1zdW0AzGxfzShrfPDaNXIJoKhLPQ7Xvv fphsHk7Re6gSbBM6bRn/rVboZiMQBGCpSmFC0+Z6MacvGVnnEp5rNeHRbxkgDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cXkHZ49JQzqH; Thu, 25 Sep 2025 19:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58PJR6PR059128; Thu, 25 Sep 2025 19:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58PJR6Iu059125; Thu, 25 Sep 2025 19:27:06 GMT (envelope-from git) Date: Thu, 25 Sep 2025 19:27:06 GMT Message-Id: <202509251927.58PJR6Iu059125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: e26928669f39 - stable/14 - freebsd-update: Library ordering 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e26928669f39c8683aea74040b9e2472e944c43a Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e26928669f39c8683aea74040b9e2472e944c43a commit e26928669f39c8683aea74040b9e2472e944c43a Author: Colin Percival AuthorDate: 2025-09-23 06:55:08 +0000 Commit: Colin Percival CommitDate: 2025-09-25 19:26:58 +0000 freebsd-update: Library ordering Upgrading from 14.x to 15.x with freebsd-update broke because libc depends on the new libsys library; freebsd-update installed the new libc before creating libsys, and every step after that failed because all the tools (including gunzip and install) are dynamically linked and need a working libc. Enforce ordering when installing shared objects: First libsys, then libc, then libthr, and then all the rest of the shared object files. This is a candidate for an Errata Notice since the issue this fixes breaks upgrades. PR: 289769 Reported by: Graham Perrin Reviewed by: kib MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52688 (cherry picked from commit 7ece602e00e85195fc426a2401c49921cd39735e) --- usr.sbin/freebsd-update/freebsd-update.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 543ca9319da1..a9bda574713c 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3058,10 +3058,28 @@ Kernel updates have been installed. Please reboot and run grep -E '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' > INDEX-NEW install_from_index INDEX-NEW || return 1 - # Install new shared libraries next + # Next, in order, libsys, libc, and libthr. grep -vE '^/boot/' $1/INDEX-NEW | grep -vE '^[^|]+\|d\|' | grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' | + grep -E '^[^|]*/lib/libsys\.so\.[0-9]+\|' > INDEX-NEW + install_from_index INDEX-NEW || return 1 + grep -vE '^/boot/' $1/INDEX-NEW | + grep -vE '^[^|]+\|d\|' | + grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' | + grep -E '^[^|]*/lib/libc\.so\.[0-9]+\|' > INDEX-NEW + install_from_index INDEX-NEW || return 1 + grep -vE '^/boot/' $1/INDEX-NEW | + grep -vE '^[^|]+\|d\|' | + grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' | + grep -E '^[^|]*/lib/libthr\.so\.[0-9]+\|' > INDEX-NEW + install_from_index INDEX-NEW || return 1 + + # Install the rest of the shared libraries next + grep -vE '^/boot/' $1/INDEX-NEW | + grep -vE '^[^|]+\|d\|' | + grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' | + grep -vE '^[^|]*/lib/(libsys|libc|libthr)\.so\.[0-9]+\|' | grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW install_from_index INDEX-NEW || return 1