January 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Add bridge keyids where I was able to find them.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 2629af99bfcb92dae4add2c125fd3be65f67ab51 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 17:02:11 2014 -0800 Add bridge keyids where I was able to find them. --- Bundle-Data/beta/linux/torrc-defaults-appendix | 22 +++++++++++----------- Bundle-Data/beta/mac/torrc-defaults-appendix | 22 +++++++++++----------- Bundle-Data/beta/windows/torrc-defaults-appendix | 22 +++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index 3b4c04e..fff3147 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -1,20 +1,20 @@ ## obfsproxy configuration # -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 +# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 # Bridge obfs3 209.141.36.236:45496 # Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 +# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD +# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E # -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 +# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 +# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 +# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 +# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 +# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index 404c659..c3b90fc 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -1,20 +1,20 @@ ## obfsproxy configuration # -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 +# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 # Bridge obfs3 209.141.36.236:45496 # Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 +# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD +# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E # -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 +# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 +# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 +# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 +# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 +# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index edaa575..6ac0f95 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -1,20 +1,20 @@ ## obfsproxy configuration # -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D +# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 +# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 # Bridge obfs3 209.141.36.236:45496 # Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 +# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD +# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E # -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 +# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 +# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 +# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 +# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 +# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed

1 0

[tor-browser-bundle/master] Remove LearnCircuitBuildTimeout and CircuitBuildTimeout from flash proxy config.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 9622ab19df576e7a1441689d0e7fbd5ea246ec39 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 17:32:42 2014 +0000 Remove LearnCircuitBuildTimeout and CircuitBuildTimeout from flash proxy config. Mike tells me that these are no longer necessary since #3443 ("Client with low CBT can't establish any circuits") was fixed. I removed the config from my hourly tests and it doesn't seem to increase the number of failures. --- Bundle-Data/beta/linux/torrc-defaults-appendix | 3 --- Bundle-Data/beta/mac/torrc-defaults-appendix | 3 --- Bundle-Data/beta/windows/torrc-defaults-appendix | 3 --- 3 files changed, 9 deletions(-) diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index 2274863..3b4c04e 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -21,9 +21,6 @@ ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin m ## flash proxy configuration # -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# # # The flashproxy bridge address and port are ignored. # Bridge flashproxy 0.0.1.0:1 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index b711e60..404c659 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -21,9 +21,6 @@ ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed ## flash proxy configuration # -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# # # The flashproxy bridge address and port are ignored. # Bridge flashproxy 0.0.1.0:1 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 0fad86d..edaa575 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -21,9 +21,6 @@ ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed ## flash proxy configuration # -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# # # The flashproxy bridge address and port are ignored. # Bridge flashproxy 0.0.1.0:1

1 0

