From nobody Thu Sep 25 19:27:34 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 4cXkJ62cT1z68V2d; Thu, 25 Sep 2025 19:27:34 +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 4cXkJ61sRsz44RZ; Thu, 25 Sep 2025 19:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758828454; 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=W0Nib4+aKxMEHTcU2boH8yG+0zeOpw4rrtOakznu4+w=; b=lK93uRVaCLMN8LqQ4XR50ZI+Fm22efJHjjVHHqnjnGJyyZLVxEaXD7YZ5Och5ZW4CpS6BQ +CiiJ+c6zSLo1i2Lyc5Jt40E4RLq5rfk2EVgC6PHsAwC9VpottCEIv+WBK7IQsxhFhq3cA gJwXLa++BA3XnCUKR1LdSuAsg/jT8E5M05nrxIIAdJQGgY0LjXezTJ8ShFAkRDFKp11+bw AcJQvoeYm68YBUsrihjgnUIaw4Jp603hvyYGfQMuUeFuCQ8CrLkWduVRfrrDGqsIttSJd2 fS1Ukeq+olBKxvO3pswjmjCRSXhoYFsQd3o7jne3M2gtfnD/LPLZFnbm7rBZUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758828454; 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=W0Nib4+aKxMEHTcU2boH8yG+0zeOpw4rrtOakznu4+w=; b=aNBBVBaGyjWJXA5LqjGft6eKqFOL4X4W/CwPGeUSSwuLgFsaihrLxnUte+A3wEdZVAd9N9 rhrph0gleiKIrlwzMLK9t1z2r9d8fWRfKsqs3ZnO9elnocwbqBzCLw4ftC2FeJhLGJSpfh wgXZHRYP2r+okB1QspQR/C3V8ZQH7uf+eDi+N6cLis5blHONzFa1TzYa63MpWe33LfO4Ef WlsSkBxql4L2p2ELCRj+3wGtBcNN5kLn/uqBugLGYZrQ28LHHTTmYX1Ap1iqgTq3nje0pZ f/q5wMMKUfDC/ln1xvk9yBsjCcZ6hAU9Hp6slHaKt5SHWt1wYJh6aGKAGp/C0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758828454; a=rsa-sha256; cv=none; b=aSRbhtMREfJeXHsypM0dCFMrb9AZb9U+EJ04rD+2TM2KwUTTMf4mS7TsW047Pbg1dIKmuT 1AU+7iKYNJErX22U+OYcbyLUMz5lk9cipjWCMsHnJmwBatB3A4w5YW2PofGq6mtnZGuJkU +I97/D8yMzymaTHmp+g3pGz3xfQ4/U58vWY/otng9FHW9q0WJI5fq6Sac05uKUzdRwJN0P VY2icScPGi007Np0dKlBIpW7U2yVIPMQD0zHzgYm+sHy8LaIk27PoGGdTjtTTrUy++Ikfv Zn42oDmL4oexPGwfGhwfvyvSSvRk43Fv08sgbYIw3mTLF/5MYMKGpGHhv3hxHg== 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 4cXkJ61H9sztD; Thu, 25 Sep 2025 19:27:34 +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 58PJRYA5059345; Thu, 25 Sep 2025 19:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58PJRYg5059342; Thu, 25 Sep 2025 19:27:34 GMT (envelope-from git) Date: Thu, 25 Sep 2025 19:27:34 GMT Message-Id: <202509251927.58PJRYg5059342@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: 87eb52f1b061 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 87eb52f1b061989a948d3eb08953c81a4e1281f0 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=87eb52f1b061989a948d3eb08953c81a4e1281f0 commit 87eb52f1b061989a948d3eb08953c81a4e1281f0 Author: Colin Percival AuthorDate: 2025-09-23 06:55:08 +0000 Commit: Colin Percival CommitDate: 2025-09-25 19:27:28 +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 f620b956f80b..bb30cd54c01a 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