- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit cc1cff02f7c8b930bdcf03abc1a3a1cd5800d427 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 09:13:24 2014 -0700 Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch. --- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- gitian/patches/bug9229.patch | 46 ----------------------------- 4 files changed, 52 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 4a8f08e..2b0b9ab 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -24,7 +24,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -75,7 +74,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 90f56e0..be4edd2 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -21,7 +21,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -70,7 +69,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 19c4acd..d3f1d4e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -22,7 +22,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -72,7 +71,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/patches/bug9229.patch b/gitian/patches/bug9229.patch deleted file mode 100644 index 6b1115c..0000000 --- a/gitian/patches/bug9229.patch +++ /dev/null @@ -1,46 +0,0 @@ -From db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Mon Sep 17 00:00:00 2001 -From: Nick Mathewson <nickm(a)torproject.org> -Date: Mon, 10 Mar 2014 15:01:27 -0400 -Subject: [PATCH] Update ns downloads when we receive a bridge descriptor - -This prevents long stalls when we're starting with a state file but -with no bridge descriptors. Fixes bug 9229. I believe this bug has -been present since 0.2.0.3-alpha. ---- - changes/bug9229 | 5 +++++ - src/or/entrynodes.c | 6 +++++- - 2 files changed, 10 insertions(+), 1 deletion(-) - create mode 100644 changes/bug9229 - -diff --git a/changes/bug9229 b/changes/bug9229 -new file mode 100644 -index 0000000..ad7fd22 ---- /dev/null -+++ b/changes/bug9229 -@@ -0,0 +1,5 @@ -+ o Minor bugfixes: -+ - Avoid 60-second delays in the bootstrapping process when Tor -+ is launching for a second time while using bridges. Fixes bug 9229; -+ bugfix on 0.2.0.3-alpha. -+ -diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c -index 2aa063c..59770fa 100644 ---- a/src/or/entrynodes.c -+++ b/src/or/entrynodes.c -@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) - * our entry node list */ - entry_guard_register_connect_status(ri->cache_info.identity_digest, - 1, 0, now); -- if (first) -+ if (first) { -+ /* XXXX apparently, this is never called. See bug #9229. */ - routerlist_retry_directory_downloads(now); -+ } -+ -+ update_networkstatus_downloads(now); - } - } - } --- -1.8.1.2 -

1 0

[tor-browser-bundle/master] Increase some component versions for 3.6.2.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit b428d32a7f014d53235750ec2a1634c6937fd5ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:33:46 2014 -0700 Increase some component versions for 3.6.2. We may also bump torbutton and tor launcher later. --- gitian/versions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions b/gitian/versions index a9e033f..6424316 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.1 +TORBROWSER_VERSION=3.6.2pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -7,10 +7,10 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 -TOR_TAG=tor-0.2.4.21 +TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -18,8 +18,8 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # 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

1 0

[tor-browser-bundle/master] Bug 11190: Workaround for broken obfs on OS X.
by gk＠torproject.org 22 May '14

22 May '14

commit 5f671fa272219e1ecaf15d5d22a41c16aec64dae Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 22 12:24:25 2014 +0000 Bug 11190: Workaround for broken obfs on OS X. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 52dd403..59109a7 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -151,6 +151,8 @@ script: | cp -a bin/obfsproxy $PTDIR/obfsproxy.bin mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy + # XXX: Workaround for bug 11190 + sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. # Building M2Crypto

1 0

[tor-browser-bundle/master] Bug 10120: Part 4: Refactor PT descriptors.
by gk＠torproject.org 22 May '14

22 May '14

