From nobody Tue Sep 23 21:05:38 2025 X-Original-To: dev-commits-src-main@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 4cWXZC130Pz67x5R; Tue, 23 Sep 2025 21:05:39 +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 4cWXZC0RVLz3h8Y; Tue, 23 Sep 2025 21:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758661539; 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=I0yXcTLpU20k+JGKPB76CwpVhPyME9EI4Ux97JajwQU=; b=uVcN87l1zPlSXPxwsmicgvG6yWb0GPdol4CGYpo3YUw0uHyl/cYB8pFARb3Gt51dLnG0r+ Xfw3P7pRtkFRz6L6FFIpZWp1Vl+avrz4YohGnUcdwN122hmyI9mruObE1FgATpoOM+UBON 3yVTxsoHfgrtLdLzM9w+Z4Y7Sozkh4Q2v89RUKywfkDWGI9bwM1jQs2xQF8Mhwrc+7DXuR ESuJvbqI+RaDdGMphySSnlGIV8D5e5iNU6MaGnK/Sx7kc+i/9ajDQnz2Fdjxm2kd+BFkjM enmTHcNpKrLHiSiCkwIA8R9SLwkEFsZB7or3PmA3E0BIuLnvtxOB7MqA973FyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758661539; 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=I0yXcTLpU20k+JGKPB76CwpVhPyME9EI4Ux97JajwQU=; b=qX0hDDRmuewQz+UPBA9n/pWZ1SBHwWupSE37TR++Insrw0k03Q/UlRLfadFYmGC322HvzF waRUYwLpZXYBmwGPCVIAhdmheWSTOInK935OnV/WvvVRX/cyjUL+4d4iDPAq/6nZvTwUTF lHOZQQzGj5er9+pIISBEp319akYsvkfg/J46972rrHTrevYJ/tMJptfuCKBkJSLWPqk8Wi mMJTmc2ZkdIotH59mX6+OkXJZyqb5Z1UmCVowyUbp522QLSOHwi4J3OR98AnjrCMnFLn7y FBU8rHWiZdmLygft/yR6rJYxiBwNJWMTUO/H9c2R9/kQ9xVy1EB6ntc0+SUoiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758661539; a=rsa-sha256; cv=none; b=juLqx5t/zEgHrCEc97pUu71ZIxe3stTD82sQmj35mXu68eYfEOvVAIdYZ1RKM5IYsMgyvf 1Kl8jaEyn/m/lRCaYJ8rA93gy+YqWYag9R3TLlcGcnMZIpMOSutX0Ekat6qetD5lVkvrPJ yuOcwO5MA5RfQvUVnyhyK1NT33MtLcHQ45N2eTlOjREblYS5E3jS2ZrYaQkNzPW4FPOEJZ LucpKqHs0jVrxSTKUnnNOfwW8y5ETrECjepW6SmWQ6v0prsoyujswVM00oPWxwBaCZGv8k H4xsi9YIt2VjAgr/7YJG25nLvXTCrBhlNJfO1kmvkpo2x1pptLnucbfNQkflag== 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 4cWXZC00N7z1251; Tue, 23 Sep 2025 21:05:39 +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 58NL5c2h029684; Tue, 23 Sep 2025 21:05:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NL5cnq029681; Tue, 23 Sep 2025 21:05:38 GMT (envelope-from git) Date: Tue, 23 Sep 2025 21:05:38 GMT Message-Id: <202509232105.58NL5cnq029681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 7ece602e00e8 - main - freebsd-update: Library ordering List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7ece602e00e85195fc426a2401c49921cd39735e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7ece602e00e85195fc426a2401c49921cd39735e commit 7ece602e00e85195fc426a2401c49921cd39735e Author: Colin Percival AuthorDate: 2025-09-23 06:55:08 +0000 Commit: Colin Percival CommitDate: 2025-09-23 21:05:27 +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 --- 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 b3775382f66c..143d93a6dcc0 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3111,10 +3111,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