From nobody Tue Sep 30 15:37:24 2025 X-Original-To: dev-commits-src-branches@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 4cbhyD6Q8Zz69FS1; Tue, 30 Sep 2025 15:37:24 +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 4cbhyD5Gp2z3TxV; Tue, 30 Sep 2025 15:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246644; 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=M8EEOiBbySc0BscJUbX1Ryo2bS49IZDvEEQ6J1Qpv5o=; b=mSpQcdU48o6K+O/aOiYSK2zSqp7S3q5NezbXGNCkdg6kSeQfhulJUh4yQIyiXgPmfSRjUG eTQJHW0v3uUxYZMVV3ogEJ1uCMhkrIgThKgUVrL9bnM+Y9RBCcSfm9Kent3HiDNYXxAWw7 jcBJiZnwy1PDcVX445vTixiUSN+zeD167zDK00hIRuUwUqDndnr6VzShBeWGFWs/Nx38CV Bgh0KzVneH4P1utKBD1qgEBnyf9qU6A7Cmij9H6hHim/iaXjsqKM+6awFhBMfxrI0M1V+B GXejY31L3yVlOYwuzUuVsxVsWfiCtA98RKGEqKStyNqXfgX4Apanm6F7EIPSCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246644; 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=M8EEOiBbySc0BscJUbX1Ryo2bS49IZDvEEQ6J1Qpv5o=; b=svZEL60NUoj1d1PX+8iUB76TUDec2axIBYfmb0Spe0WymJnsB9w+53tDJi0xMyn7VkZiUn Pb1P2V0mqM9WYgrqdH6X2SYi6blXCrmif6VbyjR5xDZTeyPXt5u6wlhQeMXaRXGZQG104Z vUPG7anc1yeU/DIFQgUC+VcTK+iUBVsXiGIcy7nNFQJHXPVGabcrp6hqjWhD5hLzJGPUht 64Ix1iNMd/HlGLW8C3bFsQ3A264HgufI/V7CC2aYes5g/5uTMXerKEwEsF/pHWUG6H3Lv7 ofR/mKhVhVVVgbL5lXtcrlvKroZpRKpmAB/m/hME3UBOKAbYkQ7XzeRTQVLgRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759246644; a=rsa-sha256; cv=none; b=l4ci+L6Hqpvo57B55ni+oKTmketWHiUUfjVTu+RzW7Lhmi2zluovgtbewFB/xrt/tWjGR+ 0yRFDlcB2UFV8pV1L0MsR/p7eXX2uyq4pF9MaRLkvi9ItaF8xDw4cS9vgjXUalIvj1YvZq l5eA80T6u9eeU7e7kokxN0hCjCidIkZRVVwq7AjWZcHxBfpB0hSSQSH7lu5i2nAhhMw5Hq Bcl7sDgZBNht00cIIdBXs4jbOoJYG5baBc/rR84emjvWbgb+/pjezZbb+6zVYEA7WH8iAh cGLIMICFX5NQBjdGDZEu9LTxghV41Chd+WeJbdfiE93KxvqElW40NsfBNQtE+g== 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 4cbhyD4Vg6zjkJ; Tue, 30 Sep 2025 15:37:24 +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 58UFbOaS067754; Tue, 30 Sep 2025 15:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFbOhg067751; Tue, 30 Sep 2025 15:37:24 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:37:24 GMT Message-Id: <202509301537.58UFbOhg067751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 3447fea3523b - releng/14.2 - freebsd-update: Library ordering List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 3447fea3523b56a235b9f8fe9234893f00795379 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=3447fea3523b56a235b9f8fe9234893f00795379 commit 3447fea3523b56a235b9f8fe9234893f00795379 Author: Colin Percival AuthorDate: 2025-09-23 06:55:08 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-30 04:58:01 +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 Approved by: so Security: FreeBSD-EN-25:18.freebsd-update (cherry picked from commit 7ece602e00e85195fc426a2401c49921cd39735e) (cherry picked from commit e26928669f39c8683aea74040b9e2472e944c43a) --- 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 77b12a3756c2..cc462c6c921e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3043,10 +3043,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