From nobody Sun Feb 12 07:59:13 2023 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 4PF0H61VRpz3q1hS; Sun, 12 Feb 2023 07:59:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PF0H60rJ4z3L3S; Sun, 12 Feb 2023 07:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676188754; 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=qwpTy21gAiv1Pb6a8htm5PWlF5LiL/5lfu3Yd4ZHTQ0=; b=mjWpj9lUQmh7y+kI2B+WNO069X73nkDvaDMgeFh7AAwklYM/XHF+7IEF9LOqA2TYdvRO5Z jaO9HVoq32dqobEm9IVr8dm9oresElOGEtI1YWlmxoj2hWCQEx7Qf9thwyeVTmHEsNplgX qTv3ulJ3betpxYvhBKDAH4nS9MZjgMV62XHOKGfs5wK6r0kiUG6eUNiovvC+eD62Ly/Ufv TDZS2MZsEy4h67swRKjwy1IReImuZG9fGPLB04XfkHnXmOqOYqHBTm0XSkNO062bVBVLaN 6v+VkojYEKX0A2muzr0sGGsqE3eYfOX5mvZe2Sa8O2l1FdBbwKF7M4gVopVWOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676188754; 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=qwpTy21gAiv1Pb6a8htm5PWlF5LiL/5lfu3Yd4ZHTQ0=; b=GtmNTzE96hvfxouWS4RHU8uFqf9w/E24nQM30otelRKOP2NuNBwsnd2KIVArycfulWyBX9 LmgDhMAGomGynKbm3Vur8ccvMslgQ5zZzknX/N8d/gTkwvd1kq3PCfmj2c1pXQdMkKq3RJ eY0T+rNK+1SwfRlzdwpXg0MHupi05h9P8IAzMQX7yN7lKHkfF11GgB6zDLBkinOWkZBt4h 8VfIwlWySehVGJ1ugq0AoEdXi+7ZfrrH82fKp5gfESjFGmQR9SEM0Je+Sx1vj0HxdEfGwN LAmsXWkCDXmLP2yfEKJrfJP1ARqVqV5aA4u50dlF3lq/801A55Hm+IxqjXEFKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676188754; a=rsa-sha256; cv=none; b=klywVii5mQKzI4opcTcgN12O4PW6xYqBvafE03zRjJg1f0WNtMJDtDSwnT/W3G29XRCM0d wdFuo7aNLgtBT1LUgXYu8wrs2jF3aOP6yl5jYaFWs07rcy4ll6ac8lyKN07t+q3bNtejQO KmCBeL4S00+qUOttujtNdRNhAdNowZN1zvATZ7k6ERP5MVYwQGRi8larWiBf23PoIzsS9+ EkK9KGqQ3b+WXaauJxA2aDrQRqyiFg7pVY9NokcElT6OHnXec3ruypZ8wbat4iiv/02Ar0 1bMvYeTxyXBw2aazY+QsDRxtSYDr0G6ahARYWvXRMUn+sB5K/KyDi+b0QEBQtw== 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 4PF0H56v6vzW7l; Sun, 12 Feb 2023 07:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31C7xD00068595; Sun, 12 Feb 2023 07:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31C7xDrt068594; Sun, 12 Feb 2023 07:59:13 GMT (envelope-from git) Date: Sun, 12 Feb 2023 07:59:13 GMT Message-Id: <202302120759.31C7xDrt068594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: ffb598d0953a - stable/12 - rescue: Add fetch(1) to the rescue tool. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: ffb598d0953a328b30744ac56e8f1fd0344fd733 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ffb598d0953a328b30744ac56e8f1fd0344fd733 commit ffb598d0953a328b30744ac56e8f1fd0344fd733 Author: John Grafton AuthorDate: 2023-01-29 23:05:15 +0000 Commit: Xin LI CommitDate: 2023-02-12 07:58:55 +0000 rescue: Add fetch(1) to the rescue tool. After a failed upgrade, having fetch(1) on a system that is physically unnreachable would be very useful to download files required to get the OS back up and functional. On my system this adds 589,824 bytes (3.8%) to the binary size. PR: 266224 Reported by: Dan Mahoney Differential Revision: https://reviews.freebsd.org/D38193 (cherry picked from commit ea34aa4780e5a581732520ea579342af94684882) rescue: Fix link order of SSL libraries and fetch. ld.bfd requires libraries to be linked in order. libssl requires libcrypto. libfetch requires libssl. To fix the latter, move fetch up above tar rather than listing the ssl libraries twice. Reviewed by: delphij Fixes: ea34aa4780e5 rescue: Add fetch(1) to the rescue tool. Differential Revision: https://reviews.freebsd.org/D38304 (cherry picked from commit 0f031350f32b8760e0843a6476d67aa21116103b) --- rescue/rescue/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 6a1f7d9c768e..8faf4d29877b 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -198,10 +198,13 @@ CRUNCH_PROGS_usr.bin+= zstd CRUNCH_ALIAS_zstd= unzstd zstdcat zstdmt CRUNCH_LIBS+= ${LDADD_zstd} +CRUNCH_PROGS_usr.bin+= fetch +CRUNCH_LIBS+= -lfetch + CRUNCH_PROGS_usr.bin+= tar CRUNCH_LIBS+= -larchive .if ${MK_OPENSSL} != "no" -CRUNCH_LIBS+= -lcrypto +CRUNCH_LIBS+= -lssl -lcrypto .endif CRUNCH_LIBS+= -lmd