commit 90d598f9dcd0758fd9c72f4b30286982017dd18d Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 22 12:06:04 2014 +0000 Bug 10120: Part 4: Refactor PT descriptors. We build GMP separately and preserve it now as well. Apart from that we use the already built OpenSSL in the PT descriptors and leave other requirements for PTs alone: the overhead building them every time is not that high and they might be changing more often than the other utilities we preserve. Additionally, the descriptors got cleaned-up a bit. --- .../linux/gitian-pluggable-transports.yml | 81 +++++----- gitian/descriptors/linux/gitian-tor.yml | 11 +- gitian/descriptors/linux/gitian-utils.yml | 20 ++- .../mac/gitian-pluggable-transports.yml | 111 +++++++------- gitian/descriptors/mac/gitian-tor.yml | 1 + gitian/descriptors/mac/gitian-utils.yml | 13 ++ .../windows/gitian-pluggable-transports.yml | 154 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 8 +- gitian/descriptors/windows/gitian-utils.yml | 12 +- gitian/mkbundle-linux.sh | 8 +- gitian/mkbundle-mac.sh | 5 +- gitian/mkbundle-windows.sh | 5 +- 12 files changed, 231 insertions(+), 198 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index eb9ca16..b2d57c0 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -5,7 +5,7 @@ suites: architectures: - "i386" - "amd64" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -30,8 +30,6 @@ remotes: - "url": "https://github.com/habnabit/txsocksx.git" "dir": "txsocksx" files: -- "openssl.tar.gz" -- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "pyyaml.tar.gz" @@ -40,77 +38,81 @@ files: - "m2crypto.tar.gz" - "parsley.tar.gz" - "dzip.sh" +- "gmp-linux32-utils.zip" +- "gmp-linux64-utils.zip" +- "openssl-linux32-utils.zip" +- "openssl-linux64-utils.zip" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" - export LIBRARY_PATH="$INSTDIR/lib" + mkdir -p $PTDIR + mkdir -p $INSTDIR/Debug/ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C export PYTHON=python2 umask 0022 - # + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - # - mkdir -p $PTDIR - mkdir -p $INSTDIR/Debug/ - # - tar xvf gmp.tar.bz2 - cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - make - make install - cp -an $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor - cd .. - # + + unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip + unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip + cp $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor + + # Building pyptlib cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. - # + + # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. - # + + # Building argparse tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. - # + + # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. - # + + # Building PyYAML 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 .. - # + + # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. - # + + # Building Parsley tar xzf parsley.tar.gz cd Parsley-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -119,7 +121,8 @@ script: | cp -a build/ometa $PTDIR/ cp -a build/terml $PTDIR/ cd .. - # + + # Building txsocksx cd txsocksx find -type f | xargs touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get @@ -130,7 +133,8 @@ script: | $PYTHON setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. - # + + # Building obfsproxy cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build @@ -139,16 +143,8 @@ script: | mkdir -p $INSTDIR/Docs/Obfsproxy cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # - 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 - make - make install - cd .. - # + + # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -156,7 +152,8 @@ script: | $PYTHON setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ cd .. - # + + # Building flashproxy cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client @@ -164,7 +161,8 @@ script: | mkdir -p $INSTDIR/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. - # + + # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -174,7 +172,8 @@ script: | cp -a {LICENSE,README.md} $INSTDIR/Docs/libfte cp -a thirdparty/re2/LICENSE $INSTDIR/Docs/libfte/LICENSE.re2 cd .. - # + + # Building fteproxy cd fteproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin @@ -182,9 +181,9 @@ script: | mkdir -p $INSTDIR/Docs/fteproxy cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. - # + + # Grabbing the results cd $INSTDIR - # ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-debug.zip Debug/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 44c2b1f..4a8f08e 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -44,14 +44,14 @@ script: | export TZ=UTC export LC_ALL=C umask 0022 - # + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - # + mkdir -p $INSTDIR/Data/Tor/ mkdir -p $INSTDIR/Tor/ mkdir -p $INSTDIR/Debug/Tor/ @@ -60,9 +60,9 @@ script: | cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ - # chmod 700 $INSTDIR/Tor/*so* - # + + # Building tor cd tor git update-index --refresh -q export GIT_COMMITTER_NAME="nobody" @@ -106,7 +106,8 @@ script: | strip $INSTDIR/Tor/$LIB objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - # + + # Grabbing the results ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/ ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 9bbae76..34b1672 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -25,11 +25,12 @@ remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" files: -- "versions" -- "dzip.sh" - "openssl.tar.gz" - "python.tar.bz2" - "lxml.tar.gz" +- "gmp.tar.bz2" +- "versions" +- "dzip.sh" script: | INSTDIR="$HOME/install" source versions @@ -38,7 +39,7 @@ script: | export TZ=UTC export LC_ALL=C umask 0022 - # + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 @@ -80,7 +81,7 @@ script: | make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python cd .. - # Building the Python lxml module + # Building lxml tar xzf lxml.tar.gz cd lxml-* # Make sure we use our freshly built python binary here. Otherwise bad things @@ -92,10 +93,19 @@ script: | cp *utils.zip $OUTDIR cd ../../../ + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cd .. + # Grabbing the remaining results cd $INSTDIR ~/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/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 48521d8..52dd403 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -14,7 +14,6 @@ packages: - "python-dev" - "faketime" - "libtool" -#- "libssl0.9.8" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" @@ -30,8 +29,6 @@ remotes: - "url": "https://github.com/habnabit/txsocksx.git" "dir": "txsocksx" files: -- "openssl.tar.gz" -- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "pyyaml.tar.gz" @@ -42,56 +39,45 @@ files: - "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" -#- "apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb" -#- "apple-x86-odcctools_758.159-0flosoft11_i386.deb" +- "gmp-mac32-utils.zip" +- "openssl-mac32-utils.zip" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/TorBrowserBundle.app/Tor/PluggableTransports" - export LIBRARY_PATH="$INSTDIR/lib" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 # - #export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" - #export CXXFLAGS=$CFLAGS - #export LDFLAGS=$CFLAGS - export PATH="$PATH:/usr/apple-osx/bin/" - export AR=/usr/apple-osx/bin/i686-apple-darwin11-ar - export CC=/usr/apple-osx/bin/i686-apple-darwin11-gcc - export CXX=/usr/apple-osx/bin/i686-apple-darwin11-g++ - # http://bugs.python.org/issue9437 - export LDSHARED="$CC -pthread -shared" - export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" - export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" - # mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # sudo dpkg -i *.deb - cd /usr - sudo tar -Jxvf /home/ubuntu/build/multiarch-darwin*tar.xz - cd ~/build - # For OpenSSL - sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc - # - tar xvf gmp.tar.bz2 - cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --host=i686-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - make - make install + tar xaf multiarch-darwin*tar.xz + export PATH="$PATH:$HOME/build/apple-osx/bin/" + unzip -d $INSTDIR gmp-mac32-utils.zip + unzip -d $INSTDIR openssl-mac32-utils.zip cp $INSTDIR/gmp/lib/*dylib* $INSTDIR/TorBrowserBundle.app/Tor/ - cd .. # + export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar + export CC=$HOME/build/apple-osx/bin/i686-apple-darwin11-gcc + export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ + # http://bugs.python.org/issue9437 + export LDSHARED="$CC -pthread -shared" + # XXX Clean up these flags? + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" + export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" + + # Building pyptlib cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. - # + + # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -101,28 +87,32 @@ script: | python setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. - # + + # Building argparse tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build 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 .. - # + + # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. - # + + # Building PyYAML + 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 .. + + # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -130,7 +120,8 @@ script: | python setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. - # + + # Building Parsley tar xzf parsley.tar.gz cd Parsley-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -139,7 +130,8 @@ script: | cp -a build/ometa $PTDIR/ cp -a build/terml $PTDIR/ cd .. - # + + # Building txsocksx cd txsocksx find -type f | xargs touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get @@ -150,7 +142,8 @@ script: | python setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. - # + + # Building obfsproxy cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build @@ -159,16 +152,8 @@ script: | mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cd .. - # - 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/" - make install - #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ - cd .. - # + + # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -182,7 +167,8 @@ script: | python setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ cd .. - # + + # Building flashproxy cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client @@ -190,7 +176,8 @@ script: | mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cd .. - # + + # Building libfte cd libfte find -type f | xargs touch --date="$REFERENCE_DATETIME" CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make @@ -199,7 +186,8 @@ script: | cp -a {LICENSE,README.md} $INSTDIR/TorBrowserBundle.app/Docs/libfte cp -an thirdparty/re2/LICENSE $INSTDIR/TorBrowserBundle.app/Docs/libfte/LICENSE.re2 cd .. - # + + # Building fteproxy cd fteproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin @@ -207,7 +195,8 @@ script: | mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/fteproxy cp -a {COPYING,README.md} $INSTDIR/TorBrowserBundle.app/Docs/fteproxy cd .. - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index b8a761b..90f56e0 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -55,6 +55,7 @@ script: | cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` # + # XXX Clean up these flags? export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 1caf8f0..3c6e4a7 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -21,6 +21,7 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "openssl.tar.gz" +- "gmp.tar.bz2" - "versions" - "dzip.sh" script: | @@ -38,7 +39,9 @@ script: | # For OpenSSL ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc + # XXX Clean up these flags? export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" # Building Libevent @@ -62,9 +65,19 @@ script: | make install cd .. + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --host=i686-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cd .. + # Grabbing the results cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-mac32-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac32-utils.zip libevent + ~/build/dzip.sh gmp-$GMP_VER-mac32-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1637b23..6af344c 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -31,8 +31,6 @@ remotes: - "url": "https://github.com/habnabit/txsocksx.git" "dir": "txsocksx" files: -- "openssl.tar.gz" -- "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" @@ -47,16 +45,38 @@ files: - "py2exe.exe" - "dzip.sh" - "pyc-timestamp.sh" +- "openssl-win32-utils.zip" +- "gmp-win32-utils.zip" script: | + # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. + function py2exe_zip_timestomp { + ZIPFILE="$1" + local tmpdir="$(mktemp -d)" + local tmpzip="$(mktemp -u)" + unzip -d "$tmpdir" "$ZIPFILE" + cd "$tmpdir" + find . -name '*.pyc' -print0 | xargs -0 ~/build/pyc-timestamp.sh "$REFERENCE_DATETIME" + ~/build/dzip.sh "$tmpzip" . + cd - + mv -f "$tmpzip" "$ZIPFILE" + rm -rf "$tmpdir" + } + INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" - export LIBRARY_PATH="$INSTDIR/lib" + mkdir -p $INSTDIR/bin/ + mkdir -p $PTDIR/ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C export CFLAGS="-mwindows" export LDFLAGS="-mwindows" + umask 0022 + + unzip -d $INSTDIR gmp-win32-utils.zip + unzip -d $INSTDIR openssl-win32-utils.zip + cp $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor # We need at least Wine 1.5.29 which is not in Ubuntu's main repository (see # below). Thus, we resort to a PPA and need therefore to determine the correct @@ -69,47 +89,13 @@ script: | # KVM MIRROR_HOST=10.0.2.2 fi - + # Install a Wine new enough to have a fix for + # http://bugs.winehq.org/show_bug.cgi?id=29764; otherwise Python run under + # Wine constantly crashes in _PyVerify_fd, which is called by such common + # operations as io.open and os.fstat (anything involving a file descriptor + # number). Ubuntu's main repository only has wine1.4, and the issue was fixed + # in 1.5.29. WINEROOT=$HOME/.wine/drive_c - # XXX: Hardening options cause the exe's to crash.. not sure why - #export CFLAGS="-mwindows -fstack-protector-all -fPIE -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security" - #export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/" - umask 0022 - # - mkdir -p $INSTDIR/bin/ - mkdir -p $PTDIR/ - mkdir -p $OUTDIR/ - # - # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. - function py2exe_zip_timestomp { - ZIPFILE="$1" - local tmpdir="$(mktemp -d)" - local tmpzip="$(mktemp -u)" - unzip -d "$tmpdir" "$ZIPFILE" - cd "$tmpdir" - find . -name '*.pyc' -print0 | xargs -0 ~/build/pyc-timestamp.sh "$REFERENCE_DATETIME" - ~/build/dzip.sh "$tmpzip" . - cd - - mv -f "$tmpzip" "$ZIPFILE" - rm -rf "$tmpdir" - } - # - # - tar xvf gmp.tar.bz2 - cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared - make - make install - cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor - cd .. - # - # - # Install a Wine new enough to have a fix for http://bugs.winehq.org/show_bug.cgi?id=29764; - # otherwise Python run under Wine constantly crashes in _PyVerify_fd, which is - # called by such common operations as io.open and os.fstat (anything involving - # a file descriptor number). Ubuntu's main repository only has wine1.4, and - # the issue was fixed in 1.5.29. sudo -s sh -c "echo deb http://$MIRROR_HOST:3142/ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main >> /etc/apt/sources.list" # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D…. @@ -140,40 +126,40 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py py2exe cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ cd .. - # + + # Building setuptools tar xzf setuptools.tar.gz cd setuptools-* find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # + + # Bulding pyptlib cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. - # + + # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - # This is bogus, that we run the configure script in the build environment, but it seems to work. - # https://bugs.launchpad.net/pycrypto/+bug/1096207 for ac_cv_func_malloc_0_nonnull. + # This is bogus, that we run the configure script in the build environment, + # but it seems to work. https://bugs.launchpad.net/pycrypto/+bug/1096207 for + # ac_cv_func_malloc_0_nonnull. ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32 LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # + + # Building argparse tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" 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 .. - # + + # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -182,11 +168,20 @@ script: | # Must create this file in order for py2exe to find the package. touch $INSTDIR/python/Lib/site-packages/zope/__init__.py cd .. - # + + # Building PyYAML + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + + # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" rather than "Python.h". + # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" + # rather than "Python.h". ln -sf Python.h $INSTDIR/python/include/python.h # We need to set the "mingw32" compiler to avoid an error in build_ext, but # Twisted's "install" command calls build_ext unconditionally, whether the @@ -196,13 +191,18 @@ script: | echo $'[build_ext]\ncompiler=mingw32' > setup.cfg LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. - # + # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py + # file. + find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" + + # Building Parsley tar xzf parsley.tar.gz cd Parsley-* find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # + + # Building txsocksx cd txsocksx find -type f | xargs touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get @@ -212,10 +212,8 @@ script: | mkdir vcversioner-1.14.1.1-py2.7.egg LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - # + + # Building obfsproxy cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe @@ -225,24 +223,19 @@ script: | mkdir -p $INSTDIR/Docs/Obfsproxy cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # - 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 - make install - cd .. - # + + # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. - # + # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py + # file. find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - # + + # Building flashproxy cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" @@ -251,7 +244,8 @@ script: | mkdir -p $INSTDIR/Docs/FlashProxy cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. - # + + # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp cp -a $INSTDIR/gmp/bin/libgmp-*.dll . @@ -262,7 +256,8 @@ script: | cp -an {LICENSE,README.md} $INSTDIR/Docs/libfte cp -an thirdparty/re2/LICENSE $INSTDIR/Docs/libfte/LICENSE.re2 cd .. - # + + # Building fteproxy cd fteproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe @@ -275,10 +270,11 @@ script: | mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. - # + # http://bugs.winehq.org/show_bug.cgi?id=3591 cp -a $INSTDIR/python/python27.dll $PTDIR/ - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Docs/ cp pluggable-transports-win32-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index abfd8bb..19c4acd 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -43,7 +43,7 @@ script: | export TZ=UTC export LC_ALL=C umask 0022 - # + mkdir -p $INSTDIR/bin/ mkdir -p $INSTDIR/Tor/ mkdir -p $INSTDIR/Data/Tor/ @@ -58,7 +58,8 @@ script: | # See the we-need-only-the-binutils-comment in gitian-utils.yml for the # reasoning behind the "mingw-w64" dir instead of an expected "binutils" one. export PATH=$INSTDIR/mingw-w64/bin:$PATH - # + + # Building tor cd tor git update-index --refresh -q export GIT_COMMITTER_NAME="nobody" @@ -98,7 +99,8 @@ script: | # XXX: Geoip files.. cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/Tor/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/Tor/ - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh tor-win32-gbuilt.zip Tor/ Data/ cp tor-win32-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 4e321a0..530e716 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -30,6 +30,7 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" +- "gmp.tar.bz2" - "versions" - "dzip.sh" script: | @@ -135,11 +136,20 @@ script: | make install cd .. + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared + make + make install + cd .. + # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent ~/build/dzip.sh openssl-$OPENSSL_VER-win32-utils.zip openssl - + ~/build/dzip.sh gmp-$GMP_VER-win32-utils.zip gmp cp *-utils.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 992a23a..330e475 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -105,7 +105,9 @@ if [ ! -f inputs/openssl-$OPENSSL_VER-linux32-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 ]; + ! -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 echo echo "****** Starting Utilities Component of Linux Bundle (1/5 for Linux) ******" @@ -128,6 +130,8 @@ then 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 .. #cp -a result/utils-linux-res.yml inputs/ else @@ -145,6 +149,8 @@ else 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 .. fi diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index fb1d32f..e852989 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -106,7 +106,8 @@ fi cd $GITIAN_DIR if [ ! -f inputs/openssl-$OPENSSL_VER-mac32-utils.zip -o \ - ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip ]; + ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip -o \ + ! -f inputs/gmp-$GMP_VER-mac32-utils.zip ]; then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Max) ******" @@ -122,6 +123,7 @@ then cp -a ../build/out/*-utils.zip . ln -sf openssl-$OPENSSL_VER-mac32-utils.zip openssl-mac32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip libevent-mac32-utils.zip + ln -sf gmp-$GMP_VER-mac32-utils.zip gmp-mac32-utils.zip cd .. #cp -a result/utils-mac-res.yml inputs/ else @@ -134,6 +136,7 @@ else cd inputs ln -sf openssl-$OPENSSL_VER-mac32-utils.zip openssl-mac32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip libevent-mac32-utils.zip + ln -sf gmp-$GMP_VER-mac32-utils.zip gmp-mac32-utils.zip cd .. fi diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 198fe87..ecabeae 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -104,7 +104,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/mingw-w64-$GCC_VER-win32-utils.zip -o \ ! -f inputs/zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ - ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip ]; + ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip -o \ + ! -f inputs/gmp-$GMP_VER-win32-utils.zip ]; then echo echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" @@ -124,6 +125,7 @@ then ln -sf zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip zlib-win32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip libevent-win32-utils.zip ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip + ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -138,6 +140,7 @@ else ln -sf zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip zlib-win32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip libevent-win32-utils.zip ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip + ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip cd .. fi

