From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Fri, 18 Sep 2015 10:46:06 +0000 (+0200)
Subject: oe-git-proxy: Allow socks4 as protocol in $ALL_PROXY
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~28885
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da9ddf48ed4a13cdc47649e22ab6ef7e36e01fdf;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

oe-git-proxy: Allow socks4 as protocol in $ALL_PROXY

The current default is to use SOCKS4a when socks is specified as
protocol in $ALL_PROXY. However, not all socks servers support
SOCKS4a. By allowing socks4 as an additional protocol, this script
will happily work with SOCKS4 only servers.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy
index b971c88ec51..d2e9f925b79 100755
--- a/scripts/oe-git-proxy
+++ b/scripts/oe-git-proxy
@@ -120,11 +120,16 @@ if [ "$PORT" = "$ALL_PROXY" ]; then
 	PORT=""
 fi
 
-if [ "$PROTO" = "socks" ]; then
+if [ "$PROTO" = "socks" ] || [ "$PROTO" = "socks4a" ]; then
 	if [ -z "$PORT" ]; then
 		PORT="1080"
 	fi
 	METHOD="SOCKS4A:$PROXY:$1:$2,socksport=$PORT"
+elif [ "$PROTO" = "socks4" ]; then
+	if [ -z "$PORT" ]; then
+		PORT="1080"
+	fi
+	METHOD="SOCKS4:$PROXY:$1:$2,socksport=$PORT"
 else
 	# Assume PROXY (http, https, etc)
 	if [ -z "$PORT" ]; then