Control: tag -1 patch

On Mon, Nov 09, 2020 at 10:53:47AM +0000, Colin Watson wrote:
> As of openssh 1:8.4p1-1, libssh's autopkgtests have started failing like
> this
> (https://ci.debian.net/data/autopkgtest/testing/amd64/libs/libssh/8034692/log.gz):

I think I see the problem.  From
https://www.openssh.com/txt/release-8.4:

 * ssh(1), ssh-agent(1): allow some additional control over the use of
   ssh-askpass via a new $SSH_ASKPASS_REQUIRE environment variable,
   including forcibly enabling and disabling its use. bz#69

The ssh client now defaults to assuming that it shouldn't use askpass if
DISPLAY is unset or empty.  However, you can force it in a
backward-compatible way.  Could you please apply this patch?

diff --git a/debian/tests/libssh-server b/debian/tests/libssh-server
index 9759383..940c230 100755
--- a/debian/tests/libssh-server
+++ b/debian/tests/libssh-server
@@ -35,7 +35,7 @@ echo "====== password authentication ======"
 # run server
 SERVER_PID=$($SSHD --user=joe --password=$(./mock-ssh-askpass) --port $PORT -v)
 
-OUT=$(DISPLAY= SSH_ASKPASS=`pwd`/mock-ssh-askpass setsid ssh -o 
UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p $PORT joe@localhost 
cat /etc/os-release)
+OUT=$(DISPLAY= SSH_ASKPASS=`pwd`/mock-ssh-askpass SSH_ASKPASS_REQUIRE=force 
setsid ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p $PORT 
joe@localhost cat /etc/os-release)
 
 waitpid $SERVER_PID
 check_out
@@ -62,7 +62,7 @@ if [ "$(getconf LONG_BIT)" = 32 ]; then
     EXTRA_OPTS="$EXTRA_OPTS -o KexAlgorithms=ecdh-sha2-nistp256"
 fi
 
-OUT=$(DISPLAY= SSH_ASKPASS=`pwd`/mock-ssh-askpass setsid ssh -o 
UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $EXTRA_OPTS -p $PORT 
joe@localhost cat /etc/os-release)
+OUT=$(DISPLAY= SSH_ASKPASS=`pwd`/mock-ssh-askpass SSH_ASKPASS_REQUIRE=force 
setsid ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no 
$EXTRA_OPTS -p $PORT joe@localhost cat /etc/os-release)
 
 waitpid $SERVER_PID
 check_out

Thanks,

-- 
Colin Watson (he/him)                              [[email protected]]

Reply via email to