store 1.0.12 snapshot.

x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc

@@ -25,10 +25,10 @@ if [ "X$FULLNAME" = "XKarl J. Runge" ]; then
 	VNCVIEWER_POPUP_FIX=1
 	export VNCVIEWER_POPUP_FIX
 
-	if uname -smr | grep 'Linux 2\.4.*i686' > /dev/null; then
-		UNAME="Linux.i686.older"
-		export UNAME
-	fi
+	#if uname -smr | grep 'Linux 2\.4.*i686' > /dev/null; then
+	#	UNAME="Linux.i686.older"
+	#	export UNAME
+	#fi
 	PATH=`echo "$PATH" | sed -e 's,runge/bin/override,-------------,'`
 fi
 
@@ -108,8 +108,9 @@ if [ ! -d "$dir/$name" -a $nearby = 0 ]; then
 	fi
 	echo "Using externel \"vncviewer\" and \"stunnel\" found in PATH."
 else
+	STUNNEL=stunnel
 	STUNNEL_EXTRA_OPTS=${STUNNEL_EXTRA_OPTS:-"maxconn = 1"}
-	export STUNNEL_EXTRA_OPTS
+	export STUNNEL STUNNEL_EXTRA_OPTS
 	SSVNC_VIEWER_INTERNAL=1
 	export SSVNC_VIEWER_INTERNAL
 fi

x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd

@@ -169,14 +169,15 @@ if [ ! -d "$dir/$name" -a $nearby = 0 ]; then
 	echo "Using externel \"vncviewer\" and \"stunnel\" found in PATH."
 
 else
+	STUNNEL=stunnel
 	STUNNEL_EXTRA_OPTS=${STUNNEL_EXTRA_OPTS:-"maxconn = 1"}
-	export STUNNEL_EXTRA_OPTS
+	export STUNNEL STUNNEL_EXTRA_OPTS
 	SSVNC_VIEWER_INTERNAL=1
 	export SSVNC_VIEWER_INTERNAL
 fi
 
 if [ "X$DARWIN_COTVNC" = "X" -a "X$VNCVIEWERCMD" = "Xvncviewer" ]; then
-	hstr=`"$VNCVIEWERCMD" -h 2>&1 | head -5`
+	hstr=`$VNCVIEWERCMD -h 2>&1 | head -5`
 	if echo "$hstr" | grep '^TightVNC.*version 1\.[23]' > /dev/null; then
 		# we need to avoid raw encoding
 		use_ours=1
@@ -206,13 +207,13 @@ fi
 #
 if [ $use_ours = 1 ]; then
 	if [ "X$base" = "Xtightvncviewer" ]; then
-		"$VNCVIEWERCMD" -encodings 'copyrect tight zrle zlib hextile' "$@"
+		$VNCVIEWERCMD -encodings 'copyrect tight zrle zlib hextile' "$@"
 	else
 		ss_vncviewer "$@" -encodings 'copyrect tight zrle zlib hextile'
 	fi
 else
 	if [ "X$base" = "Xtightvncviewer" ]; then
-		"$VNCVIEWERCMD" "$@"
+		$VNCVIEWERCMD "$@"
 	else
 		ss_vncviewer "$@"
 	fi

x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer

@@ -38,6 +38,9 @@
 #         (the first CONNECT is done through host1:port1 to host2:port2
 #         and then a 2nd CONNECT to the destination VNC server.)
 #
+# -showcert  Only fetch the certificate using the 'openssl s_client'
+#            command (openssl(1) must in installed).
+#
 #    See http://www.karlrunge.com/x11vnc/#faq-ssl-ca for details on SSL
 #    certificates with VNC.
 #
@@ -133,13 +136,18 @@ if [ "X$SS_VNCVIEWER_SSH_CMD" != "X" ]; then
 	ssh_cmd="$SS_VNCVIEWER_SSH_CMD"
 fi
 ssh_args=""
+showcert=""
 
 if [ "X$1" = "X-viewerflavor" ]; then
 	if echo "$VNCVIEWERCMD" | grep -i chicken.of > /dev/null; then
 		echo "cotvnc"
 		exit 0
 	fi
