From nobody Thu Feb 2 17:23:51 2023 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 4P75HD1952z3kNVl; Thu, 2 Feb 2023 17:23:52 +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 4P75HD0ftwz3wmH; Thu, 2 Feb 2023 17:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675358632; 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=2yMhXiOHuX3hKP5u2aSrOXQxrYLtuZnjsWHKNa46qCI=; b=FYuNzF6eRyyw0J7ZmWIHRwCinwlTRPRZfm5s/Yo+tCU4v/UAsCt/L3FPvpe+JMSzsT0WK7 hp1c400f8+Zx0RNbD9HFtA9Ua/zlPvj2g7+yJNySkKcOUErnSucWxPWIGShQKRtgf4o6kx zD9WYWpNN2+Ct9dQwomUIDs7IsCeoOZBM9go8DqVfUJgvV3lP4ssGVv6U3lOeYPkcG3jTG 8j9Hpj3kfrgUurIL3eoVApelyhVo2BGj/ZA64l6l7txIj5ykBstjfgK7C1yaMTnmeBUTqY MS5OLRqr+SojzK6A76Knhv5EIJAIHfIsmmFJkmd0SI08+Taqdslu9Hh8YmvrWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675358632; 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=2yMhXiOHuX3hKP5u2aSrOXQxrYLtuZnjsWHKNa46qCI=; b=kUc8wk+qK1V8QzohG9N78C9TaQ5lfYZrIomWfsktxkChR6TEMzcntvQtSF1Q8eGIWLh+Sz 3dG0LtjaVNbgkA1E5zgDcwBLVz8tym+bx/eLvWeGM7iClEGR7gtcUrmkjTJk2JGDX1Ayhb ZgMZVOzjEldHH0HzSa0ivdTT1iOYaiTud3SFFRG1k5J82Kl4Ye08RVv3Ih8q0pY6jS/QVN QOTakqDrnf1iLs0UrBKxqM+a5LDS1WU+aboBmduHNQyPotiHXvSyLqNwmXl9YcVYsx1oyg ORmXaKZu8IiBbuPh+FWVsgSyNOV3eU3RkqgY6oVqrxkGUAMTPNVVYL/RDnDbbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675358632; a=rsa-sha256; cv=none; b=kM742w6l7QEfmv9LKdDFfQVIBF0N4yXOAnvK0G9aLtaak+jnLrkw06FY62WYecyTLihzqv bwx0N3K1bjLixAjr7CfkyZnclF8zXs7cjidlU9bn4REi1TEQacPeI0giE1KUM0Sj/Z4XRn uh7e8rtwP9uyv/mqSDmA+eF5eYBcT35r93akQ98sJNvy8HaLBQs3Kd4qLmWsQid1CYRsc6 EU5eFfIbYBObeUbrgo20SWMqrgviouh6K/Q3dzUlaMOkZGhNLnamkeCJLdMPeEbKwFgkEl n/ugyCXTamnQWrz7UDr2VfsXCmGFFOfKD6pw8swPKFrD9aWrJcTuqDHJU3wiFA== 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 4P75HC6kt9z12fd; Thu, 2 Feb 2023 17:23:51 +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 312HNpBl007039; Thu, 2 Feb 2023 17:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312HNpJi007038; Thu, 2 Feb 2023 17:23:51 GMT (envelope-from git) Date: Thu, 2 Feb 2023 17:23:51 GMT Message-Id: <202302021723.312HNpJi007038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0f031350f32b - main - rescue: Fix link order of SSL libraries and fetch. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f031350f32b8760e0843a6476d67aa21116103b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0f031350f32b8760e0843a6476d67aa21116103b commit 0f031350f32b8760e0843a6476d67aa21116103b Author: John Baldwin AuthorDate: 2023-02-02 17:23:02 +0000 Commit: John Baldwin CommitDate: 2023-02-02 17:23:02 +0000 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 --- rescue/rescue/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 6093cf6609d1..2360bf83b781 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -212,16 +212,16 @@ 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 -lssl +CRUNCH_LIBS+= -lssl -lcrypto .endif CRUNCH_LIBS+= -lmd -CRUNCH_PROGS_usr.bin+= fetch -CRUNCH_LIBS+= -lfetch - .if ${MK_NETCAT} != "no" CRUNCH_PROGS_usr.bin+= nc .endif