From nobody Fri May 23 17:06:01 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 4b3s4X1NMJz5w2CH; Fri, 23 May 2025 17:06:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3s4W6c2Rz3kFl; Fri, 23 May 2025 17:06:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748019963; 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: in-reply-to:in-reply-to:references:references; bh=sRsfBWe66dI7Fmh5Ne6H/01bGLV9fJXNyyMInT31PDU=; b=uQCAGGFAqL5plKZEf/xrdxBQlwPjSZ7N0RCRYNiD3hi9EVKu1D8SptlBxAMRsaaizhPnTS WdLOBaoxYAJPDIUkh0QIdn0ob8UKHoZzYEbol5r1Nnjnt20hYYj+jmI+Z3woF48kuLj0s5 wZvPaJqjxTGQrLgoYLgJf4kQWvtcwfDoMBFADBrBCrDaSMEfaAXdcrqIamUfwNTzFZ/Yg5 lwfqAXc3lpeIihr0KPdCoh97qM9yXeLIhmVfPqFExcPR3GO/DC/vPREOTWNxQsCtfvSwT4 mCHZyjz7JRVNUT5M/qJIHXavb7jkiEDrAc0pmbaam4NHY8i/moWv5iaDW4fqSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748019963; 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: in-reply-to:in-reply-to:references:references; bh=sRsfBWe66dI7Fmh5Ne6H/01bGLV9fJXNyyMInT31PDU=; b=LzoyaHo1WuWDK3D+JZdQJ6fRcia7hVjQ0gcS86WsBfg3OEoiWv0UBso46ac+s0G2KivC8o +u+o5hfYLOUOG00eBJJt1DWGU0snnB0QkmsQBl4YA4mLI4pbAD4lExoXN2bAZf1csTHCF9 1bxFRT5aN0XjUNgquQ57EcpxKByVSt8m+Li7Kpos25G0ctjcvkHWzhLOnCzJYsAiPf4nhe bhkcDmodDv9tTUkLoWHMuViQziZ3YXMKbuEbkaJjWhIPk2ftFT5Sa2ZbqIyx2Ujr9l4YbW jQ/TJc7Ibh+n5Burbr4tcPVogwMg8U5ZVQuUXUitiGzplSu8YDmccMRNRbrGHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748019963; a=rsa-sha256; cv=none; b=KBblxmgeQgMp4L0dVtPMwNF1Z7FewKMLDWouRkuI5GMoC8MmYwK8yZ7u6/WPmCcubsEOMv 3vTTNR4k9s88UfC30UXnZ1OTW7HHTpO/sYZSgcAJw6FMH7JcPqbHPMei8waHt5gTJX7+j/ hzn/SniLa/kxqfXwwNSMat323/Oc886SIC+NAShLOJZEzW+duPRLiweEzCO/k0FIydzkeM x1p2KpIPNK3j3H+tvFxEyUOvBT/pXl3SyHIeVRHPuinTBSj6C/iVk3EQnuPnbibDMnm1jA acNIHfZJ8wbQBQ+g77jN2ejaNsCn0oMC9L+FO0aq2EhcXlEhscviQEFchZRtWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [172.16.15.198] (astound-64-85-238-171.ca.astound.net [64.85.238.171]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b3s4W2MbRzDHF; Fri, 23 May 2025 17:06:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org> Date: Fri, 23 May 2025 10:06:01 -0700 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 User-Agent: Mozilla Thunderbird Subject: Re: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh Content-Language: en-US To: Jose Luis Duran , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/20/25 18:59, Jose Luis Duran wrote: > The branch main has been updated by jlduran: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ac62b97951c25a33ec0880e574ccff31be7452f7 > > commit ac62b97951c25a33ec0880e574ccff31be7452f7 > Author: Jose Luis Duran > AuthorDate: 2025-05-20 22:58:23 +0000 > Commit: Jose Luis Duran > CommitDate: 2025-05-20 22:58:23 +0000 > > openssh: Add ${SKSRCS} to libssh > > sshkey.c references sshsk_sign(), which is defined in ${SKSRCS}. > > Due to how FreeBSD builds libssh, or put differently, due to upstream > not building a shared libssh.so, we need to partially revert > 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere"), and > add ${SKSRCS} back, to avoid linking problems, especially when building > with GCC: > > /usr/local/bin/ld: > /usr/obj/usr/src/amd64.amd64/secure/lib/libssh/libprivatessh.so: > undefined reference to `sshsk_sign' > collect2: error: ld returned 1 exit status` > > Put the sources in a separate line, to maintain line-by-line > compatibility with upstream Makefile.in > > PR: 286580 > Reviewed by: emaste > Approved by: emaste (mentor) > Fixes: 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere") > Differential Revision: https://reviews.freebsd.org/D50020 Shouldn't we revert all the other Makefile changes that added SKSRCS in the consumers of libssh? -- John Baldwin