diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2015-09-18 12:46:06 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:52:56 +0100 |
| commit | f32a6e1f597389fdbb382c139cad00568cd9afaa (patch) | |
| tree | 6433422efceb0d215bad326a9da077824cb8c14e /scripts/oe-git-proxy | |
| parent | 18309f08938cdbe4d1041488feee91507bcc50c1 (diff) | |
| download | openembedded-core-contrib-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-x | scripts/oe-git-proxy | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy index b971c88ec5..d2e9f925b7 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 |