From nobody Mon Apr 27 02:12:56 2026 X-Original-To: dev-commits-ports-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 4g3nCX1s5Fz6bTvG for ; Mon, 27 Apr 2026 02:12:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3nCX0spkz3dWX for ; Mon, 27 Apr 2026 02:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777255976; 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=7JOZnlAOvTjYPAfpmINx1dwSpiFPaTnIP9lobeIowto=; b=tu9fg2q8kv24b27CHP8x5Koo1UyU1t1zsWiNoTGGI4txSVdGIeHG45gu4UTrqizvCb1t1d KOi542BnnKhHKqnUnnoe8q2qZsFdgTjFqOKYlkoDfLOblITSCXGPcK/een+FrxJswJnoB/ cY7Bj5ypZd1aWjoQ/AQC/+rPzAeoZNBKCrONoZ55jp1lk+H5FI4fAJXqb3aflEUXbQdzGa tn+US/fVM/ZBQqQor6pQHIx0Ynf2Tb+0PG2jB7L/dDmnnDywmz+Jv7vifi2Oq54tBdwMMM KodxBcgD1U/3a84rX5//Zs9n0sQKmD1TBsTmq5ShGLeVYSdhlpoext25NonXjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777255976; a=rsa-sha256; cv=none; b=PnWiZlC9ZX0QVPC7fRRPF4/E6YpBpWSjfJGYy4cL1WJ4QemRe8iiRUplYmIFMG16Wcy5NL oUk5xRpudreMFH5MudHB3I4WIRkvaHJIszMqNPRwAX60s9frSuNyWS/innRxBtdde/bM+Q X3yyWFZYyvvhcLa7H8k8RK4h+FLmD8hkSFcu/2IRFakt0909X4pozgpnwlSIq2bn+ZxxhS dlm027vJtmbn7sfd69kavC0V6/yG8jlNPMY6jI0EmfuuJMYGM+/5fi+FzBaQgwkOIEo0Ur PDjiHsqzlI5+Jqueb0S/3rh3Rl/Fra5QzqCOnmfVZM7A8EWo4PDMenB9b0J3fw== 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=1777255976; 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=7JOZnlAOvTjYPAfpmINx1dwSpiFPaTnIP9lobeIowto=; b=wFxjKxNhdFxuC6gcc9J0J4z7zfmltBDsGRe7PCPS4i8JO/5U/9Kv0aHGPdipCE56qE4nAz MQ/iDtHRV4HPwXtt9diDnyEUS7amccHyQBGRCz4nAx9DTlNBaKmLSeYeh07S/fVa5M7UGM fOJzm0KMPaoO6e/2I65J0c070f2kMAahr4eon7LspIVES55/M7TMl6O4e4fpYm1Rp/GcoG HLYbhMjjN6LBNCGM2daPOrlsi7xPmq8AjnxJhUl0QrKSLcX3c1D8I4CUFXBM5jV51xr2/I WXJF6REeu3GczgmFEtIvsPzcAN7c36InpflntWYEQtOh9CO6KXajf8TSs8E2jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3nCX0RTCzmpr for ; Mon, 27 Apr 2026 02:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33386 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 02:12:56 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 8dc56cb5c4cd - main - security/openssh-portable: Fix `make test` List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8dc56cb5c4cd68ebfcc9ef2dec8b2adfe2eb7310 Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 02:12:56 +0000 Message-Id: <69eec628.33386.4f16a6c4@gitrepo.freebsd.org> The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=8dc56cb5c4cd68ebfcc9ef2dec8b2adfe2eb7310 commit 8dc56cb5c4cd68ebfcc9ef2dec8b2adfe2eb7310 Author: Bryan Drewery AuthorDate: 2026-04-27 02:11:06 +0000 Commit: Bryan Drewery CommitDate: 2026-04-27 02:12:23 +0000 security/openssh-portable: Fix `make test` No changes here affect the build or package. --- security/openssh-portable/Makefile | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index cb44c111823a..0b2b33626d6e 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -233,15 +233,39 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/HPN-README ${STAGEDIR}${DOCSDIR} .endif +# percent test does not work unless user's $HOME is set properly. +SKIP_LTESTS= percent + +# A tempdir is used to avoid unix socket namelen issues. +# TEST_SSH_UNSAFE_PERMISSIONS is because /tmp is world-writable, but +# the actual test dir is not. +# Some TEST_SSH_* paths are passed in because test-exec.sh defaults to base +# versions for them due to being outside of PATH. test: build - cd ${WRKSRC} && ${SETENV} -i \ - OBJ=${WRKDIR} ${MAKE_ENV:NHOME=*} \ + @rtmp=$$(mktemp -dt ssh-regress); \ + chmod o-rx "$${rtmp}"; \ + trap "'${RM} $${rtmp}'; exit 1" 1 2 3 5 10 13 15; \ + ${TAR} -cf - -C ${WRKSRC} . | ${TAR} -xf - -C $${rtmp}; \ + cd $${rtmp} && ${SETENV} -i \ + ${MAKE_ENV:NHOME=*:NPATH=*} \ TEST_SHELL=${SH} \ - SUDO="${SUDO}" \ + ${SUDO:DSUDO="${SUDO}"} \ LOGNAME="${LOGNAME}" \ - HOME="${HOME}" \ + HOME="$${rtmp}" \ + TEST_SSH_UNSAFE_PERMISSIONS=1 \ TEST_SSH_TRACE=yes \ - PATH=${WRKSRC}:${PREFIX}/bin:${PREFIX}/sbin:${PATH} \ - ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} tests + TEST_SSH_FAIL_FATAL=yes \ + TEST_SSH_SFTPSERVER=$${rtmp}/sftp-server \ + TEST_SSH_SSHD_SESSION=$${rtmp}/sshd-session \ + TEST_SSH_SSHD_AUTH=$${rtmp}/sshd-auth \ + PATH=$${rtmp}:${PREFIX}/bin:${PREFIX}/sbin:${PATH} \ + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} tests \ + BUILDDIR="$${rtmp}" \ + abs_top_srcdir="$${rtmp}" \ + abs_top_builddir="$${rtmp}" \ + .OBJDIR="$${rtmp}" \ + ${LTESTS:DLTESTS="${LTESTS}"} \ + ${SKIP_LTESTS:DSKIP_LTESTS="${SKIP_LTESTS}"}; \ + ${RM} -R "$${rtmp}" .include