commit ac9da1d5965169f91973d57737fcd20e06351b08 Author: Nicolas Vigier boklm@torproject.org Date: Sun Jan 10 17:09:43 2016 +0100
Bug 15578: drop our Python build
After switching to Debian Wheezy, we don't need to build Python since the version provided by the distribution is recent enough. --- gitian/descriptors/linux/gitian-bundle.yml | 9 +-------- gitian/descriptors/linux/gitian-firefox.yml | 8 +------- gitian/descriptors/linux/gitian-utils.yml | 25 ------------------------- gitian/fetch-inputs.sh | 7 ++----- gitian/mkbundle-linux.sh | 12 ------------ gitian/verify-tags.sh | 5 ++--- gitian/versions | 5 ----- gitian/versions.alpha | 5 ----- gitian/versions.beta | 5 ----- gitian/versions.nightly | 5 ----- 10 files changed, 6 insertions(+), 80 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index bfecb0f..e44635e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -14,6 +14,7 @@ packages: - "libxslt1.1" - "libxml2-utils" - "sqlite3" +- "python-lxml" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -35,10 +36,6 @@ files: - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" -- "python-linux32-utils.zip" -- "python-linux64-utils.zip" -- "lxml-linux32-utils.zip" -- "lxml-linux64-utils.zip" - "torrc-defaults-appendix-linux" - "bridge_prefs.js" - "meek-http-helper-user.js" @@ -83,10 +80,6 @@ script: | mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ - # Preparing Python for HTTPS-Everywhere. - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - export PATH=$INSTDIR/python/bin:$PATH - unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-linux${GBUILD_BITS}.zip diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 468d6e5..f7ea1c6 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -17,6 +17,7 @@ packages: - "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" +- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. @@ -32,8 +33,6 @@ files: - "binutils-linux64-utils.zip" - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" -- "python-linux32-utils.zip" -- "python-linux64-utils.zip" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -53,11 +52,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - # Preparing Python for Tor Browser - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - # TODO: We might want to have a smarter solution than hard-coding the version. - ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python - export PATH=$INSTDIR/python/bin:$PATH # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 34e93dc..e8801cc 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -33,8 +33,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "python.tar.bz2" -- "lxml.tar.gz" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -117,29 +115,7 @@ script: | make install cd ..
- # Building Python - # Fx 24 ESR and HTTPS Everywhere >= 3.5 do not work with Python < 2.7 anymore. - # But 10.04 does only ship with Python 2.6. Thus, we compile 2.7 ourselves... - tar xjf python.tar.bz2 - cd Python-* - ./configure - make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python - cd .. - - # Building lxml - export LD_PRELOAD="" - tar xzf lxml.tar.gz - cd lxml-* - # Make sure we use our freshly built python binary here. Otherwise bad things - # may happen when we do so in the bundle step assembling the HTTPS-Everywhere - # rules. - $INSTDIR/python/bin/python2.7 setup.py build - cd build/lib* - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml export LD_PRELOAD="" - cp *utils.zip $OUTDIR - cd ../../../
# Building GMP tar xjf gmp.tar.bz2 @@ -161,6 +137,5 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent - ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 206023b..9d6f2f3 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,11 @@ update_git() {
############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -226,7 +225,6 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript@noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 -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 @@ -236,7 +234,6 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 -ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 0c70732..f8aaec1 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -108,10 +108,6 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ - ! -f inputs/python-$PYTHON_VER-linux32-utils.zip -o \ - ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ - ! -f inputs/lxml-$LXML_VER-linux32-utils.zip -o \ - ! -f inputs/lxml-$LXML_VER-linux64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then @@ -136,10 +132,6 @@ then ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. @@ -159,10 +151,6 @@ else ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 82a810a..fc62344 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -121,12 +121,11 @@ noto-fonts $NOTOFONTS_TAG EOF
# Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" diff --git a/gitian/versions b/gitian/versions index 7ff094e..bd484bb 100755 --- a/gitian/versions +++ b/gitian/versions @@ -52,7 +52,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -68,7 +67,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -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 @@ -77,7 +75,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -114,7 +111,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/$%7BOSXSDK_P BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$%7BBINUTILS_PACKAGE%7D GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$%7BGCC_VER%7D/$%7BGCC_PACKAGE%7D NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/$%7BNOSCRIPT_PACKAGE%7D -PYTHON_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D PYTHON_MSI_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7... PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/$%7BPYCRYPTO_PACKAGE%7D ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D @@ -124,7 +120,6 @@ 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} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/$%7BPY2EXE_VER... SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS_PACKAGE%... -LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020... diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 95ca078..5b7ef02 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -52,7 +52,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -68,7 +67,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -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 @@ -77,7 +75,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -114,7 +111,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/$%7BOSXSDK_P BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$%7BBINUTILS_PACKAGE%7D GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$%7BGCC_VER%7D/$%7BGCC_PACKAGE%7D NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/$%7BNOSCRIPT_PACKAGE%7D -PYTHON_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D PYTHON_MSI_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7... PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/$%7BPYCRYPTO_PACKAGE%7D ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D @@ -124,7 +120,6 @@ 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} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/$%7BPY2EXE_VER... SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS_PACKAGE%... -LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020... diff --git a/gitian/versions.beta b/gitian/versions.beta index 43c5fde..1bde7e5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -48,7 +48,6 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -64,7 +63,6 @@ MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -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 @@ -74,7 +72,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -111,7 +108,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/$%7BOSXSDK_P BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$%7BBINUTILS_PACKAGE%7D GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$%7BGCC_VER%7D/$%7BGCC_PACKAGE%7D NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/$%7BNOSCRIPT_PACKA... -PYTHON_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D PYTHON_MSI_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7... PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/$%7BPYCRYPTO_PACKAGE%7D ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D @@ -122,7 +118,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/$%7BTWISTED_PACKAGE%7D M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/$%7BM2CRYPTO_PACKAGE%7D PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/$%7BPY2EXE_VER... SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS_PACKAGE%... -LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020... diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b1c7387..c64d4bb 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -75,7 +74,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -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 @@ -84,7 +82,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -121,7 +118,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/$%7BOSXSDK_P BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$%7BBINUTILS_PACKAGE%7D GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$%7BGCC_VER%7D/$%7BGCC_PACKAGE%7D NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/$%7BNOSCRIPT_PACKAGE%7D -PYTHON_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_PACKAGE%7D PYTHON_MSI_URL=https://www.python.org/ftp/python/$%7BPYTHON_VER%7D/$%7BPYTHON_MSI_PACKAGE%7... PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/$%7BPYCRYPTO_PACKAGE%7D ARGPARSE_URL=https://argparse.googlecode.com/files/$%7BARGPARSE_PACKAGE%7D @@ -131,7 +127,6 @@ 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} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/$%7BPY2EXE_VER... SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS_PACKAGE%... -LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020...
tbb-commits@lists.torproject.org