From nobody Sun Feb 12 07:56:00 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 4PF0CN4cRvz3q1Xq; Sun, 12 Feb 2023 07:56:00 +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 4PF0CN46Lxz3K5y; Sun, 12 Feb 2023 07:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676188560; 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=IOwlEtxrrF7mA47VyMG8OMj5MzaIL4tUNrSLscxw1Cc=; b=ye/9Y+62C/XqcBVDk4i/rvDspDy+t9XF3KrheOd70jOI2Za0eEM3WI2AAiVcKfl/BHMpSj YTXgWjjQnsU6MUSpdKgWtGvmMw/O47Gm3348vc6xoXRMKkDOJAhkeQRTv0duok4Hqdtbvh Rjli5jXToF2tsv+Ngb9g7S3NGJQo/eEjTyGs1GG99rk41Zf7kChRfhu5QWdBcSgtuS8wzF 09Dn34uQL7tw+t6j1f/VrqAHvkmQDniY3CZfSlFFjL/7HSy3QqEkgBqVaFwSszJ5+PF7YN XgQUlxzhWpgeUDE8xmk9KW4yt84QbjymXbdoefHWGEnOgA6AVzxP81kyI255PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676188560; 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=IOwlEtxrrF7mA47VyMG8OMj5MzaIL4tUNrSLscxw1Cc=; b=JnDONj3cdwgZlqxXef95oOPp3nr/cD8ZL7K5lObxL9wrpCf4K8azxDQxtq+L1U0ayQoqNa 9xnVX5O48hpK10O+cyKC8yIVfrFxgPsGWBaitUTVRnRrTAFepRUsyqsCwm+ju+10xXSIne m9CDDxzQpfOq0cbSBLiQ+RgXQxPFVdXYx7hr9DtYAKY0K5mmM4OIKdR9wihrpyFG/qXCk3 5wZAzv4u1jioEJZSuTyp1f8Ws+PPaHs7gG1IdmqNMShd4mhi7wm5b55E5Q1QAgNcGQSkAo kae2rftw6iBcN22lEsbN00rhMzLNoA4m9UnJgRpx/uZXrWR8Ws5dFbvEB1cmyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676188560; a=rsa-sha256; cv=none; b=B0g6q05KZDXDOQa9sssZRTaGOqtiy9Zh2mZXM7sDcGDwUBlr588f/rVbyHEJuyugp9liJz FKF+9viSXVzGuqXHMa+knj12dMMMNTK4gU+QqTebABsrrrUfPX736aU/FfM4KOCcgYQ3hf 9vY8kr5/uKRgr3qcJx6Cvw0iY9QJoARHgX2JFH3EUNHUkWLOzuTrWUwe8siSY71OJmS/6K 1tPgLKAyQ/HBN4WlrBIch3Tw60bQz8D4iPCV4IFlIUxBAQuSdwPelGrs1ZiGP4EUshNmok wAzO/n5RVsEnzIoy0m/lBwBTBb7hcWU19cUHblmh1Y2wLsr4B/d7IDQxyCoKSg== 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 4PF0CN33M5zWWQ; Sun, 12 Feb 2023 07:56:00 +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 31C7u08I068009; Sun, 12 Feb 2023 07:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31C7u0jl068008; Sun, 12 Feb 2023 07:56:00 GMT (envelope-from git) Date: Sun, 12 Feb 2023 07:56:00 GMT Message-Id: <202302120756.31C7u0jl068008@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: 03abf6cd13bd - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 03abf6cd13bdd97c865f5731688cf72931078729 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=03abf6cd13bdd97c865f5731688cf72931078729 commit 03abf6cd13bdd97c865f5731688cf72931078729 Author: John Grafton AuthorDate: 2023-01-29 23:05:15 +0000 Commit: Xin LI CommitDate: 2023-02-12 07:55:02 +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 b9cc740af645..9830bc5bed5c 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