From nobody Sun Nov 01 05:05:44 2026 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 4jHN8G0h7nz6xdF6 for ; Sun, 01 Nov 2026 05:05:50 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHN8F732gz4ngg for ; Sun, 01 Nov 2026 05:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793509550; 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=PMAdioVNe+Ffqo+ipVEVvRIqV27sREax63jG9JX3Y0I=; b=pgiZQgpuoLRgCBu5Ovz8COT9XIFWEzi5NXsjrTos1Cxiz1BVXS6tAd7SaVcnr7JpP3M2iO kk25jlwQ2Sgp8Ev2jOd1o6SIZPYj9prUWkVMzaaenoE10Ki5xza2TvRB6GY3LIab4EBIT0 ScqMEjtVILMwhwXhXouFfTmR09yQ8s64mTNGqpPo35vOJM3aJJeqp4TZ2wS5iYOike4UBI wep2wM1YLSfaL7GOBr+NY9nHG5Ox2sM2B95dHEmI2ux9yrdmJ1QAas222oEVrTh/OpL5aU 1sX2WYy8Dl2bHxRl+bulC6/8zUTHJmwSq+RpZ44Oq50ktUmJLSPTFyKC25wkFA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793509550; b=G6lsic6oqXVmTmXdxp6KRxUg7hEeA0PLSveZim7AnZD5kvT/Jm1mOgNPoVZ85afLFQdgUY m6atSxxXTCobwSBIQDaGHY1c6DWlzRFx5eR2Q3rPo04jU28yeIQplJGz0OR5wyNhGu9jMQ lQI9EfkjW3D0BdzNeh39b1/zt9+Xbob69u7Zhqv3YcDyH4r8X/CXom8RK2izwzRbTHLoN4 I+2kXSE+jP0uz4RiMuOheujb7k8VZvvJvMFcsqDDSZVFqXsiTtwy3KZphbwYPTvMEM6W03 2tT5yL82vJZzhmaIwtZ9VOXeuIIjLqZVWAaf2ELRsyMmoyYVWwRQYVMdlhbgaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793509550; 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=PMAdioVNe+Ffqo+ipVEVvRIqV27sREax63jG9JX3Y0I=; b=d2efKh+XioQ02fQHnYjykgFK5iNKch93tQs1C6Nzx6UKOZ9SdL7Y13+vPGYy7biMWC/XxR IB1qI21xHWD23fwvssRr3HJF6LYiRbn4KtjJk1vCvizuifMfKoGsnShxkChs9SLvYkaPOp DoyvHD8Co6iMQBFDSrTlTT0QOmgV4+s3LrDz1DLvtysUAv+y0rJGh4oJNe7LuM5mHc8ZfF RJ4TQdnx9D93aZaWlQgOzn9U93mcvBdRT/EANBQpGHU4bhDcUoVWNtOg8msLZEl/iBwsTX cFocDlrPg9koeB5W1UZth1YAskvFm8Ck8C9T/XA8fUc+akpB7liswhN7413xCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jHN8F6Qx5zlZM for ; Sun, 01 Nov 2026 05:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 427c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Nov 2026 05:05:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 509d1a936c03 - stable/14 - Only build secure/libexec/ssh-sk-helper if MK_USB == no List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 509d1a936c03a3be050e2a371f68c578a1ffcf46 Auto-Submitted: auto-generated Date: Sun, 01 Nov 2026 05:05:44 +0000 Message-Id: <6ae6c8a8.427c2.6c691098@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=509d1a936c03a3be050e2a371f68c578a1ffcf46 commit 509d1a936c03a3be050e2a371f68c578a1ffcf46 Author: Enji Cooper AuthorDate: 2026-07-22 19:33:44 +0000 Commit: Enji Cooper CommitDate: 2026-11-01 05:05:30 +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 (cherry picked from commit 4db3872aabc33088cf180599c5eaa23b6f58e6d1) --- 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 6e68fe490be6..b0a03cce7b11 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -3,8 +3,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 622b0ac682bd..cc7e359788b2 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 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 c73c0e2d6544..15e9d619fdb3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8898,6 +8898,7 @@ OLD_FILES+=usr/lib/libusbhid_p.a 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 @@ -9172,6 +9173,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