1 0

[tor-browser-bundle/master] Rebased Yawning's patch against latest tor master.
by gk＠torproject.org 21 May '14

21 May '14

commit 175b010a0c84e55947e759c63606b224d38bafce Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 21 10:14:02 2014 +0000 Rebased Yawning's patch against latest tor master. --- gitian/patches/bug8402-master.patch | 75 +++++++++-------------------------- 1 file changed, 18 insertions(+), 57 deletions(-) diff --git a/gitian/patches/bug8402-master.patch b/gitian/patches/bug8402-master.patch index d5e7b37..5a6386a 100644 --- a/gitian/patches/bug8402-master.patch +++ b/gitian/patches/bug8402-master.patch @@ -1,4 +1,4 @@ -From 2c9bcdf79a9ba98b79feba10a8000f5609de36e6 Mon Sep 17 00:00:00 2001 +From 9d7410ac5837658efa9b2d7d85c0c71f09a7a759 Mon Sep 17 00:00:00 2001 From: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue, 25 Mar 2014 07:21:22 +0000 Subject: [PATCH 1/5] Allow ClientTransportPlugins to use proxies @@ -9,38 +9,18 @@ pluggable transport specification. This fixes bug #8402. --- - src/or/config.c | 24 +++++++---- + src/or/config.c | 13 ++++-- src/or/connection.c | 62 +++++++++++++++++++++-------- src/or/transports.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/transports.h | 6 +++ src/test/test_pt.c | 81 +++++++++++++++++++++++++++++++++++++ - 5 files changed, 258 insertions(+), 27 deletions(-) + 5 files changed, 251 insertions(+), 23 deletions(-) diff --git a/src/or/config.c b/src/or/config.c -index 1faf138..614e779 100644 +index 0f7b1d2..b33098e 100644 --- a/src/or/config.c +++ b/src/or/config.c -@@ -536,7 +536,9 @@ static int options_transition_affects_descriptor( - const or_options_t *old_options, const or_options_t *new_options); - static int check_nickname_list(char **lst, const char *name, char **msg); - --static int parse_client_transport_line(const char *line, int validate_only); -+static int parse_client_transport_line(const or_options_t *options, -+ const char *line, -+ int validate_only); - - static int parse_server_transport_line(const char *line, int validate_only); - static char *get_bindaddr_from_transport_listen_line(const char *line, -@@ -1426,7 +1428,7 @@ options_act(const or_options_t *old_options) - pt_prepare_proxy_list_for_config_read(); - if (options->ClientTransportPlugin) { - for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { -- if (parse_client_transport_line(cl->value, 0)<0) { -+ if (parse_client_transport_line(options, cl->value, 0)<0) { - log_warn(LD_BUG, - "Previously validated ClientTransportPlugin line " - "could not be added!"); -@@ -3169,11 +3171,11 @@ options_validate(or_options_t *old_options, or_options_t *options, +@@ -3174,11 +3174,11 @@ options_validate(or_options_t *old_options, or_options_t *options, } } @@ -55,26 +35,7 @@ index 1faf138..614e779 100644 /* Check if the proxies will give surprising behavior. */ if (options->HTTPProxy && !(options->Socks4Proxy || -@@ -3284,7 +3286,7 @@ options_validate(or_options_t *old_options, or_options_t *options, - } - - for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { -- if (parse_client_transport_line(cl->value, 1)<0) -+ if (parse_client_transport_line(options, cl->value, 1)<0) - REJECT("Transport line did not parse. See logs for details."); - } - -@@ -4734,7 +4736,8 @@ parse_bridge_line(const char *line) - * our internal transport list. - * - If it's a managed proxy line, launch the managed proxy. */ - static int --parse_client_transport_line(const char *line, int validate_only) -+parse_client_transport_line(const or_options_t *options, const char *line, -+ int validate_only) - { - smartlist_t *items = NULL; - int r; -@@ -4825,6 +4828,13 @@ parse_client_transport_line(const char *line, int validate_only) +@@ -4842,6 +4842,13 @@ parse_client_transport_line(const or_options_t *options, pt_kickstart_client_proxy(transport_list, proxy_argv); } } else { /* external */ @@ -89,7 +50,7 @@ index 1faf138..614e779 100644 log_warn(LD_CONFIG, "You can't have an external proxy with " "more than one transports."); diff --git a/src/or/connection.c b/src/or/connection.c -index 3cc4e09..a9c5596 100644 +index cef9172..b32cddf 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -86,6 +86,8 @@ static int connection_read_https_proxy_response(connection_t *conn); @@ -517,10 +478,10 @@ index f71627d..788d420 100644 }; -- -2.0.0.rc0 +2.0.0.rc2 -From d1f3631335cc2757e2319055348a1614a00fa7b2 Mon Sep 17 00:00:00 2001 +From 92eecbfee128b22b07bcc97ac36ecdd5183c2da7 Mon Sep 17 00:00:00 2001 From: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon, 14 Apr 2014 21:51:34 +0000 Subject: [PATCH 2/5] Fixed the test build with --enable-gcc-warnings @@ -609,10 +570,10 @@ index 788d420..cfbd084 100644 done: if (uri) -- -2.0.0.rc0 +2.0.0.rc2 -From e2b63cda85ba08b1675c7cf376d21700ca34bcf5 Mon Sep 17 00:00:00 2001 +From 8361223c10eb929b570e72853a5d9e51b67fd6c3 Mon Sep 17 00:00:00 2001 From: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu, 1 May 2014 03:30:09 +0000 Subject: [PATCH 3/5] Remove get_bridge_pt_addrport(). @@ -629,7 +590,7 @@ being used, it is PT/proxy-less. 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c -index a9c5596..4bb2683 100644 +index b32cddf..ff8cdf1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -86,8 +86,6 @@ static int connection_read_https_proxy_response(connection_t *conn); @@ -708,10 +669,10 @@ index a9c5596..4bb2683 100644 tor_addr_make_unspec(addr); -- -2.0.0.rc0 +2.0.0.rc2 -From ae0174c6e1da1051403c51fa881f66d57cc22acd Mon Sep 17 00:00:00 2001 +From 68184b317d3f4dc14e758e451377e4e3996bd0ab Mon Sep 17 00:00:00 2001 From: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu, 1 May 2014 03:43:53 +0000 Subject: [PATCH 4/5] Log the correct proxy type on failure. @@ -724,7 +685,7 @@ config. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c -index 4bb2683..cfa6ee5 100644 +index ff8cdf1..5069ed6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4841,7 +4841,7 @@ log_failed_proxy_connection(connection_t *conn) @@ -737,10 +698,10 @@ index 4bb2683..cfa6ee5 100644 } -- -2.0.0.rc0 +2.0.0.rc2 -From 378e6f7f8521ed0c35dc1afc91840117713498fb Mon Sep 17 00:00:00 2001 +From 34200a44fbbd3f158ea17043c2bcd21d0e382b89 Mon Sep 17 00:00:00 2001 From: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu, 1 May 2014 18:58:53 +0000 Subject: [PATCH 5/5] Improve the log message when a transport doesn't support @@ -767,5 +728,5 @@ index b810315..eee159d 100644 break; } -- -2.0.0.rc0 +2.0.0.rc2

