# HG changeset patch # User Pascal Bellard # Date 1533024334 -7200 # Node ID e1965f977a7fcf4287f20d7f2fad95fe11b852f7 # Parent 8c314507df00be2c248206f31e16fcc28c767b9d dropbear/sshx: localhost may be undef diff -r 8c314507df00 -r e1965f977a7f dropbear/stuff/sshx --- a/dropbear/stuff/sshx Sat Jul 21 13:57:56 2018 +0200 +++ b/dropbear/stuff/sshx Tue Jul 31 10:05:34 2018 +0200 @@ -4,7 +4,7 @@ { read host data svr=${DISPLAY#*:} - n=$((10+($RANDOM % 90))); dpy=localhost:$n + n=$((10+($RANDOM % 90))); dpy=127.0.0.1:$n scr=${DISPLAY/${DISPLAY%.*}/$dpy} r="" ; p="22"; k="" while true; do @@ -20,10 +20,10 @@ *) break ;; esac done - xhost +localhost > /dev/null 2>&1 + xhost +127.0.0.1 > /dev/null 2>&1 pxypass="${DBPROXY_PASSWORD:+export DROPBEAR_PASSWORD=$DBPROXY_PASSWORD; }" - [ -n "$1" ] || set -- "${TERM:-xterm} -ls || ${TERM:-sakura} -l || xterm -ls" - exec dbclient -f -R $((6000+$n)):localhost:$((6000+${svr%.*})) ${r/:/ -p } \ + [ -n "$1" ] || set -- "${TERMINAL:-sakura} -l || ${TERM:-xterm} -ls || xterm -ls" + exec dbclient -f -R $((6000+$n)):127.0.0.1:$((6000+${svr%.*})) ${r/:/ -p } \ ${DBPROXY:+-J "sh -c '${pxypass}dbclient ${k}-B ${a#*@}:$p ${DBPROXY/:/ -p }'"} \ "xauth add $dpy $data; export DISPLAY=$scr; $@ ; xauth remove $dpy" \ /dev/null @@ -53,8 +53,8 @@ pppsvr="$ppp $n ${3:-proxyarp} notty >/dev/null" sshcmd="nc -ulp $5 -e $pppsvr" udpcmd="nc -u $ipsvr $5" - [ "$6" == "test" ] && sshcmd="nc -ulp $5 -e nc localhost 22" && - udpcmd="dbclient -y -J \"nc -u $ipsvr $5\" ${1%@*}@localhost $pppsvr" + [ "$6" == "test" ] && sshcmd="nc -ulp $5 -e nc 127.0.0.1 22" && + udpcmd="dbclient -y -J \"nc -u $ipsvr $5\" ${1%@*}@127.0.0.1 $pppsvr" [ -n "$5" ] && arg="noipdefault pty '$udpcmd'" && $ssh -f ${1/:/ -p } "$sshcmd" eval $ppp $arg ipparam pppssh$$ [ "$4" ] && route del $extra diff -r 8c314507df00 -r e1965f977a7f tazpanel/receipt --- a/tazpanel/receipt Sat Jul 21 13:57:56 2018 +0200 +++ b/tazpanel/receipt Tue Jul 31 10:05:34 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="tazpanel" -VERSION="622" +VERSION="625" CATEGORY="system-tools" SHORT_DESC="SliTaz administration and configuration panel." MAINTAINER="pankso@slitaz.org"