From nobody Tue Apr 22 02:07:50 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 4ZhQcR1VCwz5tNHZ; Tue, 22 Apr 2025 02:07:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZhQcR0Chwz49cN; Tue, 22 Apr 2025 02:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745287671; 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=xuuT4fYmMNsueJCxj+Q07XHx7nN9SyTlln8v7CJQmaU=; b=sfkudipNZ7LzqdV7LE9MPk4Q1mykiNx9IKHgB1JsljpfozTaDIKAkm+Sbh5Rv8OfjRUZZp /2cE5ItOBJMHkIkW+dlidlpty6YjZOfoC8z+r3Pat2/zQzc2SfVRxfv6n1I0musYspaQCI /39etpPxzSNRIwT4JmJO0+KW/cqG4RWqAuj2nllryC1dsFPPi5ng2ROXCkcjXjUtPKFPLQ F/9arBY8/vo0qGBvOepPvjzmBQMbEIepmsVauyvg4rUeUB+WzGyUizjkz4TLVI9IGpmiA+ cb7sPIr85kUOk+BtMUDS4sFgAnVIJl4NMufALf82dSbR3MAnIP4OH1ZYJTCnEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745287671; a=rsa-sha256; cv=none; b=GXRF0qWbh1AHSvqfTVqg0GUcROfFwFwNBkp3c2rkB7DWAK6HeFY7pTrJ5vH2oQncU/Qi36 d4l0GYITHwsGBw+AeEDBzKh8L96rl81u6ePgULo1Q+CG3/eVwseo+2YapNXxr18Xy7Jn+E cQlZ0fh5HC3xGqoKiIUUYXcznP2f+RV//eu71iRMIYSYQW+RtczjsLLbS02dLqsvmQ+tnH o4DoHUwx28+5xBrbRNDoVXRkCbfrBYPzDbSa24Ygi3wgkcNjoYFeV4F3z/ts3G/zlflK6y zQHs+x0MppRRx+HKfLipZO9JqcsW+u8zdE90Lzf8SJPydLNMpaODnKaL6Fg98g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745287671; 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=xuuT4fYmMNsueJCxj+Q07XHx7nN9SyTlln8v7CJQmaU=; b=Maqbc/nWWZLiB5b6pRW3epPhdWn5bDo1eOi4BdWQd5u16fk6vsvYRMUhYbJnfn6t8BEupC uGCpnspwLA8JoXFQ83KJjlWk5Q8ByP2MoWszIFlwymXjBEN9kqIJS7ty6l+HAbbDPz+AXn e4pzreWOSRIlMDjkaUfHJxzaE6lh3FlJ9A9gESx2zujxd+RL8We3p0hqSl9Z41BrXsd9y7 fXEzf7xhdc4AmPMzZBNYCV+fix3/sSvvvNL3d0XGGohv9uBg1Q1Z4HNNeoaO+vMJ+XQfng m7b0X7m/FUl7XR4phtkOJftvmeaVmLA2hVQGZmWInI68rQ4HCloMTEjJpglHVw== 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 4ZhQcQ5PJrz1DsG; Tue, 22 Apr 2025 02:07:50 +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 53M27oJI077853; Tue, 22 Apr 2025 02:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53M27okn077850; Tue, 22 Apr 2025 02:07:50 GMT (envelope-from git) Date: Tue, 22 Apr 2025 02:07:50 GMT Message-Id: <202504220207.53M27okn077850@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: a098111a28ed - main - secure: Add ssh-sk-client to all consumers of 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a098111a28ed59e1ab1101ad09913f0235ebd28f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a098111a28ed59e1ab1101ad09913f0235ebd28f commit a098111a28ed59e1ab1101ad09913f0235ebd28f Author: John Baldwin AuthorDate: 2025-04-22 02:05:28 +0000 Commit: John Baldwin CommitDate: 2025-04-22 02:05:28 +0000 secure: Add ssh-sk-client to all consumers of libssh These all failed to link with ld.bfd used by GCC due to Fssh_sshsk_sign being an unresolved symbol. Fixes: 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere") --- secure/libexec/sftp-server/Makefile | 2 +- secure/usr.bin/scp/Makefile | 2 +- secure/usr.bin/sftp/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 0673e1e5613e..20f2d4639511 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= sftp-server -SRCS= sftp-common.c sftp-server.c sftp-server-main.c +SRCS= sftp-common.c sftp-server.c sftp-server-main.c $(SKSRCS) MAN= sftp-server.8 LIBADD= ssh diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 8d38d815d3fb..ba9c1472936f 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= scp -SRCS= scp.c progressmeter.c $(SFTP_CLIENT_SRCS) +SRCS= scp.c progressmeter.c $(SFTP_CLIENT_SRCS) $(SKSRCS) PACKAGE= ssh LIBADD= ssh diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index cc13a86794c5..3f6fbeef695c 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= sftp -SRCS= sftp.c sftp-usergroup.c progressmeter.c $(SFTP_CLIENT_SRCS) +SRCS= sftp.c sftp-usergroup.c progressmeter.c $(SFTP_CLIENT_SRCS) $(SKSRCS) PACKAGE= ssh LIBADD= ssh edit