[tor-browser-bundle/master] Update beta versions and switch name of the PT build var.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 86f2409969485555533c8f17478ba839106fefec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jan 16 13:57:42 2014 -0800 Update beta versions and switch name of the PT build var. --- gitian/descriptors/linux/gitian-bundle.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 4 ++-- gitian/descriptors/windows/gitian-bundle.yml | 2 +- gitian/versions.beta | 23 +++++++++++------------ 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f7f6e0b..958fb65 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -103,7 +103,7 @@ script: | unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip - if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults fi diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 3700e46..8810c0f 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -99,13 +99,13 @@ script: | cd .. # unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip - if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip fi cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip unzip ~/build/tbb-docs.zip - if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + if [ $BUILD_PT_BUNDLES ]; then cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults fi # Install a "tor" shim that sets the working directory. See #10030. diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 4ee42d5..f8e6d1b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -105,7 +105,7 @@ script: | unzip ~/build/tor-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip unzip ~/build/tbb-docs.zip - if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-win32-gbuilt.zip cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults fi diff --git a/gitian/versions.beta b/gitian/versions.beta index cc2080e..50b0bc7 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,15 +1,14 @@ TORBROWSER_VERSION=3.6-beta-1 -TORBROWSER_VERSION_SPECIAL=beta -BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.2.0esr-3.5.1-build1 TOR_TAG=tor-0.2.4.20 -OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.4.2 -TORBUTTON_TAG=1.6.5.3 -HTTPSE_TAG=3.4.4tbb +TORLAUNCHER_TAG=0.2.4.3 +TORBUTTON_TAG=1.6.5.4 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -20,7 +19,7 @@ FLASHPROXY_TAG=1.4 GITIAN_TAG=tor-browser-builder-3.0-4 -# OPENSSL_VER=1.0.1e +OPENSSL_VER=1.0.1f FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -34,8 +33,8 @@ 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 @@ -53,10 +52,10 @@ 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 @@ -68,7 +67,7 @@ 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/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Switch pluggable transports back to openssl tarballs.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 735a29c864e424287ac348899b90e2643998c4ec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jan 16 17:05:54 2014 -0800 Switch pluggable transports back to openssl tarballs. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 6 +++--- gitian/descriptors/mac/gitian-pluggable-transports.yml | 6 +++--- gitian/descriptors/windows/gitian-pluggable-transports.yml | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 7d6a8b9..9aafc57 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -16,8 +16,6 @@ packages: - "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" @@ -25,6 +23,7 @@ remotes: - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" files: +- "openssl.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -94,7 +93,8 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf ./config -shared --prefix=$INSTDIR/openssl diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 1824fcd..d44193c 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -15,8 +15,6 @@ packages: #- "libssl0.9.8" reference_datetime: "2000-01-01 00:00:00" remotes: -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" @@ -24,6 +22,7 @@ remotes: - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" files: +- "openssl.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -111,7 +110,8 @@ script: | cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 534a2f0..a8535c6 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -15,8 +15,6 @@ packages: - "libtool" reference_datetime: "2000-01-01 00:00:00" remotes: -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" @@ -24,6 +22,7 @@ remotes: - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" files: +- "openssl.tar.gz" - "setuptools.tar.gz" - "pycrypto.tar.gz" - "zope.interface.zip" @@ -163,7 +162,8 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl make diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 62d433d..960d33c 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -129,7 +129,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 1eebfb8..21e88d2 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -126,7 +126,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 4f27840..3760b01 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -127,7 +127,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Download py2exe installer.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit cbfdf0fe2d60f93e536d495276888197f0cb6a83 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 24 19:55:36 2013 +0000 Download py2exe installer. --- gitian/fetch-inputs.sh | 3 ++- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 933185e..ff1aaff 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -168,7 +168,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED +for i in ZOPEINTERFACE TWISTED PY2EXE do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -262,6 +262,7 @@ 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 +ln -sf "$PY2EXE_PACKAGE" py2exe.exe # 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/versions b/gitian/versions index 0065002..0781251 100755 --- a/gitian/versions +++ b/gitian/versions @@ -29,6 +29,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -46,6 +47,7 @@ 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 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -59,6 +61,7 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a +PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -75,3 +78,4 @@ ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # 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_… +PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index abd32cf..ed2754b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -29,6 +29,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -46,6 +47,7 @@ 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 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -59,6 +61,7 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a +PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -75,3 +78,4 @@ ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # 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_… +PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE}

1 0

