d=freebsd.org; t=1777255981; a=rsa-sha256; cv=none; b=cT+3wCq2nX5rX/nZfORR/Sl2dOQitXzTQjikoCVqX/QFUCPJH5gzB72zWzIsefbaxOucRO Fkms3cfkCwJtFpJZ6SOT+VZAosDxah9JYV2eDZV1R4dsR0JbGxX7nIzyW9Sf+5RUkmBq8B fyeLn+nWbEzlYRBhYYTTzZz44dbxTTrJESxh8v4eK3442F64NUjO95kLNjSSo5UItL/w56 AvjGoohPBhGIkfbgN6ikqPlOCvUeejARBrIU1qdJVw5q0kP6KgYSK2WMMbXihM8O53DCyp pank7++gozAWxNcxJsnu7Chz1b8RcLwIz8i603g4lfy1LhrUR7a4Ce+70FHcsw== 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=1777255981; 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=ub8odyRXIU0hmNvOZ+Vt5hZ6t36PEuHC9X2MujRDG+TqVHUTtnf35s99kXHY9B3GYHf/Tv wDRYfKtPoHe1FFDKi7r097YtV1jRxoaUcoAKiS+DDr51z3q7k8ukEKE/7hM1mSZQsAg5TE z5kyTq/xkUvcq3aqaUck7ikhOdkpVot1uY8JiNrT8REc5rbiY50YUl0mn+aSOWsysrUnQz Rad0D331/gsrHNgvdSU5cH11RuoFLsw3JmSe0zqBLz26ZK8DXGp+4HWTBDRKlK47DMoI6P 0BbXQAewJ+HdqJEhoz2Pk1xtIA5Cb2MuZjxTSUk6QTONuBCWWMmI40tWGsQEgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3nCX0RVhznWd 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: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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