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

[mikeperry at torproject.org]

commit 38ab594fa6ba4a08f7e024b3537616356f616e8e
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Nov 10 10:27:17 2013 +0000

    Download m2crypto.
    
    gpg --output gpg/M2CRYPTO.gpg --export --export-options export-minimal 0x83FE26EC
---
 gitian/fetch-inputs.sh  |    7 ++++---
 gitian/gpg/M2CRYPTO.gpg |  Bin 0 -> 2441 bytes
 gitian/versions         |    4 ++++
 gitian/versions.alpha   |    4 ++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index f13d5f5..9aa1513 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -132,11 +132,11 @@ checkout_mingw() {
 #  fi
 #done
 
-for i in BINUTILS GCC PYTHON PYCRYPTO
+for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO
 do
   PACKAGE="${i}_PACKAGE"
   URL="${i}_URL"
-  if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" ]; then
+  if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" ]; then
     SUFFIX="asc"
   else
     SUFFIX="sig"
@@ -217,7 +217,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 ARGPARSE ZOPEINTERFACE TWISTED # OPENSSL
+for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO # OPENSSL
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
@@ -260,6 +260,7 @@ ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz
 ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz
 ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip
 ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2
+ln -sf "$M2CRYPTO_PACKAGE" m2crypto.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/gpg/M2CRYPTO.gpg b/gitian/gpg/M2CRYPTO.gpg
new file mode 100644
index 0000000..d6d889a
Binary files /dev/null and b/gitian/gpg/M2CRYPTO.gpg differ
diff --git a/gitian/versions b/gitian/versions
index 43dd9c0..b588f84 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -27,6 +27,7 @@ PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
 ZOPEINTERFACE_VER=4.0.5
 TWISTED_VER=13.1.0
+M2CRYPTO_VER=0.21.1
 
 ## File names for the source packages
 # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -42,6 +43,7 @@ PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
 TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2
+M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
 # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
@@ -54,6 +56,7 @@ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
 TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
+M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
 
 ## Non-git package URLs
 # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
@@ -68,3 +71,4 @@ ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE}
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE}
 TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PACKAGE}
 # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}
+M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 6e2e58b..bf13dfc 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -27,6 +27,7 @@ PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
 ZOPEINTERFACE_VER=4.0.5
 TWISTED_VER=13.1.0
+M2CRYPTO_VER=0.21.1
 
 ## File names for the source packages
 # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -42,6 +43,7 @@ PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
 TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2
+M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
 # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
@@ -54,6 +56,7 @@ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
 TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
+M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
 
 ## Non-git package URLs
 # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
@@ -68,3 +71,4 @@ ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE}
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE}
 TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PACKAGE}
 # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}
+M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE}