[tor-commits] [tor-browser-bundle/master] Download argparse.

Tue Jan 21 04:47:02 UTC 2014

commit ed35aa668c0b87348516bb3e208e57505b783719
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Nov 7 04:29:48 2013 +0000

    Download argparse.
    
    It's on a mirror because it 404s half the time. Restarting the download
    right away always works. But it often fails the first time you run
    fetch-inputs.sh after a while. The googlecode download also has the
    property that you have to download the entire file even if your local
    copy is newer (that's why the TOOLCHAIN4 download from googlecode is
    also disabled), but that's not as big a problem as the failed downloads
    because the argparse package is small.
---
 gitian/fetch-inputs.sh |   13 ++++++++++++-
 gitian/versions        |    4 ++++
 gitian/versions.alpha  |    4 ++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 1fdaa66..dc6332b 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -4,6 +4,7 @@
 #
 
 MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/
+MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/
 set -e
 set -u
 umask 0022
@@ -158,6 +159,15 @@ do
   get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}"
 done
 
+# XXX: Omit ARGPARSE because Google won't allow wget -N and because the
+# download seems to 404 about 50% of the time.
+for i in ARGPARSE
+do
+  PACKAGE="${i}_PACKAGE"
+  URL="${MIRROR_URL_DCF}${!PACKAGE}"
+  get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}"
+done
+
 # Verify packages with weak or no signatures via multipath downloads
 # (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
 # XXX: Google won't allow wget -N.. We need to re-download the whole
@@ -200,7 +210,7 @@ fi
 
 # Verify packages with weak or no signatures via direct sha256 check
 # (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
-for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO # OPENSSL
+for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE # OPENSSL
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
@@ -240,6 +250,7 @@ ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2
 ln -sf "$GCC_PACKAGE" gcc.tar.bz2
 ln -sf "$PYTHON_PACKAGE" python.tar.bz2
 ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz
+ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz
 
 # Fetch latest gitian-builder itself
 # XXX - this is broken if a non-standard inputs dir is selected using the command line flag.
diff --git a/gitian/versions b/gitian/versions
index d62333f..fe0b1e0 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -23,6 +23,7 @@ BINUTILS_VER=2.22
 GCC_VER=4.6.3
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
+ARGPARSE_VER=1.2.1
 
 ## File names for the source packages
 # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -35,6 +36,7 @@ BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
+ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
 # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
@@ -44,6 +46,7 @@ NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e
 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
+ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
 
 ## Non-git package URLs
 # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
@@ -54,3 +57,4 @@ GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}
 PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE}
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE}
+ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 042049d..8c8d58d 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -23,6 +23,7 @@ BINUTILS_VER=2.22
 GCC_VER=4.6.3
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
+ARGPARSE_VER=1.2.1
 
 ## File names for the source packages
 # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -35,6 +36,7 @@ BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
+ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
 # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
@@ -44,6 +46,7 @@ NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e
 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
+ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
 
 ## Non-git package URLs
 # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
@@ -54,3 +57,4 @@ GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}
 PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE}
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE}
+ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE}



