wok rev 20408

dropbear/sshx: localhost may be undef
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jul 31 10:05:34 2018 +0200 (2018-07-31)
parents 8c314507df00
children 2a483efbb28b
files dropbear/stuff/sshx tazpanel/receipt
line diff
     1.1 --- a/dropbear/stuff/sshx	Sat Jul 21 13:57:56 2018 +0200
     1.2 +++ b/dropbear/stuff/sshx	Tue Jul 31 10:05:34 2018 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  {
     1.5  	read host data
     1.6  	svr=${DISPLAY#*:}
     1.7 -	n=$((10+($RANDOM % 90))); dpy=localhost:$n
     1.8 +	n=$((10+($RANDOM % 90))); dpy=127.0.0.1:$n
     1.9  	scr=${DISPLAY/${DISPLAY%.*}/$dpy}
    1.10  	r="" ; p="22"; k=""
    1.11  	while true; do
    1.12 @@ -20,10 +20,10 @@
    1.13  		*)		break ;;
    1.14  		esac
    1.15  	done
    1.16 -	xhost +localhost > /dev/null 2>&1
    1.17 +	xhost +127.0.0.1 > /dev/null 2>&1
    1.18  	pxypass="${DBPROXY_PASSWORD:+export DROPBEAR_PASSWORD=$DBPROXY_PASSWORD; }"
    1.19 -	[ -n "$1" ] || set -- "${TERM:-xterm} -ls || ${TERM:-sakura} -l || xterm -ls"
    1.20 -	exec dbclient -f -R $((6000+$n)):localhost:$((6000+${svr%.*})) ${r/:/ -p } \
    1.21 +	[ -n "$1" ] || set -- "${TERMINAL:-sakura} -l || ${TERM:-xterm} -ls || xterm -ls"
    1.22 +	exec dbclient -f -R $((6000+$n)):127.0.0.1:$((6000+${svr%.*})) ${r/:/ -p } \
    1.23  	   ${DBPROXY:+-J "sh -c '${pxypass}dbclient ${k}-B ${a#*@}:$p ${DBPROXY/:/ -p }'"} \
    1.24  	   "xauth add $dpy $data; export DISPLAY=$scr; $@ ; xauth remove $dpy" \
    1.25  	   </dev/null >/dev/null
    1.26 @@ -53,8 +53,8 @@
    1.27  	pppsvr="$ppp $n ${3:-proxyarp} notty >/dev/null"
    1.28  	sshcmd="nc -ulp $5 -e $pppsvr"
    1.29  	udpcmd="nc -u $ipsvr $5"
    1.30 -	[ "$6" == "test" ] && sshcmd="nc -ulp $5 -e nc localhost 22" &&
    1.31 -	udpcmd="dbclient -y -J \"nc -u $ipsvr $5\" ${1%@*}@localhost $pppsvr"
    1.32 +	[ "$6" == "test" ] && sshcmd="nc -ulp $5 -e nc 127.0.0.1 22" &&
    1.33 +	udpcmd="dbclient -y -J \"nc -u $ipsvr $5\" ${1%@*}@127.0.0.1 $pppsvr"
    1.34  	[ -n "$5" ] && arg="noipdefault pty '$udpcmd'" && $ssh -f ${1/:/ -p } "$sshcmd"
    1.35  	eval $ppp $arg ipparam pppssh$$
    1.36  	[ "$4" ] && route del $extra
     2.1 --- a/tazpanel/receipt	Sat Jul 21 13:57:56 2018 +0200
     2.2 +++ b/tazpanel/receipt	Tue Jul 31 10:05:34 2018 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="tazpanel"
     2.7 -VERSION="622"
     2.8 +VERSION="625"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="SliTaz administration and configuration panel."
    2.11  MAINTAINER="pankso@slitaz.org"