From nobody Thu Feb 20 17:56:57 2025 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 4YzLYj4Dbpz5pCvR; Thu, 20 Feb 2025 17:56:57 +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 4YzLYj2z46z49WF; Thu, 20 Feb 2025 17:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740074217; 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=+IJkSDliwrw7DUr0Q1ydP4+FUnAQRErWzf4C7pcJR3o=; b=rX5hPha0zGu+pwVuiiy41LmT0/xJClfOjoxYJjtNdWko+LsEFxjnm4eQULxlGdRLnASTk5 fjzJF9fx2IUOouB1Ksu85dtHNMIno3HlF9Zt06urmrrEVeb0R7HeW3CLZ0attU5pYlwzb1 RytmCBNTeqHfCi4vXfM/BOdctOxZfzFIbgaJi7Ey1viYsCIlbSJTB6t6zSKhx24bZwV8+H 7UHJYOI9HjSKy4W+8AVwHsAcvjEyVsgffDX7bxJtd8mGOJv39CiCAGwYMcKMp1TeD0bkj6 UjzDibh3dHzKZSJCCnljonswUUnAxgPvlsXaEZsjHUI1GB/ZX03bMdNmwbQZEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740074217; a=rsa-sha256; cv=none; b=iidJbGSZFeh+ORnscMMWuR7bgJECCRphstAtrk8rk/BYwanO4Kdwk/ChaSK4bdJhx7T1vV 1Kl3e08Lg6sPGIbPoNOuoRWqNyYFZeCTC+cNnA1Jb9RDdW/Y/MsaM1gGhFqsoaNqGE4CS0 0ORGD5LfD+ixOaKxpzf1apoZyofHrMAIsgA+yakuHiTfIHh8RILt/NTe4JuZPIinYH3VNl 3xRQex2UuYY/yfzUqZeka9776defH9YbBkJA8pADejHbLm+YUckNgEnFax4LLD6djMmWDG ++ekelwyywlmYeKLQ0jyIqXSo6nxWkg3SncDSd0fjxldgyx/kjyM04OaoMvNSg== 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=1740074217; 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=+IJkSDliwrw7DUr0Q1ydP4+FUnAQRErWzf4C7pcJR3o=; b=rYjonFeHn9s+Bn868vruGatamP+HslLUcN35XRMKakswNIEDaE2UkPrTWJUzyomWE7XyT8 qzbtKy4YPQook6Gk5evJQvyOnnAyjFNsC6Jt0LeZOSpn5pQbrPLV6kRmApTzh2sKqPm4PH UOnjNyqpAfgx+K7tf41GrTBai/twLw3d47J+O/at/XZgr2c3Ci904tAIPT9cRsRAKVdEg1 EXPxNPos4UKOFRZBICWidEbMu1pjuYiFsQo2wE75OYDHubNHFa5Tst7TA2MnUqv37hwpVL WEvgZDa4OKiu3Ebgh0h/Q/RGkl+qiHLA6vIeIU9X6G6opYi/LbeKpRi4wN2nNg== 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 4YzLYj2TzVz12Rh; Thu, 20 Feb 2025 17:56:57 +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 51KHuvSi068010; Thu, 20 Feb 2025 17:56:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KHuvQi068007; Thu, 20 Feb 2025 17:56:57 GMT (envelope-from git) Date: Thu, 20 Feb 2025 17:56:57 GMT Message-Id: <202502201756.51KHuvQi068007@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: 10e9add50f93 - stable/13 - ssh: Move XAUTH_PATH setting to ssh.mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 10e9add50f9358b6b74e1d481b270ba32f3e85da Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10e9add50f9358b6b74e1d481b270ba32f3e85da commit 10e9add50f9358b6b74e1d481b270ba32f3e85da Author: Ed Maste AuthorDate: 2025-02-09 20:37:24 +0000 Commit: Ed Maste CommitDate: 2025-02-20 13:21:02 +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) --- 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