[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'dcf/3.6-beta'
mikeperry at torproject.org
mikeperry at torproject.org
Tue Jan 21 04:47:05 UTC 2014
commit e7cc748cd1eeaa68f44fa135fe2567918c82ce15
Merge: 7185cc5 a2da12d
Author: Mike Perry <mikeperry-git at torproject.org>
Date: Thu Jan 16 13:50:53 2014 -0800
Merge remote-tracking branch 'dcf/3.6-beta'
Conflicts:
gitian/descriptors/mac/gitian-tor.yml
gitian/fetch-inputs.sh
gitian/verify-tags.sh
Bundle-Data/Docs/PluggableTransports/LICENSE | 422 +++++++++++
.../Docs/PluggableTransports/LICENSE.PYTHON | 773 ++++++++++++++++++++
Bundle-Data/beta/linux/torrc-defaults-appendix | 30 +
Bundle-Data/beta/mac/torrc-defaults-appendix | 30 +
Bundle-Data/beta/windows/torrc-defaults-appendix | 30 +
Bundle-Data/mac-tor.sh | 11 +
gitian/Makefile | 18 +
gitian/build-helpers/pyc-timestamp.sh | 18 +
gitian/build-helpers/wine-wrappers/common.py | 27 +
gitian/build-helpers/wine-wrappers/dllwrap.py | 36 +
gitian/build-helpers/wine-wrappers/gcc.py | 36 +
gitian/build-helpers/wine-wrappers/settings.py | 2 +
gitian/build-helpers/wine-wrappers/setup.py | 7 +
gitian/build-helpers/wine-wrappers/swig.py | 33 +
gitian/descriptors/linux/gitian-bundle.yml | 9 +
.../linux/gitian-pluggable-transports.yml | 126 ++++
gitian/descriptors/linux/gitian-tor.yml | 8 +
gitian/descriptors/mac/gitian-bundle.yml | 14 +
.../mac/gitian-pluggable-transports.yml | 146 ++++
gitian/descriptors/mac/gitian-tor.yml | 8 +
gitian/descriptors/windows/gitian-bundle.yml | 8 +
.../windows/gitian-pluggable-transports.yml | 196 +++++
gitian/descriptors/windows/gitian-tor.yml | 8 +
gitian/fetch-inputs.sh | 34 +-
gitian/gpg/M2CRYPTO.gpg | Bin 0 -> 2441 bytes
gitian/gpg/PYCRYPTO.gpg | Bin 0 -> 4710 bytes
gitian/gpg/PYTHON_MSI.gpg | Bin 0 -> 1167 bytes
gitian/gpg/flashproxy.gpg | Bin 0 -> 5876 bytes
gitian/gpg/obfsproxy.gpg | Bin 0 -> 2215 bytes
gitian/gpg/pyptlib.gpg | Bin 0 -> 2215 bytes
gitian/gpg/ubuntu-wine.gpg | Bin 0 -> 363 bytes
gitian/mkbundle-linux.sh | 38 +-
gitian/mkbundle-mac.sh | 38 +-
gitian/mkbundle-windows.sh | 38 +-
gitian/patches/bug10297.patch | 55 ++
gitian/patches/bug5018.patch | 195 +++++
gitian/verify-tags.sh | 3 +
gitian/versions | 34 +
gitian/versions.alpha | 34 +
gitian/versions.beta | 86 +++
40 files changed, 2527 insertions(+), 24 deletions(-)
diff --cc gitian/descriptors/linux/gitian-tor.yml
index a251f65,6925663..ea44fe0
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@@ -22,9 -22,12 +22,11 @@@ remotes
"dir": "tor"
- "url": "https://github.com/libevent/libevent.git"
"dir": "libevent"
-- "url": "https://github.com/nmathewson/openssl.git"
- "dir": "openssl"
files:
+ - "bug10297.patch"
+ - "bug5018.patch"
- "dzip.sh"
+- "openssl.tar.gz"
script: |
INSTDIR="$HOME/install"
export LIBRARY_PATH="$INSTDIR/lib"
diff --cc gitian/descriptors/mac/gitian-tor.yml
index 15b867f,c9dba1f..3e27ffb
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@@ -22,8 -22,11 +22,10 @@@ remotes
"dir": "libevent"
- "url": "https://github.com/madler/zlib.git"
"dir": "zlib"
-- "url": "https://github.com/nmathewson/openssl.git"
- "dir": "openssl"
files:
+- "openssl.tar.gz"
+ - "bug10297.patch"
+ - "bug5018.patch"
- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
- "dzip.sh"
diff --cc gitian/descriptors/windows/gitian-tor.yml
index 660d2a7,db7951b..df5a798
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@@ -22,10 -22,13 +22,12 @@@ remotes
"dir": "libevent"
- "url": "https://github.com/madler/zlib.git"
"dir": "zlib"
-- "url": "https://github.com/nmathewson/openssl.git"
- "dir": "openssl"
files:
+ - "bug10297.patch"
+ - "bug5018.patch"
- "binutils.tar.bz2"
- "dzip.sh"
+- "openssl.tar.gz"
script: |
INSTDIR="$HOME/install"
export LIBRARY_PATH="$INSTDIR/lib"
diff --cc gitian/fetch-inputs.sh
index 862f8af,6277984..d4eda0e
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@@ -116,22 -117,22 +117,22 @@@ checkout_mingw()
# Get package files from mirror
# Get+verify sigs that exist
-#for i in OPENSSL # OBFSPROXY
-#do
-# PACKAGE="${i}_PACKAGE"
-# URL="${MIRROR_URL}${!PACKAGE}"
-# SUFFIX="asc"
-# get "${!PACKAGE}" "$URL"
-# get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX"
-#
-# if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then
-# echo "$i: GPG signature is broken for ${URL}"
-# mv "${!PACKAGE}" "${!PACKAGE}.badgpg"
-# exit 1
-# fi
-#done
+for i in OPENSSL # OBFSPROXY
+do
+ PACKAGE="${i}_PACKAGE"
+ URL="${MIRROR_URL}${!PACKAGE}"
+ SUFFIX="asc"
+ get "${!PACKAGE}" "$URL"
+ get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX"
+
+ if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then
+ echo "$i: GPG signature is broken for ${URL}"
+ mv "${!PACKAGE}" "${!PACKAGE}.badgpg"
+ exit 1
+ fi
+done
- for i in BINUTILS GCC PYTHON
+ for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI
do
PACKAGE="${i}_PACKAGE"
URL="${i}_URL"
@@@ -200,7 -217,7 +217,7 @@@ f
# 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 OPENSSL
-for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS # OPENSSL
++for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL
do
PACKAGE="${i}_PACKAGE"
HASH="${i}_HASH"
diff --cc gitian/mkbundle-linux.sh
index 7c6bd60,4232cf7..62d433d
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@@ -78,10 -81,10 +80,10 @@@ cd $GITIAN_DI
if [ ! -f $GITIAN_DIR/inputs/tor-linux32-gbuilt.zip -o ! -f $GITIAN_DIR/inputs/tor-linux64-gbuilt.zip ];
then
echo
- echo "****** Starting Tor Component of Linux Bundle (1/3 for Linux) ******"
+ echo "****** Starting Tor Component of Linux Bundle (1/4 for Linux) ******"
echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml
+ ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S`
diff --cc gitian/mkbundle-mac.sh
index 531db8f,f990d3c..1eebfb8
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@@ -78,10 -82,10 +81,10 @@@ cd $GITIAN_DI
if [ ! -f $GITIAN_DIR/inputs/tor-mac32-gbuilt.zip ];
then
echo
- echo "****** Starting Tor Component of Mac Bundle (1/3 for Mac) ******"
+ echo "****** Starting Tor Component of Mac Bundle (1/4 for Mac) ******"
echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml
+ ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S`
diff --cc gitian/mkbundle-windows.sh
index 183c737,d45ec51..4f27840
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@@ -79,10 -83,10 +82,10 @@@ cd $GITIAN_DI
if [ ! -f $GITIAN_DIR/inputs/tor-win32-gbuilt.zip ];
then
echo
- echo "****** Starting Tor Component of Windows Bundle (1/3 for Windows) ******"
+ echo "****** Starting Tor Component of Windows Bundle (1/4 for Windows) ******"
echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml
+ ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S`
diff --cc gitian/verify-tags.sh
index 055cac5,9b75a47..28c16f1
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@@ -60,6 -60,10 +60,9 @@@ zlib zlib.gp
libevent libevent.gpg $LIBEVENT_TAG
tor tor.gpg $TOR_TAG
https-everywhere https-everywhere.gpg $HTTPSE_TAG
-openssl tor.gpg $OPENSSL_TAG
+ pyptlib pyptlib.gpg $PYPTLIB_TAG
+ obfsproxy obfsproxy.gpg $OBFSPROXY_TAG
+ flashproxy flashproxy.gpg $FLASHPROXY_TAG
EOF
cd "$INPUTS_DIR"
diff --cc gitian/versions
index 3e0dda1,ec7d5f8..f41f46b
--- a/gitian/versions
+++ b/gitian/versions
@@@ -20,10 -24,17 +23,17 @@@ FIREFOX_LANG_VER=24.2.0es
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
+ 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
+ PY2EXE_VER=0.6.9
+ SETUPTOOLS_VER=1.4
## File names for the source packages
-# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi
+OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.12-fn+sm+fx.xpi
TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
MINGW_PACKAGE=mingw-w64-svn-snapshot.zip
@@@ -31,17 -42,32 +41,32 @@@ MSVCR100_PACKAGE=msvcr100.dl
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
+ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
+ 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
# Hashes for packages with weak sigs or no sigs
-# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
+OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a
OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
-NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e
+NOSCRIPT_HASH=5a1a501dae3f1c6e82d9328ee7dea6d6b12552989199dc2d1b49a0d7001ad779
MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
+ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
+ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+ ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
+ TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
+ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
+ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
+ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
## Non-git package URLs
-# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
+OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE}
OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
diff --cc gitian/versions.alpha
index 1467d1d,81035bb..1b0cf80
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@@ -20,10 -24,17 +23,17 @@@ FIREFOX_LANG_VER=24.2.0es
BINUTILS_VER=2.22
GCC_VER=4.6.3
PYTHON_VER=2.7.5
+ 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
+ PY2EXE_VER=0.6.9
+ SETUPTOOLS_VER=1.4
## File names for the source packages
-# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi
+OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.12-sm+fx+fn.xpi
TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
MINGW_PACKAGE=mingw-w64-svn-snapshot.zip
@@@ -31,17 -42,32 +41,32 @@@ MSVCR100_PACKAGE=msvcr100.dl
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
+ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
+ 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
# Hashes for packages with weak sigs or no sigs
-# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
+OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a
OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
-NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e
+NOSCRIPT_HASH=5a1a501dae3f1c6e82d9328ee7dea6d6b12552989199dc2d1b49a0d7001ad779
MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
+ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
+ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+ ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
+ TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6
+ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
+ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
+ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
## Non-git package URLs
-# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
+OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE}
OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
More information about the tor-commits
mailing list