[tor-browser-bundle/master] Bug 11478: Add missing PyYAML. - tor-commits

14 Apr 2014

commit c088c17ba7ba93f3fcbcfc75e0c081aed2d98976
Author: Georg Koppen gk@torproject.org
Date:   Mon Apr 14 15:08:31 2014 +0000
Bug 11478: Add missing PyYAML.
Enhanced asn's patch to fix broken obfsproxy > 0.2.4.
---
 gitian/descriptors/linux/gitian-pluggable-transports.yml   |    8 ++++++++
 gitian/descriptors/mac/gitian-pluggable-transports.yml     |    8 ++++++++
 gitian/descriptors/windows/gitian-pluggable-transports.yml |    7 +++++++
 gitian/fetch-inputs.sh                                     |   11 ++++++++++-
 gitian/versions                                            |    4 ++++
 gitian/versions.alpha                                      |    4 ++++
 gitian/versions.beta                                       |    4 ++++
 gitian/versions.nightly                                    |    4 ++++
 8 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index fbea855..4423b50 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -30,6 +30,7 @@ files:
 - "gmp.tar.bz2"
 - "pycrypto.tar.gz"
 - "argparse.tar.gz"
+- "pyyaml.tar.gz"
 - "zope.interface.zip"
 - "twisted.tar.bz2"
 - "m2crypto.tar.gz"
@@ -91,6 +92,13 @@ script: |
   cp -a build/zope $PTDIR/
   cd ..
   #
+  tar xzf pyyaml.tar.gz
+  cd PyYAML-*
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  $PYTHON setup.py build --build-lib build
+  cp -a build/yaml $PTDIR/
+  cd ..
+  #
   tar xjf twisted.tar.bz2
   cd Twisted-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index f6c2e61..f98a20a 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -30,6 +30,7 @@ files:
 - "gmp.tar.bz2"
 - "pycrypto.tar.gz"
 - "argparse.tar.gz"
+- "pyyaml.tar.gz"
 - "zope.interface.zip"
 - "twisted.tar.bz2"
 - "m2crypto.tar.gz"
@@ -103,6 +104,13 @@ script: |
   cp -a build/argparse.py $PTDIR/
   cd ..
   #
+  tar xzf pyyaml.tar.gz
+  cd PyYAML-*
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  $PYTHON setup.py build --build-lib build
+  cp -a build/yaml $PTDIR/
+  cd ..
+  #
   unzip zope.interface.zip
   cd zope.interface-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index d2a3005..3624d04 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -32,6 +32,7 @@ files:
 - "setuptools.tar.gz"
 - "pycrypto.tar.gz"
 - "argparse.tar.gz"
+- "pyyaml.tar.gz"
 - "zope.interface.zip"
 - "twisted.tar.bz2"
 - "m2crypto.tar.gz"
@@ -163,6 +164,12 @@ script: |
   LD_PRELOAD= $INSTPYTHON setup.py install
   cd ..
   #
+  tar xzf pyyaml.tar.gz
+  cd PyYAML-*
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  LD_PRELOAD= $INSTPYTHON setup.py install
+  cd ..
+  #
   unzip zope.interface.zip
   cd zope.interface-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 0bc217e..e80713b 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -5,6 +5,7 @@
MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/
 MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/
+MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/
 set -e
 set -u
 umask 0022
@@ -167,6 +168,13 @@ do
   get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}"
 done
+for i in PYYAML
+do
+  PACKAGE="${i}_PACKAGE"
+  URL="${MIRROR_URL_ASN}${!PACKAGE}"
+  get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}"
+done
+
 for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS
 do
   URL="${i}_URL"
@@ -217,7 +225,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 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP
+for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
@@ -260,6 +268,7 @@ ln -sf "$PYTHON_PACKAGE" python.tar.bz2
 ln -sf "$PYTHON_MSI_PACKAGE" python.msi
 ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz
 ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz
+ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz
 ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip
 ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2
 ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz
diff --git a/gitian/versions b/gitian/versions
index 673cf32..d381fed 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -30,6 +30,7 @@ GCC_VER=4.6.3
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
+PYYAML_VER=3.11
 ZOPEINTERFACE_VER=4.0.5
 TWISTED_VER=13.1.0
 M2CRYPTO_VER=0.21.1
@@ -51,6 +52,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
+PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
 TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2
 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz
@@ -68,6 +70,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8
 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
 TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
@@ -87,6 +90,7 @@ PYTHON_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D
 PYTHON_MSI_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7D
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/$%7BPYCRYPTO_PACKAGE%7D
 ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D
+PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/$%7BPYYAML_PACKAGE%7D
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/$%7BZOPEINTERFACE_P...
 TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/$%7BTWISTED_PACKAGE%7D
 # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index f53fbd8..59edba7 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -31,6 +31,7 @@ GCC_VER=4.6.3
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
+PYYAML_VER=3.11
 ZOPEINTERFACE_VER=4.0.5
 TWISTED_VER=13.1.0
 M2CRYPTO_VER=0.21.1
@@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
+PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
 TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2
 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz
@@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8
 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
 TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
@@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D
 PYTHON_MSI_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7D
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/$%7BPYCRYPTO_PACKAGE%7D
 ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D
+PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/$%7BPYYAML_PACKAGE%7D
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/$%7BZOPEINTERFACE_P...
 TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/$%7BTWISTED_PACKAGE%7D
 # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}
diff --git a/gitian/versions.beta b/gitian/versions.beta
index adb9818..9b3f80d 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -31,6 +31,7 @@ GCC_VER=4.6.3
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
+PYYAML_VER=3.11
 ZOPEINTERFACE_VER=4.0.5
 TWISTED_VER=13.1.0
 M2CRYPTO_VER=0.21.1
@@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
+PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
 TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2
 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz
@@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8
 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
 TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
@@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D
 PYTHON_MSI_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7D
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/$%7BPYCRYPTO_PACKAGE%7D
 ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D
+PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/$%7BPYYAML_PACKAGE%7D
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/$%7BZOPEINTERFACE_P...
 TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/$%7BTWISTED_PACKAGE%7D
 # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 911898d..c54df5a 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -31,6 +31,7 @@ GCC_VER=4.6.3
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
+PYYAML_VER=3.11
 ZOPEINTERFACE_VER=4.0.5
 TWISTED_VER=13.1.0
 M2CRYPTO_VER=0.21.1
@@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
+PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
 TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2
 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz
@@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8
 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
 TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
@@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D
 PYTHON_MSI_URL=http://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7D
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/$%7BPYCRYPTO_PACKAGE%7D
 ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D
+PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/$%7BPYYAML_PACKAGE%7D
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/$%7BZOPEINTERFACE_P...
 TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/$%7BTWISTED_PACKAGE%7D
 # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}

    