From nobody Wed Feb 19 15:00:17 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 4YyfhL1PdTz5pSqb; Wed, 19 Feb 2025 15:00:18 +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 4YyfhK2L57z4Hns; Wed, 19 Feb 2025 15:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739977217; 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=sHzCxer2C2iEaV3JMJaXIARtO237ucqTZ/SL7UmgF70=; b=CU84uxgLF+A22D+MStirfM1hlHbqBHHMraRYf2BSo3gI/t3o77Q1zYR6bodIlo3MhJ9874 ePoggRCljZ+lRUTXpLvaJQ/RAENOLvFNqrrEtE2CTdMwoTkzNIt6ra6qWCRtclxBh0hwdU 4n5gXUYAmOD3RRG1VuetXwbk62uqPCWH+3E7kHMywWO6wCpj+2Ismyn5viSuEcKFsawtww Ed6FxXVOIMmqSwEq0hTQ0i1aeaKSsZF2Ha2QqqI6dI8TC4u5tU14s+hOLh9EB2lKyGQW5J h2dFVFSCgxuZzbZyrsxtXF68olhK2sGtjvdBdrYloZsGSbWslYHxntu63xO54g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739977217; a=rsa-sha256; cv=none; b=F/uytaNEkIWdZv1OBttx8W5IAAUqUMii4em/oJ8IZKbqtk28ook15N421/QpPi6vqvoR9r 5FUunCfJzPvps1qTVHal2Sf11BZrwOOWVzM+uppkqBDn7aUBX/Yjee1oujvmgWsb7qW1WT fSc1jfsI1NcWu4cW5ybA3uMSnHUr/LNFGpCBPYAPo9TxxWDUBAb0fBf2wjSc7boACeW0Ai GO1JGV/YE8En9E99sGAwU0JVmFRAD6Fl5D7kfnvW61xSN/w1P8foXmka8+2gh2Tf7vAyuW 6nNs6/112iMBrYbHuyCP5LvGAggoeWjLwD7gCoM/KCR9nLQ4AZRR2SEIYAPx4A== 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=1739977217; 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=sHzCxer2C2iEaV3JMJaXIARtO237ucqTZ/SL7UmgF70=; b=uxgFOjXC6haFhHZPH8sKn9718AihOWqW/IeIlIg3LEDx+vnv3Qf8fOxgzmJ/j7ONWiuWlL Ao+95LobFuwSqQPkxZ7t8W3heJrRK57ezX/FA+nNytnFyGPlR9KcjT3Af6JVteHx18WWx+ ytDtJ0dCrbUplPZG4BT56HKHwLOsB99v7geqWPnwXG6ARCEO6tcyER6B9WmcsFmESFmAB4 A9x2oRS+S5K6VCMeJuNiLh1U9j/4j42pKZKLkysMAtQyYPmzKrNJfnqG8DYaROKVoJyJj2 VqiNQuO6oJpKcWR9Qfih26VUM8GeK96ALBCbfg81y2C5+fKc1U0FtisWMgi96w== 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 4YyfhK1dsMz19HB; Wed, 19 Feb 2025 15:00:17 +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 51JF0HnK024240; Wed, 19 Feb 2025 15:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JF0HQA024233; Wed, 19 Feb 2025 15:00:17 GMT (envelope-from git) Date: Wed, 19 Feb 2025 15:00:17 GMT Message-Id: <202502191500.51JF0HQA024233@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: 73dd56ffcd7b - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 73dd56ffcd7b2c46de58980ac888c0421e3ec0b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=73dd56ffcd7b2c46de58980ac888c0421e3ec0b6 commit 73dd56ffcd7b2c46de58980ac888c0421e3ec0b6 Author: Ed Maste AuthorDate: 2025-02-09 20:37:24 +0000 Commit: Ed Maste CommitDate: 2025-02-19 14:58:47 +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) --- 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 751bb631c221..5cf7f0ef2d3a 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 c15bd773c77a..3c22819071ea 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