[tor-browser-bundle/master] Bug 11641: Fixup versions and input fetching for alpha+nightly.
commit 5ae44c2997bef0bf63d79bdf7e56becf93696018 Author: Mike Perry mikeperry-git@torproject.org Date: Thu May 29 12:51:08 2014 -0700
Bug 11641: Fixup versions and input fetching for alpha+nightly. --- gitian/fetch-inputs.sh | 4 ++-- gitian/versions.alpha | 33 +++++++++++++++++++++------------ gitian/versions.nightly | 4 ++-- 3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 2c91c85..b4ff609 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -302,8 +302,8 @@ libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TAG torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG -tor-launcher https://git.torproject.org/user/brade/tor-launcher.git $TORLAUNCHER_TAG -tor-browser https://git.torproject.org/user/brade/tor-browser.git $TORBROWSER_TAG +tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG +tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 702c1e4..ce3520c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,26 +1,27 @@ -TORBROWSER_VERSION=4.0-alpha-1 +TORBROWSER_VERSION=4.0-alpha1-pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1
-VERIFY_TAGS=1 +VERIFY_TAGS=0
FIREFOX_VERSION=24.5.0esr
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 -TOR_TAG=tor-0.2.5.3-alpha -TORLAUNCHER_TAG=0.2.5.4 +TORBROWSER_TAG=tor-browser-24.5.0esr-4.x-1 +TOR_TAG=tor-0.2.4.22 +TORLAUNCHER_TAG=master TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 -NSIS_TAG=v0.1 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 +NSIS_TAG=00133b8741eb8ca34fc8153d344c7c54a5e3fae9 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.5 +PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=0.0.2 -FTEPROXY_TAG=0.2.14 +LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 +FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 +TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
GITIAN_TAG=tor-browser-builder-3.x-5
@@ -39,11 +40,14 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1
## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi +HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,6 +66,7 @@ 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
# Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -69,7 +74,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -80,6 +86,7 @@ TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 +PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/$%7BOPENSSL_PACKAGE%7D @@ -90,6 +97,7 @@ 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... +HTTPSE_URL=https://www.eff.org/files/$%7BHTTPSE_PACKAGE%7D 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 @@ -102,3 +110,4 @@ M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/$%7BM2CRYPTO_PACKA 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 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 03f4f2f..9958aab 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -6,12 +6,12 @@ VERIFY_TAGS=0
FIREFOX_VERSION=24.5.0esr
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master HTTPSE_TAG=master -NSIS_TAG=master +NSIS_TAG=00133b8741eb8ca34fc8153d344c7c54a5e3fae9 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184
tor-commits@lists.torproject.org
-
mikeperry＠torproject.org