Subversion Repositories ssvnc

Compare Revisions

Ignore whitespace Rev 14 → Rev 13

/ssvnc/trunk/debian/changelog
1,10 → 1,3
ssvnc (1.0.25-1) unstable; urgency=low
 
* New upstream release.
* confusing_-h.dpatch and bashisms.dpatch: adjusted.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 06 Feb 2010 20:45:04 +0100
 
ssvnc (1.0.24-1) unstable; urgency=low
 
* New upstream release.
/ssvnc/trunk/debian/patches/bashisms.dpatch
7,18 → 7,18
 
@DPATCH@
diff -urNad trunk~/scripts/ssvnc trunk/scripts/ssvnc
--- trunk~/scripts/ssvnc 2010-02-01 00:19:05.000000000 +0100
+++ trunk/scripts/ssvnc 2010-02-01 00:19:06.000000000 +0100
@@ -169,7 +169,7 @@
--- trunk~/scripts/ssvnc 2009-10-25 15:15:48.000000000 +0100
+++ trunk/scripts/ssvnc 2009-10-31 17:08:05.000000000 +0100
@@ -124,7 +124,7 @@
WISH=wish
for try in wish8.4 wish wish8.3 wish8.5 wish8.6
do
- if type $try > /dev/null 2>&1; then
+ if which $try > /dev/null 2>&1; then
- if type $try > /dev/null; then
+ if which $try > /dev/null; then
WISH=$try
break
fi
@@ -230,13 +230,13 @@
@@ -185,13 +185,13 @@
PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin
quit=0
35,9 → 35,9
else
echo "stunnel not found in PATH."
diff -urNad trunk~/scripts/ssvnc_cmd trunk/scripts/ssvnc_cmd
--- trunk~/scripts/ssvnc_cmd 2009-11-26 21:02:11.000000000 +0100
+++ trunk/scripts/ssvnc_cmd 2010-02-01 00:19:06.000000000 +0100
@@ -184,13 +184,13 @@
--- trunk~/scripts/ssvnc_cmd 2009-10-25 15:15:42.000000000 +0100
+++ trunk/scripts/ssvnc_cmd 2009-10-31 17:08:05.000000000 +0100
@@ -181,13 +181,13 @@
PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin
quit=0
53,7 → 53,7
:
else
echo "stunnel not found in PATH."
@@ -266,7 +266,7 @@
@@ -254,7 +254,7 @@
if echo "$VNCVIEWERCMD" | grep '\.turbovnc' > /dev/null; then
:
else
63,9 → 63,9
fi
fi
diff -urNad trunk~/scripts/util/ss_vncviewer trunk/scripts/util/ss_vncviewer
--- trunk~/scripts/util/ss_vncviewer 2009-11-18 05:34:33.000000000 +0100
+++ trunk/scripts/util/ss_vncviewer 2010-02-01 00:19:06.000000000 +0100
@@ -135,7 +135,7 @@
--- trunk~/scripts/util/ss_vncviewer 2009-10-28 15:21:49.000000000 +0100
+++ trunk/scripts/util/ss_vncviewer 2009-10-31 17:22:43.000000000 +0100
@@ -119,7 +119,7 @@
if echo "$VNCVIEWERCMD" | grep '\.turbovnc' > /dev/null; then
:
else
74,7 → 74,7
VNCVIEWERCMD="$VNCVIEWERCMD.turbovnc"
fi
fi
@@ -162,7 +162,7 @@
@@ -146,7 +146,7 @@
check_stunnel=1
if [ "X$SSVNC_BASEDIRNAME" != "X" ]; then
if [ -x "$SSVNC_BASEDIRNAME/stunnel" ]; then
83,7 → 83,7
if [ $? = 0 ]; then
# found ours
STUNNEL=stunnel
@@ -171,7 +171,7 @@
@@ -155,7 +155,7 @@
fi
fi
if [ "X$check_stunnel" = "X1" ]; then
92,7 → 92,7
if [ $? = 0 ]; then
STUNNEL=stunnel4
else
@@ -411,7 +411,7 @@
@@ -395,7 +395,7 @@
# a portable, but not absolutely safe, tmp file creator
mytmp() {
tf=$1
101,7 → 101,7
# if we have mktemp(1), use it:
tf2="$tf.XXXXXX"
tf2=`mktemp "$tf2"`
@@ -656,33 +656,33 @@
@@ -640,33 +640,33 @@
fi
if [ "X$pssh" != "X" ]; then
echo "Terminating background ssh process"
146,7 → 146,7
fi
}
@@ -737,7 +737,7 @@
@@ -721,7 +721,7 @@
# trick for the undocumented rsh://host:port method.
rsh_viewer() {
155,7 → 155,7
if [ "X$PORT" = "X" ]; then
exit 1
elif [ $PORT -ge 5900 ]; then
@@ -756,7 +756,7 @@
@@ -740,7 +740,7 @@
}
check_perl() {
164,7 → 164,7
:
elif [ ! -x "$1" ]; then
echo ""
@@ -2083,7 +2083,7 @@
@@ -2036,7 +2036,7 @@
if [ "X$sshword" != "X" ]; then
if [ -x "$sshword" ]; then
:
173,7 → 173,7
:
else
echo ""
@@ -2421,7 +2421,7 @@
@@ -2343,7 +2343,7 @@
stty sane
i=0
182,7 → 182,7
imax=50
sleepit="perl -e 'select(undef, undef, undef, 0.20)'"
else
@@ -2536,7 +2536,7 @@
@@ -2458,7 +2458,7 @@
if [ "X$use_sshssl" = "X" -a "X$getport" = "X" ]; then
echo "Running viewer:"
191,7 → 191,7
if [ "X$reverse" = "X" ]; then
echo "$VNCVIEWERCMD" "$@" $localhost:$N
echo ""
@@ -2593,7 +2593,7 @@
@@ -2515,7 +2515,7 @@
fi
if [ "X$stunnel_set_here" = "X1" -a "X$showcert" = "X" ]; then
200,7 → 200,7
:
else
echo ""
@@ -2705,7 +2705,7 @@
@@ -2624,7 +2624,7 @@
if [ "X$ciphers" != "X" ]; then
cipher_args=`echo "$ciphers" | sed -e 's/ciphers=/-cipher /'`
fi
209,7 → 209,7
:
else
echo ""
@@ -2825,7 +2825,7 @@
@@ -2735,7 +2735,7 @@
if [ "X$getport" = "X" ]; then
sleep 1
fi
218,7 → 218,7
printf "Are you sure you want to continue? [y]/n "
read x
else
@@ -2888,7 +2888,7 @@
@@ -2798,7 +2798,7 @@
fi
hostdisp2=`echo "$hostdisp" | sed -e 's/pw=[^ ]*/pw=******/g'`
echo "$VNCVIEWERCMD" "$@" "$hostdisp2"
227,7 → 227,7
echo ""
$VNCVIEWERCMD "$@" "$hostdisp"
if [ $? != 0 ]; then
@@ -2902,7 +2902,7 @@
@@ -2812,7 +2812,7 @@
echo ""
echo "NOTE: Press Ctrl-C to terminate viewer LISTEN mode."
echo ""
236,7 → 236,7
if [ "X$SSVNC_ULTRA_DSM" != "X" ]; then
echo "NOTE: The ultravnc_dsm_helper only runs once. So after the first LISTEN"
echo " ends, you may have to Press Ctrl-C and restart for another connection."
@@ -3102,7 +3102,7 @@
@@ -3004,7 +3004,7 @@
vnc_hp="exec=$STUNNEL $tmp_cfg"
fi
echo "$VNCVIEWERCMD" "$@" "$vnc_hp"
245,7 → 245,7
echo ""
$VNCVIEWERCMD "$@" "$vnc_hp"
if [ $? != 0 ]; then
@@ -3117,7 +3117,7 @@
@@ -3019,7 +3019,7 @@
echo ""
echo "NOTE: Press Ctrl-C to terminate viewer LISTEN mode."
echo ""
/ssvnc/trunk/debian/patches/confusing_-h.dpatch
4,9 → 4,18
## DP: Improve handling of -h[e[l[p]]]
 
@DPATCH@
diff -urNad trunk~/scripts/sshvnc trunk/scripts/sshvnc
--- trunk~/scripts/sshvnc 2007-08-24 03:24:14.000000000 +0200
+++ trunk/scripts/sshvnc 2009-10-31 16:14:11.000000000 +0100
@@ -4,4 +4,4 @@
#
PATH=`dirname "$0"`:$PATH; export PATH
SSVNC_SSH_ONLY=1; export SSVNC_SSH_ONLY
-exec ssvnc -ssh "$@"
+exec ssvnc "$@"
diff -urNad trunk~/scripts/ssvnc trunk/scripts/ssvnc
--- trunk~/scripts/ssvnc 2009-12-27 21:38:58.000000000 +0100
+++ trunk/scripts/ssvnc 2010-02-06 20:38:41.000000000 +0100
--- trunk~/scripts/ssvnc 2009-10-25 15:15:48.000000000 +0100
+++ trunk/scripts/ssvnc 2009-10-31 16:04:48.000000000 +0100
@@ -8,7 +8,8 @@
#
# See ssvnc_cmd for details.
17,21 → 26,12
cat << END
ssvnc - a GUI wrapper for SSL and SSH VNC connections.
@@ -106,7 +107,7 @@
exit 0
fi
if [ "X$1" = "X-ssh" ]; then
- if [ "X$2" = "X-help" -o "X$2" = "X-h" ]; then
+ if [ ${#2} -gt 1 -a "$2${helpflag##$2}" = $helpflag ]; then
cat << END
sshvnc - a GUI wrapper for SSH VNC connections.
@@ -124,7 +125,7 @@
fi
if [ "X$1" = "X-ts" -o "X$1" = "X-tso" ]; then
- if [ "X$2" = "X-help" -o "X$2" = "X-h" ]; then
+ if [ ${#2} -gt 1 -a "$2${helpflag##$2}" = $helpflag ]; then
cat << END
tsvnc - a GUI wrapper for SSH VNC connections using x11vnc Terminal Services.
diff -urNad trunk~/scripts/tsvnc trunk/scripts/tsvnc
--- trunk~/scripts/tsvnc 2007-08-24 18:18:12.000000000 +0200
+++ trunk/scripts/tsvnc 2009-10-31 16:13:45.000000000 +0100
@@ -4,4 +4,4 @@
#
PATH=`dirname "$0"`:$PATH; export PATH
SSVNC_TS_ONLY=1; export SSVNC_TS_ONLY
-exec ssvnc -ts "$@"
+exec ssvnc "$@"