From nobody Thu Feb 20 18:46:09 2025 X-Original-To: dev-commits-src-branches@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 4YzMfT6fxNz5pGw6; Thu, 20 Feb 2025 18:46:09 +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 4YzMfT6FvGz3gVv; Thu, 20 Feb 2025 18:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740077169; 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=bDgUIGAvMVPPdDlEY5O8cSqZ3CrfcUfJCEOAq6VExYw=; b=P3NPySZUzU0VPkFj/1R73jBnw//qbhD3O1Y6jzl717fPmRecVwMe0YcWTrjZYlXE/bt7Je DUY5CYcELyGnkNmzZ/764Im1O0CxjGWGobJ238EFQLxJ0xUg3Kh8+54BcQUohFDXhTZlQy Xx6xMA/uIS+/keEjm2c2hCNS1i47m64Z1RPht7/bW+QiZ9mVQVnqtL3bWv/gFTrTxEuKTF W2VYMhxJVqqWWIDPslCxVWP9WDz7czKNDGwMVVlyXHtaMQzATtrlU94MpF+5DBT88rX7aZ tSWljYHP6VaXtFzHsiOSy8pyfeB6KGXMFg+aF+QQOWoS1ReMBiTBup/VhZXw2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740077169; a=rsa-sha256; cv=none; b=pRtE5m8JsoU0c6S58y58p5nWyIwwWFw8v0pKvntb5utqRVbjrC2Xrk5ZzHwxK9DViacfvR vjNylCdngrC0ASurjVFZPRsxb4vyGIRyF+F1X7fRb3Sp/vAzFYDKvcIoOs3lElhgJO1uc2 XM6/49azLuFTxRjQVH3keI0Zp5D2LMEqbC+9ISqvBaCQ2Pg7HbwRl+rXpZ4khcvkpab4Zt PouRopUo5TwZsvZ2EdG9AtbF/RGTnFlXUVkCAbN/zIYfO5h5deF3RNxUbOCGrVTBnMEcBK helfgKSbyjOJJ+s46JQ7xJpkmhVwWCMKQv4WMSjTqF1T989h3Y2z3DGMRxXf4A== 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=1740077169; 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=bDgUIGAvMVPPdDlEY5O8cSqZ3CrfcUfJCEOAq6VExYw=; b=xXvn0DE/MaCDxfviPUnLKAuBXjscH++IVpJ4lD46XqsSfeNCJgIqyKRUi0WZk5s/lh1xPW xRz0w57kt7wA99QXq9xbF+tGbdzs9U5YyZ7pQzl41Koi0d6WtUKaYlFqxXwEltphiklsxJ D5hLHw0XdIvtaQyKyQubpZCFX9UPDd7N/VWK8H+dIP2zwwAwENQkkCnrTXaUzrJIO8yY+r bs+0iDxUA4Nag3MzsJ47WsvwTb6j1zZ2BhMtFbdn/RNpAi1OwpBXFF7C5dPtXWNXb34rcO vlsKw0scVQVUJMnh9mkQuo1OmgogCeTFAFN9foxrikWyM/9b1BBHGys4Syzkwg== 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 4YzMfT5Rhbz13y5; Thu, 20 Feb 2025 18:46:09 +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 51KIk94X062025; Thu, 20 Feb 2025 18:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KIk9YC062022; Thu, 20 Feb 2025 18:46:09 GMT (envelope-from git) Date: Thu, 20 Feb 2025 18:46:09 GMT Message-Id: <202502201846.51KIk9YC062022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6cb9cfffa89a - releng/13.5 - ssh: Move XAUTH_PATH setting to ssh.mk List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 6cb9cfffa89a1f2faf5a7fa3dd29f4e54e79c6fb Auto-Submitted: auto-generated The branch releng/13.5 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb9cfffa89a1f2faf5a7fa3dd29f4e54e79c6fb commit 6cb9cfffa89a1f2faf5a7fa3dd29f4e54e79c6fb Author: Ed Maste AuthorDate: 2025-02-09 20:37:24 +0000 Commit: Ed Maste CommitDate: 2025-02-20 18:44:55 +0000 ssh: Move XAUTH_PATH setting to ssh.mk XAUTH_PATH is normally set (in the upstream build infrastructure) in config.h. We previously set it in ssh and sshd's Makefiles if LOCALBASE is set, and over time have sometimes also defined it in config.h. Leave it unset in config.h and move the CFLAGS logic to to ssh.mk so that it will be set when building all ssh libraries and programs but still be set by LOCALBASE. Reviewed by: jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48907 (cherry picked from commit a63701848fe5462c4e8bbff0131bb42979e603ec) (cherry picked from commit 73dd56ffcd7b2c46de58980ac888c0421e3ec0b6) (cherry picked from commit 10e9add50f9358b6b74e1d481b270ba32f3e85da) Approved by: re (cperciva) --- crypto/openssh/config.h | 2 +- secure/ssh.mk | 2 ++ secure/usr.bin/ssh/Makefile | 4 ---- secure/usr.sbin/sshd/Makefile | 3 --- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index 78bd4280818a..e36d766039df 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -2015,7 +2015,7 @@ #endif /* Define if xauth is found in your path */ -#define XAUTH_PATH "/usr/local/bin/xauth" +/* #undef XAUTH_PATH */ /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/secure/ssh.mk b/secure/ssh.mk index 9ee533c10eca..c331e40c16f8 100644 --- a/secure/ssh.mk +++ b/secure/ssh.mk @@ -7,6 +7,8 @@ SSHDIR= ${SRCTOP}/crypto/openssh CFLAGS+= -I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h +CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE:U/usr/local}/bin/xauth\" + .if ${MK_USB} != "no" # Built-in security key support CFLAGS+= -include sk_config.h diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 1d1f5e5e8723..f5560acb8799 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -30,10 +30,6 @@ LIBADD+= gssapi LIBADD+= crypto -.if defined(LOCALBASE) -CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" -.endif - .include .PATH: ${SSHDIR} diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index fd9eacebe68d..73aedb25a84b 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -63,9 +63,6 @@ LIBADD+= wrap LIBADD+= crypto -.if defined(LOCALBASE) -CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" -.endif .include