[tor-commits] [oonib/master] Download some with curl some with wget

art at torproject.org art at torproject.org
Mon May 9 17:57:03 UTC 2016


commit 6f1eb71d1ffb1652fb86da256fbe0897973c228f
Author: Arturo Filastò <arturo at filasto.net>
Date:   Wed Apr 27 19:17:38 2016 +0200

    Download some with curl some with wget
    
    For some reason curl on mlab is failing to do a SSL handshake to
    dist.torproject.org, while wget works.
    
    Since we validate the package with gpg anyways it's not a security
    issue.
---
 scripts/build_tor2web_tor.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/build_tor2web_tor.sh b/scripts/build_tor2web_tor.sh
index 85397b6..080a878 100755
--- a/scripts/build_tor2web_tor.sh
+++ b/scripts/build_tor2web_tor.sh
@@ -10,15 +10,17 @@ ZLIB_SHA256=36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d
 SCRIPT_ROOT=`pwd`
 
 # Package URLS
-URLS="\
-https://dist.torproject.org/tor-$TOR_VERSION.tar.gz
-https://dist.torproject.org/tor-$TOR_VERSION.tar.gz.asc
+CURL_URLS="\
 http://zlib.net/zlib-$ZLIB_VERSION.tar.gz
 https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz.asc
 https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
 https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.tar.gz.asc
 https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.tar.gz"
 
+WGET_URLS="\
+https://dist.torproject.org/tor-$TOR_VERSION.tar.gz
+https://dist.torproject.org/tor-$TOR_VERSION.tar.gz.asc"
+
 if [ `command -v shasum` ]; then
   SHA256SUM='shasum -a 256'
 fi
@@ -54,10 +56,15 @@ if [ $? -ne 0 ]; then
   if [ $? -ne 0 ]; then exit ;fi
 fi
 
-for URL in $URLS; do
+for URL in $WGET_URLS; do
   wget $URL
 done
 
+for URL in $CURL_URLS; do
+  curl -LO $URL
+done
+
+
 BUILD=$SCRIPT_ROOT/build
 if [ ! -e $BUILD ]; then
   mkdir -p $BUILD



More information about the tor-commits mailing list