1 0

[tor-browser-bundle/master] Bug 10120: Part 3: Refactor Mac descriptors.
by gk＠torproject.org 15 May '14

15 May '14

commit e0ef86ec6822abfb17554defaf287e926f3a8206 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 15 14:23:43 2014 +0000 Bug 10120: Part 3: Refactor Mac descriptors. We build the tools needed for the Mac descriptors separately and preserve them. This does not include the tools in the Pluggable Transports descriptor. Using our newly built OpenSSL there, e.g., will happen in an other commit. --- gitian/descriptors/mac/gitian-tor.yml | 76 +++++------------- gitian/descriptors/mac/gitian-utils.yml | 70 +++++++++++++++++ gitian/mkbundle-mac.sh | 131 +++++++++++++++++++------------ 3 files changed, 170 insertions(+), 107 deletions(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 68905e7..b8a761b 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -13,18 +13,12 @@ packages: - "automake" - "faketime" - "libtool" -#- "libssl0.9.8" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" "dir": "tor" -- "url": "https://github.com/libevent/libevent.git" - "dir": "libevent" -- "url": "https://github.com/madler/zlib.git" - "dir": "zlib" files: - "versions" -- "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" - "bug9229.patch" @@ -37,63 +31,32 @@ files: - "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" -#- "apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb" -#- "apple-x86-odcctools_758.159-0flosoft11_i386.deb" +- "openssl-mac32-utils.zip" +- "libevent-mac32-utils.zip" script: | INSTDIR="$HOME/install" source versions - export LIBRARY_PATH="$INSTDIR/lib" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 # - #export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" - #export CXXFLAGS=$CFLAGS - #export LDFLAGS=$CFLAGS - export PATH="$PATH:/usr/apple-osx/bin/" - export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - # mkdir -p $INSTDIR/bin/ mkdir -p $INSTDIR/TorBrowserBundle.app/Tor/ mkdir -p $INSTDIR/TorBrowserBundle.app/Data/Tor/ mkdir -p $OUTDIR/ # sudo dpkg -i *.deb - cd /usr - sudo tar -Jxvf /home/ubuntu/build/multiarch-darwin*tar.xz - cd ~/build - # For OpenSSL - sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc - # - #cd zlib - #find -type f | xargs touch --date="$REFERENCE_DATETIME" - #make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib PREFIX=i686-apple-darwin10- $MAKEOPTS SHARED_MODE=1 - #make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib PREFIX=i686-apple-darwin10- $MAKEOPTS SHARED_MODE=1 install - #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/Tor/ - #cd .. - # - tar xzf openssl.tar.gz - cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl #enable-ec_nistp_64_gcc_128 - make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" - make install - #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ - cd .. - # - cd libevent - ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent - make $MAKEOPTS - make install + tar xaf multiarch-darwin*tar.xz + export PATH="$PATH:$HOME/build/apple-osx/bin/" + unzip -d $INSTDIR openssl-mac32-utils.zip + unzip -d $INSTDIR libevent-mac32-utils.zip cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` - cd .. # + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor git update-index --refresh -q export GIT_COMMITTER_NAME="nobody" @@ -118,22 +81,19 @@ script: | fi fi mkdir -p $OUTDIR/src - git archive HEAD | tar -x -C $OUTDIR/src + #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --enable-static-openssl --disable-asciidoc --host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ + ./configure --enable-static-openssl --disable-asciidoc --host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR make $MAKEOPTS make install - cd .. - cp $INSTDIR/bin/tor $INSTDIR/TorBrowserBundle.app/Tor/ - cp $INSTDIR/share/tor/geoip $INSTDIR/TorBrowserBundle.app/Data/Tor/ - cd $INSTDIR/TorBrowserBundle.app/Tor/ - i686-apple-darwin11-install_name_tool -change /home/ubuntu/install/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + cd $INSTDIR + cp bin/tor TorBrowserBundle.app/Tor/ + cp share/tor/geoip TorBrowserBundle.app/Data/Tor/ + cd TorBrowserBundle.app/Tor/ + i686-apple-darwin11-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor # XXX: Geoip files.. # - #cp -a /usr/lib/gcc/i686-apple-darwin10/4.6/libgcc_s_sjlj-1.dll $INSTDIR/Tor/ - #cp -a /usr/lib/gcc/i686-apple-darwin10/4.6/libssp*.dll $INSTDIR/Tor/ - # cd $INSTDIR - ~/build/dzip.sh tor-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app - cp tor-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/ + ~/build/dzip.sh tor-mac32-gbuilt.zip TorBrowserBundle.app + cp tor-mac32-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml new file mode 100644 index 0000000..1caf8f0 --- /dev/null +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -0,0 +1,70 @@ +--- +name: "utils-mac" +suites: +- "precise" +architectures: +- "i386" +packages: +- "git-core" +- "unzip" +- "zip" +- "autoconf" +- "autoconf2.13" +- "automake" +- "faketime" +- "libtool" +reference_datetime: "2000-01-01 00:00:00" +remotes: +- "url": "https://github.com/libevent/libevent.git" + "dir": "libevent" +files: +- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" +- "openssl.tar.gz" +- "versions" +- "dzip.sh" +script: | + INSTDIR="$HOME/install" + source versions + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME + export TZ=UTC + export LC_ALL=C + umask 0022 + + sudo dpkg -i *.deb + tar xaf multiarch-darwin*tar.xz + export PATH="$PATH:$HOME/build/apple-osx/bin/" + # For OpenSSL + ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc + + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + + # Building Libevent + cd libevent + ./autogen.sh + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + make $MAKEOPTS + make install + cd .. + + # Building OpenSSL + tar xzf openssl.tar.gz + cd openssl-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. + ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl + # Using $MAKEOPTS breaks the build. Might be the issue mentioned on + # http://cblfs.cross-lfs.org/index.php/OpenSSL. + make + make install + cd .. + + # Grabbing the results + cd $INSTDIR + ~/build/dzip.sh openssl-$OPENSSL_VER-mac32-utils.zip openssl + ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac32-utils.zip libevent + + cp *utils.zip $OUTDIR/ diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index d34002d..fb1d32f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -42,7 +42,7 @@ fi cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-MacOS\");" > $GITIAN_DIR/inputs/torbrowser.version +echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-MacOS\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions @@ -51,7 +51,7 @@ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/ +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/ cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip @@ -79,6 +79,11 @@ die_msg() { exit 1 } +# Let's preserve the original $FOO for creating proper symlinks after building +# the utils both if we verify tags and if we don't. + +LIBEVENT_TAG_ORIG=$LIBEVENT_TAG + if [ "z$VERIFY_TAGS" = "z1" ]; then ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || die_msg "You should run 'make prep' to ensure your inputs are up to date" @@ -100,32 +105,64 @@ fi cd $GITIAN_DIR -if [ ! -f $GITIAN_DIR/inputs/tor-mac32-gbuilt.zip ]; +if [ ! -f inputs/openssl-$OPENSSL_VER-mac32-utils.zip -o \ + ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip ]; +then + echo + echo "****** Starting Utilities Component of Mac Bundle (1/5 for Max) ******" + echo + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + if [ $? -ne 0 ]; + then + #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S` + exit 1 + fi + + cd inputs + cp -a ../build/out/*-utils.zip . + ln -sf openssl-$OPENSSL_VER-mac32-utils.zip openssl-mac32-utils.zip + ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip libevent-mac32-utils.zip + cd .. + #cp -a result/utils-mac-res.yml inputs/ +else + echo + echo "****** SKIPPING already built Utilities Component of Mac Bundle (1/5 for + Mac) ******" + echo + # We might have built the utilities in the past but maybe the links are + # pointing to the wrong version. Refresh them. + cd inputs + ln -sf openssl-$OPENSSL_VER-mac32-utils.zip openssl-mac32-utils.zip + ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip libevent-mac32-utils.zip + cd .. +fi + +if [ ! -f inputs/tor-mac32-gbuilt.zip ]; then - echo - echo "****** Starting Tor Component of Mac Bundle (1/4 for Mac) ******" - echo + echo + echo "****** Starting Tor Component of Mac Bundle (2/5 for Mac) ******" + echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit 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` exit 1 fi - - cp -a build/out/tor-mac*-gbuilt.zip $GITIAN_DIR/inputs/ - #cp -a result/tor-mac-res.yml $GITIAN_DIR/inputs/ + + cp -a build/out/tor-mac*-gbuilt.zip inputs/ + #cp -a result/tor-mac-res.yml inputs/ else - echo - echo "****** SKIPPING already built Tor Component of Mac Bundle (1/4 for Mac) ******" - echo + echo + echo "****** SKIPPING already built Tor Component of Mac Bundle (2/5 for Mac) ******" + echo fi -if [ ! -f $GITIAN_DIR/inputs/tor-browser-mac32-gbuilt.zip ]; +if [ ! -f inputs/tor-browser-mac32-gbuilt.zip ]; then - echo - echo "****** Starting TorBrowser Component of Mac Bundle (2/4 for Mac) ******" - echo + echo + echo "****** Starting TorBrowser Component of Mac Bundle (3/5 for Mac) ******" + echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml if [ $? -ne 0 ]; @@ -134,19 +171,19 @@ then exit 1 fi - cp -a build/out/tor-browser-mac*-gbuilt.zip $GITIAN_DIR/inputs/ - #cp -a result/torbrowser-mac-res.yml $GITIAN_DIR/inputs/ + cp -a build/out/tor-browser-mac*-gbuilt.zip inputs/ + #cp -a result/torbrowser-mac-res.yml inputs/ else - echo - echo "****** SKIPPING already built TorBrowser Component of Mac Bundle (2/4 for Mac) ******" - echo + echo + echo "****** SKIPPING already built TorBrowser Component of Mac Bundle (3/5 for Mac) ******" + echo fi -if [ ! -f $GITIAN_DIR/inputs/pluggable-transports-mac32-gbuilt.zip ]; +if [ ! -f inputs/pluggable-transports-mac32-gbuilt.zip ]; then - echo - echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" - echo + echo + echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" + echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; @@ -155,44 +192,40 @@ then exit 1 fi - cp -a build/out/pluggable-transports-mac*-gbuilt.zip $GITIAN_DIR/inputs/ - #cp -a result/pluggable-transports-mac-res.yml $GITIAN_DIR/inputs/ + cp -a build/out/pluggable-transports-mac*-gbuilt.zip inputs/ + #cp -a result/pluggable-transports-mac-res.yml inputs/ else - echo - echo "****** SKIPPING already built Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" - echo + echo + echo "****** SKIPPING already built Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" + echo fi -if [ ! -f $GITIAN_DIR/inputs/bundle-mac.gbuilt ]; -then - echo - echo "****** Starting Bundling+Localization Component of Mac Bundle (4/4 for Mac) ******" - echo - +if [ ! -f inputs/bundle-mac.gbuilt ]; +then + echo + echo "****** Starting Bundling+Localization Component of Mac Bundle (5/5 for Mac) ******" + echo + cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` exit 1 fi - - #cp -a build/out/*.dmg $WRAPPER_DIR + mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - touch $GITIAN_DIR/inputs/bundle-mac.gbuilt + touch inputs/bundle-mac.gbuilt else - echo - echo "****** SKIPPING already built Bundling+Localization Component of Mac Bundle (4/4 for Mac) ******" - echo + echo + echo "****** SKIPPING already built Bundling+Localization Component of Mac Bundle (5/5 for Mac) ******" + echo fi -echo +echo echo "****** Mac Bundle complete ******" -echo - - -# FIXME: docs +echo

1 0

[tor-browser-bundle/master] Bug 11919: Avoid console window popping up.
by gk＠torproject.org 13 May '14

13 May '14

commit 75b64c8cbc39c7bed5a1865d978bceb2cc041302 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 13 12:04:17 2014 +0000 Bug 11919: Avoid console window popping up. This is a regression due to c67075a87a05505d083a648a47adfbba46f79eff. --- gitian/descriptors/windows/gitian-tor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 3263b48..abfd8bb 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -84,6 +84,9 @@ script: | fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src + # Let's avoid the console window popping up. + export CFLAGS="-mwindows" + export LDFLAGS="-mwindows" ./autogen.sh find -type f | xargs touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/

1 0

[tor-browser-bundle/master] Bug 11629: Merge changes due to fteproxy 0.2.14.
by gk＠torproject.org 11 May '14

11 May '14

commit 682f8f4d26d7df1b49a23c40dd7e7ca18f44ab90 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 11 20:27:21 2014 +0000 Bug 11629: Merge changes due to fteproxy 0.2.14. --- .../PTConfigs/linux/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- .../linux/gitian-pluggable-transports.yml | 14 +++++++++-- .../mac/gitian-pluggable-transports.yml | 14 +++++++++-- .../windows/gitian-pluggable-transports.yml | 25 +++++++++++++------- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/verify-tags.sh | 1 + gitian/versions | 7 +++--- gitian/versions.alpha | 5 ++-- gitian/versions.beta | 3 ++- gitian/versions.nightly | 3 ++- 14 files changed, 58 insertions(+), 25 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0f621e..87108bd 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,5 +1,5 @@ ## fteproxy configuration -ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index e1ada73..7c6e6a5 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -1,5 +1,5 @@ ## fteproxy configuration -ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed +ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 25109b8..eb9ca16 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -23,6 +23,8 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/libfte.git" + "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" "dir": "fteproxy" - "url": "https://github.com/habnabit/txsocksx.git" @@ -163,12 +165,20 @@ script: | cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # - cd fteproxy + cd libfte ln -s $INSTDIR/gmp thirdparty/gmp find -type f | xargs touch --date="$REFERENCE_DATETIME" make - cp -a bin/fteproxy $PTDIR/ cp -ra fte $PTDIR/ + mkdir -p $INSTDIR/Docs/libfte + cp -a {LICENSE,README.md} $INSTDIR/Docs/libfte + cp -a thirdparty/re2/LICENSE $INSTDIR/Docs/libfte/LICENSE.re2 + cd .. + # + cd fteproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + cp -a bin/fteproxy $PTDIR/fteproxy.bin + cp -ra fteproxy $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 6895c87..48521d8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -23,6 +23,8 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/libfte.git" + "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" "dir": "fteproxy" - "url": "https://github.com/habnabit/txsocksx.git" @@ -189,11 +191,19 @@ script: | cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cd .. # - cd fteproxy + cd libfte find -type f | xargs touch --date="$REFERENCE_DATETIME" CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make - cp -a bin/fteproxy $PTDIR/ cp -ra fte $PTDIR/ + mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/libfte + cp -a {LICENSE,README.md} $INSTDIR/TorBrowserBundle.app/Docs/libfte + cp -an thirdparty/re2/LICENSE $INSTDIR/TorBrowserBundle.app/Docs/libfte/LICENSE.re2 + cd .. + # + cd fteproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + cp -a bin/fteproxy $PTDIR/fteproxy.bin + cp -ra fteproxy $PTDIR/ mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/fteproxy cp -a {COPYING,README.md} $INSTDIR/TorBrowserBundle.app/Docs/fteproxy cd .. diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index f1505bb..1637b23 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -24,6 +24,8 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/libfte.git" + "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" "dir": "fteproxy" - "url": "https://github.com/habnabit/txsocksx.git" @@ -250,21 +252,26 @@ script: | cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # - cd fteproxy + cd libfte ln -s $INSTDIR/gmp thirdparty/gmp cp -a $INSTDIR/gmp/bin/libgmp-*.dll . find -type f | xargs touch --date="$REFERENCE_DATETIME" - WINDOWS_BUILD=1 CROSS_COMPILE=1 make thirdparty/re2/obj/libre2.a - LD_PRELOAD= $INSTPYTHON setup_tbb.py build_ext -c mingw32 + LD_PRELOAD= WINDOWS_BUILD=1 CROSS_COMPILE=1 PYTHON=$INSTPYTHON make + LD_PRELOAD= $INSTPYTHON setup.py install + mkdir -p $INSTDIR/Docs/libfte + cp -an {LICENSE,README.md} $INSTDIR/Docs/libfte + cp -an thirdparty/re2/LICENSE $INSTDIR/Docs/libfte/LICENSE.re2 + cd .. + # + cd fteproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $PTDIR/fte - cp -a fte/VERSION $PTDIR/fte - mkdir -p $PTDIR/fte/defs - cp -a fte/defs/*.json $PTDIR/fte/defs - mkdir -p $PTDIR/fte/tests/dfas - cp -a fte/tests/dfas/{*.dfa,*.regex} $PTDIR/fte/tests/dfas + mkdir -p $PTDIR/fteproxy + cp -a fteproxy/VERSION $PTDIR/fteproxy + mkdir -p $PTDIR/fteproxy/defs + cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c89d340..77356d7 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -307,6 +307,7 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR 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 +libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG txsocksx https://github.com/habnabit/txsocksx.git $TXSOCKSX_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 574f578..992a23a 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -202,7 +202,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_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 a7752a9..d34002d 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -148,7 +148,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_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 dcb9012..198fe87 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -189,7 +189,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_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` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index e5e9f3f..324a27a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -106,6 +106,7 @@ while read dir commit; do check_git_hash "$dir" "$commit" done << EOF libdmg-hfsplus $LIBDMG_TAG +libfte $LIBFTE_TAG fteproxy $FTEPROXY_TAG txsocksx $TXSOCKSX_TAG EOF diff --git a/gitian/versions b/gitian/versions index b5410b3..a9e033f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,10 +15,11 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +PYPTLIB_TAG=pyptlib-0.0.6 +OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 +LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 +FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3ca3442..702c1e4 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,9 +16,10 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.8 +OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.13 +LIBFTE_TAG=0.0.2 +FTEPROXY_TAG=0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.beta b/gitian/versions.beta index cafe6da..817a880 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -18,7 +18,8 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 +LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 +FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8238aa6..03f4f2f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -18,7 +18,8 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master -FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 +LIBFTE_TAG=master +FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0

[tor-browser-bundle/master] Include Docs/ pluggable-transports-win32-gbuilt.zip.
by gk＠torproject.org 09 May '14

09 May '14

commit dc9fb94873d8e0b7eff7a99ff177c666d91ab1cd Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 8 11:45:00 2014 -0700 Include Docs/ pluggable-transports-win32-gbuilt.zip. Pluggable transport docs were missing on windows. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index cf7595e..3fdaf85 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -274,5 +274,5 @@ script: | cp -a $INSTDIR/python/python27.dll $PTDIR/ # cd $INSTDIR - ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Data/ + ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Data/ Docs/ cp pluggable-transports-win32-gbuilt.zip $OUTDIR/

1 0

[tor-browser-bundle/master] No need for a Data/ directory here.
by gk＠torproject.org 09 May '14

09 May '14

commit 43a8ecaf1ca987cd02bf2c46f8886749d4986773 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 9 09:39:08 2014 +0000 No need for a Data/ directory here. --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 3fdaf85..f1505bb 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -73,10 +73,9 @@ script: | #export CFLAGS="-mwindows -fstack-protector-all -fPIE -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security" #export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/" umask 0022 - # + # mkdir -p $INSTDIR/bin/ mkdir -p $PTDIR/ - mkdir -p $INSTDIR/Data/Tor/ mkdir -p $OUTDIR/ # # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. @@ -274,5 +273,5 @@ script: | cp -a $INSTDIR/python/python27.dll $PTDIR/ # cd $INSTDIR - ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Data/ Docs/ + ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Docs/ cp pluggable-transports-win32-gbuilt.zip $OUTDIR/

1 0