From nobody Wed Jul 22 19:33:53 2026 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 4h54Dx5zgCz6lYpY for ; Wed, 22 Jul 2026 19:33:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h54Dx5PnCz4JKy for ; Wed, 22 Jul 2026 19:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784748833; 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=3nGEIN4Ktm20IHgJaFdz8lZecFmpTglqRFHdI06q5E0=; b=nhRjTODFBpWeAY6gptMfgHSgUMqpwlt2PQ6+xU8NE94D57QCjjTVVAy2QOoWJjty0vEwgg rkacjsqEhzVXI1505rozrE3IhrTp9wRZvZB9JNpUJmO17JjEyOz36/cVXAS20pTBYJHzsO fAhLahxbfec1/lQ7MnW4rg3IpiBc4Gn7058XGS2iYWG2SHEv0w8Op0MxrNdA93K2p7wyA2 7yc0GeR3vnXaXGlXRKommwZyxuUKLh6aNRTL5+HNSlBhWhz8Pyvb25sDBjCYl7vshJiOY3 PfrU1rGrzBTFFaVTt2TiSGPxy4DvjRKlJo83DAsVdW1Tm99Oj3L+PsuiHKXaQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784748833; a=rsa-sha256; cv=none; b=VWM8h9kvS4fYlYpqj+kCh1PYUzb+hjWIH2t7RllP1A7pDLEb6iCAd/oDaeGcOsyNyW/4VA EGYjUfvxpRztN8ZYBpe3CJPKTN8V/VP6uuEqoPh+/EFbktssZHmOI1iAHQSercFV9z/SkS jxMlXAGNq0b0hMb8VKESN/xNL6omnZB5s5HR9YH5Heq0yTGvzsO9UQ5xoz7CtsKMBgZAHy Wv3G8nZqkBb/MIZViVM2lXGYO8WB6eH6tcfdrFgQ8El5Lan0yr4e311E80ppGd49UL19jB fdVm5LXaOAL9MU18R6OhmrpMPO00T8OVfZBFqowQaRKQYcEHfdAVDfc7J1whyQ== 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=1784748833; 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=3nGEIN4Ktm20IHgJaFdz8lZecFmpTglqRFHdI06q5E0=; b=KXpEomrGL8NqxkIu14sreNwi3j9BahV+RX5P9gk+RsNiNN7/eL8Soqvv2cLArk56Q1xAMU yRB5gligqYG7VrM6drOtplcJCwIZjccYjAostdh7gHKmoEC0tcJLc/1wGPzHB52bq3OtQe 7zl/lvQltE+s5v7JKuIWhNoSBD/fX5TURgu05PC2v+as2trW0U12eYdl2S4w8gau9m2nxJ lfEYZdXMhRUCFuoqV7qpLo41o28f//MpeBXXoz6MR/MJ8o0jqnbiTCQAkoGjNOucKS8ZyK I2QQ2QWcTtuNVbxJNq83jdxipxszctIY2qnPdxqGIU0la9PL+0r5SLetYH5oBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h54Dx4CSzzYgj for ; Wed, 22 Jul 2026 19:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f0c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Jul 2026 19:33:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 4db3872aabc3 - main - Only build secure/libexec/ssh-sk-helper if MK_USB == no 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4db3872aabc33088cf180599c5eaa23b6f58e6d1 Auto-Submitted: auto-generated Date: Wed, 22 Jul 2026 19:33:53 +0000 Message-Id: <6a611b21.1f0c2.2c3b5692@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=4db3872aabc33088cf180599c5eaa23b6f58e6d1 commit 4db3872aabc33088cf180599c5eaa23b6f58e6d1 Author: Enji Cooper AuthorDate: 2026-07-22 19:33:44 +0000 Commit: Enji Cooper CommitDate: 2026-07-22 19:33:44 +0000 Only build secure/libexec/ssh-sk-helper if MK_USB == no The ssh-sk-helper utility only functions if/when MK_USB == yes. Installing it on systems where MK_USB == no doesn't make sense. Differential Revision: https://reviews.freebsd.org/D58246 --- secure/libexec/Makefile | 4 +++- secure/libexec/ssh-sk-helper/Makefile | 5 +---- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 7f239ccc7fee..6f74d3699912 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -2,8 +2,10 @@ SUBDIR= .if ${MK_OPENSSH} != "no" -SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper ssh-sk-helper sshd-session +SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper sshd-session SUBDIR+=sshd-auth + +SUBDIR.${MK_USB}+= ssh-sk-helper .endif SUBDIR.${MK_TESTS}+= tests diff --git a/secure/libexec/ssh-sk-helper/Makefile b/secure/libexec/ssh-sk-helper/Makefile index 837599df80b0..4b708e898dd3 100644 --- a/secure/libexec/ssh-sk-helper/Makefile +++ b/secure/libexec/ssh-sk-helper/Makefile @@ -6,10 +6,7 @@ SRCS= ssh-sk-helper.c ssh-sk.c sk-usbhid.c ssherr-nolibcrypto.c MAN= ssh-sk-helper.8 CFLAGS+=-I${SRCTOP}/contrib/libfido2/src -LIBADD= ssh crypto z -.if ${MK_USB} != "no" -LIBADD+= fido2 cbor -.endif +LIBADD= ssh crypto z fido2 cbor .include diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 842ecec362a6..b595e863e5f5 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8858,6 +8858,7 @@ OLD_LIBS+=usr/lib/libusbhid.so.4 OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc +OLD_FILES+=usr/libexec/ssh-sk-helper OLD_FILES+=usr/sbin/uathload OLD_FILES+=usr/sbin/uhsoctl OLD_FILES+=usr/sbin/usbconfig @@ -9132,6 +9133,7 @@ OLD_FILES+=usr/share/man/man4/uslcom.4.gz OLD_FILES+=usr/share/man/man4/uvisor.4.gz OLD_FILES+=usr/share/man/man4/uvscom.4.gz OLD_FILES+=usr/share/man/man4/zyd.4.gz +OLD_FILES+=usr/share/man/man8/ssh-sk-helper.8.gz OLD_FILES+=usr/share/man/man8/uathload.8.gz OLD_FILES+=usr/share/man/man8/usbconfig.8.gz OLD_FILES+=usr/share/man/man8/usbdump.8.gz