[tor-browser-bundle/master] Force 32-bit Python 2.6 on Mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 360ee669bb080bdf53c16d105d781232c09e267c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Nov 15 07:18:04 2013 +0000 Force 32-bit Python 2.6 on Mac. It appears that we must use a Python that is compatible with the compiled Python modules we provide. Apple's custom python binary provides environment variables to control the version and word length: VERSIONER_PYTHON_VERSION=2.6 VERSIONER_PYTHON_PREFER_32_BIT=yes See python(1). With neither of these variables set, on OS X 10.9, importing a module results in: ImportError: dlopen(TorBrowserBundle_en-US.app/Tor/Crypto/Cipher/_AES.so, 2): no suitable image found. Did find: /Users/david/TorBrowserBundle_en-US.app/Tor/Crypto/Cipher/_AES.so: mach-o, but wrong architecture The same happens if VERSIONER_PYTHON_VERSION=2.6 but VERSIONER_PYTHON_PREFER_32_BIT is unset. Setting VERSIONER_PYTHON_PREFER_32_BIT=yes without setting VERSIONER_PYTHON_VERSION causes this message in the terminal along with a popup offering to send a crash report: Fatal Python error: Interpreter not initialized (version mismatch?) Abort trap: 6 Setting both variables seems to work. This issue may be a manifestation of that our compiled modules are i386-only: $ file Crypto/Cipher/_AES.so Crypto/Cipher/_AES.so: Mach-O dynamically linked shared library i386 Whereas /usr/bin/python is both 32-bit and 64-bit. The 2.x series of PT bundles used fat shared objects and didn't show this problem. --- Bundle-Data/mac-tor.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/mac-tor.sh b/Bundle-Data/mac-tor.sh index 5f7c099..fb9c4f4 100755 --- a/Bundle-Data/mac-tor.sh +++ b/Bundle-Data/mac-tor.sh @@ -1,4 +1,7 @@ #!/bin/sh +# Compiled Python modules require a compatible Python, which means 32-bit 2.6. +export VERSIONER_PYTHON_VERSION=2.6 +export VERSIONER_PYTHON_PREFER_32_BIT=yes # Set the current working directory to the directory containing this executable, # so that pluggable transport executables can be given with relative paths. This # works around a change in OS X 10.9, where the current working directory is

1 0

[tor-browser-bundle/master] Download setuptools.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 4a28471a7f683d3f22169c3f9dbc9176e60754f0 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 18 07:26:34 2013 +0000 Download setuptools. --- gitian/fetch-inputs.sh | 5 +++-- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index ff1aaff..6277984 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -168,7 +168,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -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 M2CRYPTO # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -263,6 +263,7 @@ ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe +ln -sf "$SETUPTOOLS_PACKAGE" setuptools.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/versions b/gitian/versions index 0781251..ec7d5f8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -30,6 +30,7 @@ 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 @@ -48,6 +49,7 @@ 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 @@ -62,6 +64,7 @@ ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b356494 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} @@ -79,3 +82,4 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # 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_… PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_… +SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ed2754b..81035bb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -30,6 +30,7 @@ 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 @@ -48,6 +49,7 @@ 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 @@ -62,6 +64,7 @@ ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b356494 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} @@ -79,3 +82,4 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # 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_… PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_… +SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS_PACKAGE}

1 0

[tor-browser-bundle/master] Call gitian-pluggable-transports.yml from mkbundle-windows.sh.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 4e7f5b548dc1fbc166b692dddb52c9f99119f68c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 17 10:03:46 2013 +0000 Call gitian-pluggable-transports.yml from mkbundle-windows.sh. --- gitian/mkbundle-windows.sh | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index fd0cf42..989c2a9 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -80,7 +80,7 @@ cd $GITIAN_DIR 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 @@ -94,14 +94,14 @@ then #cp -a result/tor-windows-res.yml $GITIAN_DIR/inputs/ else echo - echo "****** SKIPPING already built Tor Component of Windows Bundle (1/3 for Windows) ******" + echo "****** SKIPPING already built Tor Component of Windows Bundle (1/4 for Windows) ******" echo fi if [ ! -f $GITIAN_DIR/inputs/tor-browser-win32-gbuilt.zip ]; then echo - echo "****** Starting Torbrowser Component of Windows Bundle (2/3 for Windows) ******" + echo "****** Starting Torbrowser Component of Windows Bundle (2/4 for Windows) ******" echo ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml @@ -115,14 +115,35 @@ then #cp -a result/torbrowser-windows-res.yml $GITIAN_DIR/inputs/ else echo - echo "****** SKIPPING already built Torbrowser Component of Windows Bundle (2/3 for Windows) ******" + echo "****** SKIPPING already built Torbrowser Component of Windows Bundle (2/4 for Windows) ******" + echo +fi + +if [ ! -f $GITIAN_DIR/inputs/pluggable-transports-win32-gbuilt.zip ]; +then + echo + echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" + echo + + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + if [ $? -ne 0 ]; + then + #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` + exit 1 + fi + + cp -a build/out/pluggable-transports-win32-gbuilt.zip $GITIAN_DIR/inputs/ + #cp -a result/pluggable-transports-windows-res.yml $GITIAN_DIR/inputs/ +else + echo + echo "****** SKIPPING already built Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo fi if [ ! -f $GITIAN_DIR/inputs/bundle-windows.gbuilt ]; then echo - echo "****** Starting Bundling+Localization of Windows Bundle (3/3 for Windows) ******" + echo "****** Starting Bundling+Localization of Windows Bundle (4/4 for Windows) ******" echo cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions @@ -140,7 +161,7 @@ then touch $GITIAN_DIR/inputs/bundle-windows.gbuilt else echo - echo "****** SKIPPING Bundling+Localization of Windows Bundle (3/3 for Windows) ******" + echo "****** SKIPPING Bundling+Localization of Windows Bundle (4/4 for Windows) ******" echo fi

