From nobody Wed Feb 19 17:39:41 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 4YykDF3X47z5nQhW; Wed, 19 Feb 2025 17:39:41 +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 4YykDF2Dx1z3mtf; Wed, 19 Feb 2025 17:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739986781; 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=txGesk9qilWsegSRvRrzPHfVP7CukaJn5K3S5iDCk6k=; b=ywY00/2Q2ziuiYjT+/rSExRTLfRyCTCXIU0iIJf23MGduIij/mPnoJeaC+zz5aJj+XRm6h V0230djEuxARyMG8twf7PWzgvT6CmTLzqWMsiF0NV3/q3Nw7FI5rNZxHe+6Mz/cGmlHrTe 6rV7dZO1bfKghhSHpdg/snEeGlzO8e8NrhuixwPWRtNCFmf7Yu6/Osa/RiMs+pC2RpHvBC xUmiMqKRTdXqo3qPDDpGlCZc8rht0Okv8URcsDJxixhw1fMZKtbCq8eNoEg/pKrMWobx46 Nu4DK92R4ILKLRr7zjMNciILfQp7ONgFXnt2+RqXJMAYp12kkK6vCfx/yu/oHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739986781; a=rsa-sha256; cv=none; b=opu4sOv+/aGRgJh2A+LdooqmH0VH9UnpmvJEpW8Bl2VwNfTaiDFMVGFmES2JG1gGttGgW2 X7JxnQItN/w5o6HuPScd1JtmUNPQCiU4WX35iLBWo4Rg5c+l/wXFU1LdDwkcfIWq3Eql+y +41h/Uc8Pj8AXU4OYXaCfahvlHwI2I6wAcZY4W1HLu1sajGwwVJ8h/flRmlZPISUT2/qF2 9zad5AS+mMgUlqsG7/ezv9uopCGoZt0Yfpfh63rqA810MxaDQg9cTQ6A/fiR7sII7QneQM V+he/ypZ+CUhgua57x1Z8P635xfRl8zUbDasChkbf8jvcQdgIrNoQ5B3uSkG+g== 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=1739986781; 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=txGesk9qilWsegSRvRrzPHfVP7CukaJn5K3S5iDCk6k=; b=K770JyfGsiYD91/GAJ5eF3kL3mdHH4RAtTYU77+5+m2YtiwxvMN/8xXwY7avRqCo/SqCa1 aZb1jwiUkBG4RfI8RzgwcsgDJrAsU7sZmONs/UcTXZdTtEvDu8FtGRIJF/5TeIgxyNL7pn 8qeOUUAh3bvKAILDtX1QVvoykYcQAmw+VjHkBiSfBxRBwrcl7A6MJa1Ct/wzVhRc6rwbJB uMiNNTE97QW4ZUh+OoDKG1IwulXA8pNQSBs3GeRBN0qsyXGwys/eGU+Sp4uVfvm9itITj/ M9h5XHMaw31DokQQmBY6D4dCfnf9FZhqGrWatO+DQt6Gmb8tc/9jVoTMjT2waQ== 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 4YykDF1r3Hz1Ml; Wed, 19 Feb 2025 17:39:41 +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 51JHdfPg016913; Wed, 19 Feb 2025 17:39:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JHdfLZ016910; Wed, 19 Feb 2025 17:39:41 GMT (envelope-from git) Date: Wed, 19 Feb 2025 17:39:41 GMT Message-Id: <202502191739.51JHdfLZ016910@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: b4bb480ae929 - main - ssh: Remove unintended XAUTH_PATH setting 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/main X-Git-Reftype: branch X-Git-Commit: b4bb480ae9294d7e4b375f0ead9ae57517c79ef3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b4bb480ae9294d7e4b375f0ead9ae57517c79ef3 commit b4bb480ae9294d7e4b375f0ead9ae57517c79ef3 Author: Ed Maste AuthorDate: 2025-02-19 17:37:09 +0000 Commit: Ed Maste CommitDate: 2025-02-19 17:39:17 +0000 ssh: Remove unintended XAUTH_PATH setting This crept in while rebasing the OpenSSH 9.8p1 update across a63701848fe5 ("ssh: Move XAUTH_PATH setting to ssh.mk"). Fixes: 0fdf8fae8b56 ("openssh: Update to 9.8p1") Sponsored by: The FreeBSD Foundation --- secure/libexec/sshd-session/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/secure/libexec/sshd-session/Makefile b/secure/libexec/sshd-session/Makefile index 2461962f00e2..e365b0c53dde 100644 --- a/secure/libexec/sshd-session/Makefile +++ b/secure/libexec/sshd-session/Makefile @@ -57,10 +57,6 @@ LIBADD+= wrap LIBADD+= crypto -.if defined(LOCALBASE) -CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" -.endif - .include .PATH: ${SSHDIR}