From nobody Sun Nov 01 05:06:39 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 4jHN9C461Mz6xd7n for ; Sun, 01 Nov 2026 05:06:39 +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 4jHN9C3QmGz4pc3 for ; Sun, 01 Nov 2026 05:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793509599; 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=vG8nIhwblQKizyZoQGQtRwLV/dSHPJcQlUOTmCH0uBc=; b=iuIGFLb+0EZgWIxkyZDw5Oz6QoO0CY8aW9DvOOy71yVC290GYfe3BvUtozNihnISAaTkJ2 My8mCRe9KYu2bFy2kfQiPshXXxDnvqawUvKaf0F3wHug+ZRqEx+PQQMhHtOLGkpsuHU8z6 EM4tJrBFrjch7HEScz0PxH197uwuJFVXszNyX8fTVqgkskq5Q5o4yKo4iM4KRhDiwT4vLG lRpqjHZg6NO9PjNtFENIZT2slxUEUfW8J0771xHay9P3mlCU+0h7A/f9FWLlbuhycsOAvI S0uKagCiXenlhbUIOmnVc1z9TLdYwROkAzcqUVJ8+6ZLRYX+QOXWgpSMKnaF6A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793509599; b=OOJlxLONVhHUmL7iUm3ZiQguOkHDAqiseqRy4KrobAr785kGXGJdgOCTmKqyXnqAEtgELz jwG4ng58+gxgg4SVmOoaljhwA9p10hJqvinelHCM0Q3kZbTcDrDTW9M2DRy5s8Hh4zKJOe REvmDo0+uVn1fg4/Lbi3n3P7lytGAIpbMz6Hpf2UjAWPkBmNcebQ8Fx5q5fnoX6M2wxO6V 5EKS1PQA3kC10aR+qAT7dXnvkkiSrtBzURbYOdLRNWE4sjS/819tTSMkZpIpCRwggq+gaj zOcoEGA3tmV48bKn/MVPMqI+DbU25a6eCPw3Vu1Y9VkqosAb4H1lD80Na+3QSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793509599; 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=vG8nIhwblQKizyZoQGQtRwLV/dSHPJcQlUOTmCH0uBc=; b=YREE+UShehOc+PTDRz/dFGoj4e8x5V3yZF62BN27zQqj6AJhS95zYzX9o3MHA3Tj2V7aRp BPBhz6WqoAfZ4/30YwOlMsxc1jLAbi4hyCek4lYnLbIgXEtzkw7DQBBgoTqjbJ4Hbho5RX cwsTdh9YJDN1RulQC/pi6PUMNQSxAFs0RcPKuaR5n/sSiR4pzv6rn+0Bcr2lVft6/o5J/N pLQuAJpZQOAwFKW5UgPFiX+tUVaTliCQCXR4fNrJNCvk203j8JO7kcjg+YrcKc00AlZ8sP zVfoKay8qenuHDQJcL8NS60Sx1OwI5XSQu3eUvAlMnpaVXZFi6rk9xqz5XU+hw== 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 4jHN9C2ngZzlcD for ; Sun, 01 Nov 2026 05:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42744 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Nov 2026 05:06:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 1d57423b4c0f - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 1d57423b4c0f76aadf746a2e3080a499feafc7e9 Auto-Submitted: auto-generated Date: Sun, 01 Nov 2026 05:06:39 +0000 Message-Id: <6ae6c8df.42744.401d4f9c@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1d57423b4c0f76aadf746a2e3080a499feafc7e9 commit 1d57423b4c0f76aadf746a2e3080a499feafc7e9 Author: Enji Cooper AuthorDate: 2026-07-22 19:33:44 +0000 Commit: Enji Cooper CommitDate: 2026-11-01 05:06:35 +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 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 6245b6e9f444..c42c4c9272df 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8882,6 +8882,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 @@ -9156,6 +9157,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