[oe-commits] Peter Kjellerstedt : oe-git-proxy: Allow socks4 as protocol in $ALL_PROXY

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: da9ddf48ed4a13cdc47649e22ab6ef7e36e01fdf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=da9ddf48ed4a13cdc47649e22ab6ef7e36e01fdf

Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
Date:   Fri Sep 18 12:46:06 2015 +0200

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 at axis.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/oe-git-proxy | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy
index b971c88..d2e9f92 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