Package: x11-common Version: 1:7.7+18 Severity: minor Tags: patch Hi,
the times of ssh 1 are long gone. Squeeze doesn't have it any more. I don't have any older releases handy to check, but I think that it is reasonably safe for stretch to clean up 90x11-common_ssh-agent: --- 90x11-common_ssh-agent 2017-04-24 12:56:05.131727153 +0200 +++ 90x11-common_ssh-agent.cleaned 2017-04-24 13:31:40.781613715 +0200 @@ -7,13 +7,8 @@ SSHAGENTARGS= if has_option use-ssh-agent; then - if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \ - && [ -z "$SSH2_AUTH_SOCK" ]; then + if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ]; then STARTSSH=yes - if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then - # use ssh-agent2's ssh-agent1 compatibility mode - SSHAGENTARGS=-1 - fi fi fi or even: --- 90x11-common_ssh-agent 2017-04-24 12:56:05.131727153 +0200 +++ 90x11-common_ssh-agent.cleaned 2017-04-24 13:33:07.377853464 +0200 @@ -7,18 +7,9 @@ SSHAGENTARGS= if has_option use-ssh-agent; then - if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \ - && [ -z "$SSH2_AUTH_SOCK" ]; then - STARTSSH=yes - if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then - # use ssh-agent2's ssh-agent1 compatibility mode - SSHAGENTARGS=-1 - fi + if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ]; then + STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP" fi fi -if [ -n "$STARTSSH" ]; then - STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP" -fi - # vim:set ai et sts=2 sw=2 tw=80: resulting in a very easy # $Id: 90x11-common_ssh-agent 305 2005-07-03 18:51:43Z dnusinow $ # This file is sourced by Xsession(5), not executed. STARTSSH= SSHAGENT=/usr/bin/ssh-agent SSHAGENTARGS= if has_option use-ssh-agent; then if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ]; then STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP" fi fi # vim:set ai et sts=2 sw=2 tw=80: Greetings Marc