From nobody Tue Sep 30 15:37: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 4cbhyR10Bdz69FJ9; Tue, 30 Sep 2025 15:37:35 +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 4cbhyQ6P5bz3Vbw; Tue, 30 Sep 2025 15:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246654; 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=E9LAon8fbCStbWdlLg6SnCggMmp9L1LWJRh1SA50hDM=; b=F399KklY0VZEDALxXQ5L1Wm4ydU6MF35YLyV9HZsyjxmSAg/eop8u8SxwMNMxFMNfpxa4O D68dCQN2Lpce9D//fkIfWAtECD5/0cAdyCE1XZyL4hChEG4X9U8MgpnWcXSxaqms77S9/E I3lZIh3lD0d6c2ePf3uijptCQLkrCQkbe/R0F+gxpAcGUFSopMKIRW+jmREs9CNu3UcogS 2lSh2uU/CoNaqgH8uLZ4TzeHf33t8JgZJbdWd0+a97rbOUQZRHttueA9OjEVKXEgyAVuG2 5K6vC/n4G261SCkifyV5c7p/XkMdK5OfjTmeXdIsvCMZCcka1LFbYk39TWWf0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246654; 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=E9LAon8fbCStbWdlLg6SnCggMmp9L1LWJRh1SA50hDM=; b=rJqzmrLruzQmi1BvWNwiVGYtwqrR4LPzGg84+bqKJrAKwJnXlltWz+GtG8FDItwXzPRa0e Blq7bXXY83Vh+KA/tU4izIYWXwghDHM4fKRjMlbyyIjOymKl5ZhPNMKLPCM5wx2h1Y1PXj O02A6VBPCZRn+owFe7A0P6qnszCB+RCOREYoe/Xt933kQBHGiLNWrR+HkY97eqPO7iyha8 tfRrK5FD06q7qSUSM725CaRCDssWjxjccZH32Jm7lKIneqLhZjifKrRsHDfT+OPuQhvrFS ox6tXmixNz0GXagO6SQ0e2y+YmGmfu5W29Mv4Y1E7QpntkN7lMv/bCBn/c39cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759246654; a=rsa-sha256; cv=none; b=G7y1FS76NRdQTEAtDaz2cxUCbiKW96R6qjllVJ7wl4UN/VGTeMvW2rvVXxTcTcfKz4g8VC b6h2i91gYxBGG9qir0A6pp2oHtA+td3pe7mSD8DCoOGw50RYB282+yZWErYaHqmxtD5Qyd ODtfPI9YTwJJYj2DyFdDaziZKTbhJKYIJ8brsgzy0isx6RXplHSTUmpwdQTJYJIB/2vGgm QSjajL2RYOF1iCgeQU0HjE26hYAU+8FvDtQLZUDbr1n/BKn7621WfGVgyGqfT/HfQysATY OeqrsTyDymw9LpSs1DYFG++RkKp0kKM/YZwfBfqvfedBoFKnfl+qJkw2y3YkZQ== 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 4cbhyQ5f5JzjkN; Tue, 30 Sep 2025 15:37: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 58UFbYAP068008; Tue, 30 Sep 2025 15:37:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFbYP4068005; Tue, 30 Sep 2025 15:37:34 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:37:34 GMT Message-Id: <202509301537.58UFbYP4068005@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: ab91dd76ff72 - releng/13.5 - 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: ab91dd76ff72707d992cc54d2ebe1e424689d9cb Auto-Submitted: auto-generated The branch releng/13.5 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=ab91dd76ff72707d992cc54d2ebe1e424689d9cb commit ab91dd76ff72707d992cc54d2ebe1e424689d9cb Author: Colin Percival AuthorDate: 2025-09-23 06:55:08 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-30 04:58:26 +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 87eb52f1b061989a948d3eb08953c81a4e1281f0) --- 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 4a6a8d78330b..ead3b975a78e 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