summaryrefslogtreecommitdiffstats
path: root/scripts/oe-git-proxy
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2015-09-18 10:46:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 08:52:56 (GMT)
commitf32a6e1f597389fdbb382c139cad00568cd9afaa (patch)
tree6433422efceb0d215bad326a9da077824cb8c14e /scripts/oe-git-proxy
parent18309f08938cdbe4d1041488feee91507bcc50c1 (diff)
downloadpoky-f32a6e1f597389fdbb382c139cad00568cd9afaa.tar.gz
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. (From OE-Core rev: da9ddf48ed4a13cdc47649e22ab6ef7e36e01fdf) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-git-proxy')
-rwxr-xr-xscripts/oe-git-proxy7
1 files changed, 6 insertions, 1 deletions
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
120 PORT="" 120 PORT=""
121fi 121fi
122 122
123if [ "$PROTO" = "socks" ]; then 123if [ "$PROTO" = "socks" ] || [ "$PROTO" = "socks4a" ]; then
124 if [ -z "$PORT" ]; then 124 if [ -z "$PORT" ]; then
125 PORT="1080" 125 PORT="1080"
126 fi 126 fi
127 METHOD="SOCKS4A:$PROXY:$1:$2,socksport=$PORT" 127 METHOD="SOCKS4A:$PROXY:$1:$2,socksport=$PORT"
128elif [ "$PROTO" = "socks4" ]; then
129 if [ -z "$PORT" ]; then
130 PORT="1080"
131 fi
132 METHOD="SOCKS4:$PROXY:$1:$2,socksport=$PORT"
128else 133else
129 # Assume PROXY (http, https, etc) 134 # Assume PROXY (http, https, etc)
130 if [ -z "$PORT" ]; then 135 if [ -z "$PORT" ]; then