From nobody Tue May 20 22:59:43 2025 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 4b293z4tbcz5w7mX; Tue, 20 May 2025 22:59:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b293z4BfQz3dgb; Tue, 20 May 2025 22:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747781983; 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=liTqlFx+Ee6C/bhc+7viwzsRmSKkMEnt7iB38eE9XTg=; b=E2FGYQF0DRAFsDEclrOPlC5gWBi60YXHjEL8T7KPw7EFEaEh/Hd+3Pf+T1PIfy9Cc/YSzE BZq9zrwHtcmLVfxvKTVTc1yLNPJjKJfVV6mJddmv7+Me3iSS0iSHWv7MR7S2GYLeb6oJTg C3i6NKxxgLy7F6yKFV/sK+sfysxWfRfVbIShRzgRgJlsTeRlh8xB3Zq6mMYfj97knfgEB0 dzPxgCAhhrYdetOAMZIst0jjo/lWfrXEVj4e3p4PJsJaOk0t9CPhM8cFDr5ecfWI3/35Ej pysCfCUxvuCJNOgY0281ABaHPXVdXxJT1Rop2Ag47GiIyc15Qx5T+MGv6Gu8/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747781983; 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=liTqlFx+Ee6C/bhc+7viwzsRmSKkMEnt7iB38eE9XTg=; b=k9eS+n1LM/YfnzmLWAIVd+nOKfLA+G/DnJw2GwEehYpEtwUoIEHTgu4WG2Auoamc+yS+qt LmlWfCk9arN+b/OgBsG1dR9gjxnjKlL480/raPu4O2Kds91sbVrW8YkXuBbFU4HCiRcZLo Qk3x+ECZ8/Pmxg9+0Wd14KQOGThb9/ktxNc3YtA+uMovFOXtJ464qT4hpi5dQ/Z9WvvxZf kHYJUFnC9yXzRUZBw/Fq3fmwRtnRmNVFEyxB2D6hY9ZDJyXKMX/VnXbmWuakZHNh0n+0e/ Lg+Lp4D7F4v4gzu65OucthOQ2ZhBLBqXlEE9EQB0rn7cDloAWk94tajiGYPO0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747781983; a=rsa-sha256; cv=none; b=FUo0Mv0Bq1gF3WStqB/hcSct/KzEdHT3KR7qe7GnDfW/EiiFKsGbnZqgADJjNC94NiT/QS PGNRN9PouKHgWEmVUd8ncJ2XXdFLISBxd8RdF0H6ClVRqBSOL78S9mrpqWcfhinzbNI89O xuCg72nD8LNvHr6PGokEdF6EekeNoGmMpCXnLLw/Rfm8m94M5FV806OQWLl7Krjdr9yGhl B1UsY4SMK486d7ZCQnZgHzxyue8PtgmC7PCWeegqHeumg0r31AF7hjIvLqcmaJII5n9QK7 xi0pnUYo/kGJ0CIoKYeNSLtgcyxiDOJnLKdat5Ls6KoqDBNxNydrBJeqBKg5+g== 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 4b293z3R9Pz17y0; Tue, 20 May 2025 22:59:43 +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 54KMxhjo053601; Tue, 20 May 2025 22:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KMxhl1053598; Tue, 20 May 2025 22:59:43 GMT (envelope-from git) Date: Tue, 20 May 2025 22:59:43 GMT Message-Id: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac62b97951c25a33ec0880e574ccff31be7452f7 Auto-Submitted: auto-generated 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 --- secure/lib/libssh/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 39083d007675..35883d4a9d42 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -39,6 +39,9 @@ SRCS= ${LIBOPENSSH_SRCS} \ sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c \ sshbuf-io.c +# Add ${SKSRCS} to avoid linking problems. +SRCS+= ${SKSRCS} + PACKAGE= ssh # Portability layer