-	str=`"$VNCVIEWERCMD" -h 2>&1 | head -5`
+	if echo "$VNCVIEWERCMD" | grep -i ultra > /dev/null; then
+		echo "ultravnc"
+		exit 0
+	fi
+	str=`$VNCVIEWERCMD -h 2>&1 | head -5`
 	if echo "$str" | grep -i 'TightVNC.viewer' > /dev/null; then
 		echo "tightvnc"
 	elif echo "$str" | grep -i 'RealVNC.Ltd' > /dev/null; then
@@ -173,6 +181,8 @@ do
                 ;;
 	"-alpha")	gotalpha=1
                 ;;
+	"-showcert")	showcert=1
+                ;;
 	"-grab")	VNCVIEWER_GRAB_SERVER=1; export VNCVIEWER_GRAB_SERVER
                 ;;
 	"-h"*)	help; exit 0
@@ -370,7 +380,7 @@ if [ "X$use_ssh" = "X1" ]; then
 		echo "Running viewer:"
 		echo "$VNCVIEWERCMD" "$@" localhost:$N
 		echo ""
-		"$VNCVIEWERCMD" "$@" localhost:$N
+		$VNCVIEWERCMD "$@" localhost:$N
 
 		exit $?
 	else
@@ -574,11 +584,39 @@ if [ "X$proxy" != "X" ]; then
 	ptmp="/tmp/ss_vncviewer${RANDOM}.$$.pl"
 	mytmp "$ptmp"
 	pcode "$ptmp"
-	connect="exec = $ptmp"
+	if [ "X$showcert" != "X1" -a "X$direct_connect" = "X" ]; then
+		if uname | grep Darwin >/dev/null; then
+			nd=`expr $use + 333`
+			SSVNC_LISTEN=$nd
+			export SSVNC_LISTEN
+			$ptmp 2>/dev/null &
+			sleep 3
+			host="localhost"
+			port="$nd"
+			connect="connect = localhost:$nd"
+		else
+			connect="exec = $ptmp"
+		fi
+	else
+		connect="exec = $ptmp"
+	fi
 else
 	connect="connect = $host:$port"
 fi
 
+if [ "X$showcert" = "X1" ]; then
+	if [ "X$proxy" != "X" ]; then
+		SSVNC_LISTEN=$use
+		export SSVNC_LISTEN
+		$ptmp 2>/dev/null &
+		sleep 3
+		host="localhost"
+		port="$use"
+	fi
+	openssl s_client -connect $host:$port 2>&1 < /dev/null
+	exit $?
+fi
+
 if [ "X$direct_connect" != "X" ]; then
 	echo ""
 	echo "Running viewer for direct connection:"
@@ -605,7 +643,7 @@ if [ "X$direct_connect" != "X" ]; then
 	fi
 	echo "$VNCVIEWERCMD" "$@" $host:$disp
 	echo ""
-	"$VNCVIEWERCMD" "$@" $host:$disp
+	$VNCVIEWERCMD "$@" $host:$disp
 	exit $?
 fi
 
@@ -653,7 +691,7 @@ echo ""
 echo "Running viewer:"
 echo "$VNCVIEWERCMD" "$@" localhost:$N
 echo ""
-"$VNCVIEWERCMD" "$@" localhost:$N
+$VNCVIEWERCMD "$@" localhost:$N
 
 kill $pid
 sleep 1

x11vnc/misc/enhanced_tightvnc_viewer/build.unix

@@ -166,6 +166,10 @@ do
 	if [ ! -f "$patch" ]; then
 		continue
 	fi
+	if [ "X$PATCH_FAIL" != "X" ]; then
+		failed=1	
+		break
+	fi
 	echo PATCHING WITH: "$patch" 
 	ls -l "$patch"
 	sleep 1
@@ -254,6 +258,10 @@ do
 	if [ ! -f "$patch" ]; then
 		continue
 	fi
+	if [ "X$PATCH_FAIL" != "X" ]; then
+		failed=1	
+		break
+	fi
 	echo PATCHING WITH: "$patch" 
 	ls -l "$patch"
 	sleep 1

x11vnc/misc/enhanced_tightvnc_viewer/src/patches/_bundle

 #!/bin/sh
 
 rm -rf ./src/tmp/* || exit 1
-vers=1.0.11
+vers=1.0.12
 
 cd .. || exit 1