1 0

[tor-browser-bundle/master] Download Windows Python MSI package.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 5a787c146694ebf9eff0963447be2c6d6799ba4a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 18 03:54:22 2013 +0000 Download Windows Python MSI package. gpg --output gpg/PYTHON_MSI.gpg --export --export-options export-minimal 0x7D9DC8D2 We need to have a Python installation in order to compile various Python packages. On GNU/Linux, we can use a python-dev package. The Mac OS X SDK contains a Python "framework." I tried cross-compiling Python using the mingw-w64 tools, but that seems unsupported and likely to require many third-party patches. "cross and native build of python for mingw* hosts" http://bugs.python.org/issue3871 "Add support for mingw" http://bugs.python.org/issue6335 "Cross compilation patches and build scripts for CPython" https://github.com/mingwandroid/crucifixion-freedom "Cross compilation patches for Python 2.7.3 and 3.3.0, targeting MinGW/Darwin/Linux and MinGW builds generated from these." https://code.google.com/p/mingw-and-ndk/ --- gitian/fetch-inputs.sh | 5 +++-- gitian/gpg/PYTHON_MSI.gpg | Bin 0 -> 1167 bytes gitian/versions | 2 ++ gitian/versions.alpha | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 281f500..933185e 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 M2CRYPTO +for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o "${i}" == "PYTHON_MSI" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -256,6 +256,7 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi 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 ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip diff --git a/gitian/gpg/PYTHON_MSI.gpg b/gitian/gpg/PYTHON_MSI.gpg new file mode 100644 index 0000000..97abdc1 Binary files /dev/null and b/gitian/gpg/PYTHON_MSI.gpg differ diff --git a/gitian/versions b/gitian/versions index 5933c51..0065002 100755 --- a/gitian/versions +++ b/gitian/versions @@ -40,6 +40,7 @@ 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 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip @@ -67,6 +68,7 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f38bc5c..abd32cf 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,6 +40,7 @@ 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 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip @@ -67,6 +68,7 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/…

1 0

[tor-browser-bundle/master] Install pluggable-transports into windows bundle.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit fad23969fcae31bc02d8dd48b8a8dca4e5b76818 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 17 10:14:14 2013 +0000 Install pluggable-transports into windows bundle. --- gitian/descriptors/windows/gitian-bundle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index f56c15d..c439d5b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -25,6 +25,7 @@ files: # TODO: Can we use an env for this file+version?? - "tor-browser-win32-gbuilt.zip" - "tor-win32-gbuilt.zip" +- "pluggable-transports-win32-gbuilt.zip" - "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" @@ -99,6 +100,7 @@ script: | cd "Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip unzip ~/build/tor-win32-gbuilt.zip + unzip ~/build/pluggable-transports-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip unzip ~/build/tbb-docs.zip cd ..

1 0