From nobody Mon Feb 10 16:23:45 2025 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 4Ys8yn3QFLz5mPHq; Mon, 10 Feb 2025 16:23:45 +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 4Ys8yn2lkGz3psJ; Mon, 10 Feb 2025 16:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739204625; 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=RMOhIExFkOiZF/rnzLtuC0r5ayagDf5ue4rtCvPlepY=; b=ilAo0cMLS9RNAjONHAcfHpFIsBGa28lU8HyNtFkfi/9zvViK8j7XiCZbcfp3jLLaxUMSq7 ArwllNFcQh6Tj7AU/YiLUs4tSrSM04imLgnPjfss/yKK81T9qWO+fjSkary6kRmWFenlVJ HzdO+mOiHLr7+WkxAVsJjYePHKdCSvY/SXQELttXrrdshnN+WQyz3LjA1YM7rLVrJNFJMF iPAFsTZsy0XeWKc0lfQWbSyLAM1hjkQDSnqbimWbT5YTXn4LPOhBpG/NK6A6s3UAc/suhC 8TX5RN4SoL6aN4I9NmWT9K4ivwo7Ps6M+objLohn1z6acJOWqxMEPD/HTykFrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739204625; 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=RMOhIExFkOiZF/rnzLtuC0r5ayagDf5ue4rtCvPlepY=; b=pdenzOvfD5261GhPEthou7l0V5E4zib3MUq7gqssTdCL+5uYlvZ7h8RFR1pTCz7phG50/T CcqRiCUpGNDpFeIz8xij0w7Dp7k/xWrxDDiVGP4M9/2J6hDTnW0OIBWtiR5X3C86OhbPWD uWbKuNodGCzG1hBBny2u4pXep+UMciXBcwRbpiWbwltz/0cdYEckK7PVxP8/8nAou2uY+S cPqOn/nM/zeLqzzP/oBVQlF/aJxtPa7wRPE+WeAN2Ugs5cUNYNumBaypNDkJm1jaSaEgqL stvNVwpBCdXW/KEb/QA3xGxjtlKJs+VUardc01q0+RSgSCbvyIwBjXJVz35XCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739204625; a=rsa-sha256; cv=none; b=P7BJTncb0wUiWPSRaKTaAEZrAhvA5JzvIV7QSezRkqsGwKM7BJDgC7L+XzSk/FMBp/96FU zpXkYXXpPfjUMPvA1m3GXZA2BjHjbOJiDHbM+7EOybPADBf89azxwDN7E29UeIBc6+IzPv dnXaxeUvljBuZg/FYlpQYnYpjYCqGd1ammvCBzqWyX/xcSLsFAOFG4d57I3sCLCsuMiTtS 9y/sq9ZThu03zsu3HuC+oO87eZ2TjnjB5GqpNFGbAo6b7I7fvpWSDmVmdTyeHF+K+V1/de TlePdmkIol/fpc9CWiaXN/azvPgmkEq6BNhT/xO02LaIhm5VzLCtp7HRCWVAvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys8yn25XwzbNv; Mon, 10 Feb 2025 16:23:45 +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 51AGNjwn098857; Mon, 10 Feb 2025 16:23:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AGNjsZ098854; Mon, 10 Feb 2025 16:23:45 GMT (envelope-from git) Date: Mon, 10 Feb 2025 16:23:45 GMT Message-Id: <202502101623.51AGNjsZ098854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a63701848fe5 - main - ssh: Move XAUTH_PATH setting to ssh.mk 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 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/main X-Git-Reftype: branch X-Git-Commit: a63701848fe5462c4e8bbff0131bb42979e603ec Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a63701848fe5462c4e8bbff0131bb42979e603ec commit a63701848fe5462c4e8bbff0131bb42979e603ec Author: Ed Maste AuthorDate: 2025-02-09 20:37:24 +0000 Commit: Ed Maste CommitDate: 2025-02-10 16:22:42 +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 --- 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 6462ff16d8d9..aedacd88df10 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 7c3eb68ea083..9bff63f29395 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -29,10 +29,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 323fe4b8c99f..2762d4151009 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -62,9 +62,6 @@ LIBADD+= wrap LIBADD+= crypto -.if defined(LOCALBASE) -CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" -.endif .include