May 2014 - tbb-commits - lists.torproject.org

[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] 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

[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] Install fteproxy docs to the right place in the mac descriptor.
by gk＠torproject.org 09 May '14

09 May '14

commit f7e0b712fcd54503a8a421eaa1b363183b67482d Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 8 11:54:54 2014 -0700 Install fteproxy docs to the right place in the mac descriptor. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index df73197..6895c87 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -194,8 +194,8 @@ script: | 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/Docs/fteproxy - cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy + mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/fteproxy + cp -a {COPYING,README.md} $INSTDIR/TorBrowserBundle.app/Docs/fteproxy cd .. # cd $INSTDIR

1 0

[tor-browser-bundle/master] Go back to tag 0.2.13 as FTE master is broken.
by gk＠torproject.org 08 May '14

08 May '14

commit 20f5b691785566fe6b227d7e716f26eaf7cac151 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 8 20:27:46 2014 +0000 Go back to tag 0.2.13 as FTE master is broken. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 93ee6a7..8238aa6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master -FTEPROXY_TAG=master +FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0

[tor-browser-bundle/master] Don't break stable and beta due to c67075a.
by gk＠torproject.org 08 May '14

08 May '14

commit 62590be461bf88c0d8f4cc7ed86d83ae360df075 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 8 15:14:01 2014 +0000 Don't break stable and beta due to c67075a. --- gitian/versions | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 8f939f7..b5410b3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -6,7 +6,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 diff --git a/gitian/versions.beta b/gitian/versions.beta index 1f30a41..cafe6da 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -6,7 +6,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0

1 0

[tor-browser-bundle/master] Bug 10120: Part 2: Refactor Windows descriptors.
by gk＠torproject.org 08 May '14

08 May '14

commit c67075a87a05505d083a648a47adfbba46f79eff Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 8 14:08:20 2014 +0000 Bug 10120: Part 2: Refactor Windows descriptors. We build the tools needed for the Windows descriptors separately and preserve them. This does not (yet) include the tools in the Pluggable Transports descriptor which will happen in an other commit. --- gitian/descriptors/windows/gitian-firefox.yml | 104 +++--------------- gitian/descriptors/windows/gitian-tor.yml | 62 +++-------- gitian/descriptors/windows/gitian-utils.yml | 145 +++++++++++++++++++++++++ gitian/mkbundle-linux.sh | 10 +- gitian/mkbundle-windows.sh | 141 +++++++++++++++--------- 5 files changed, 272 insertions(+), 190 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index fefb677..94b5eef 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -12,24 +12,18 @@ packages: - "autoconf2.13" - "faketime" - "yasm" -- "mingw-w64" -- "g++-mingw-w64-i686" -- "mingw-w64-tools" -- "libmpc-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -# XXX: we need to make this input tarball deterministic :/ -- "mingw-w64-svn-snapshot.zip" -- "binutils.tar.bz2" -- "gcc.tar.bz2" +- "mingw-w64-win32-utils.zip" - "re-dzip.sh" - "dzip.sh" -- "i686-w64-mingw32-gcc" -- "i686-w64-mingw32-g++" -- "i686-w64-mingw32-ld" +# TODO: Hardening. +#- "i686-w64-mingw32-gcc" +#- "i686-w64-mingw32-g++" +#- "i686-w64-mingw32-ld" - "msvcr100.dll" - "versions" script: | @@ -43,80 +37,14 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $OUTDIR/ - # If we ever find out that the 12.04 mingw is buggy/insufficient: - #sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu raring main restricted universe multiverse" >> /etc/apt/sources.list' - #sudo apt-get update - #sudo apt-get install -y g++-mingw-w64-i686 mingw-w64-tools mingw-w64 - - # Build the latest MinGW-w64 headers, CRT and runtime libraries to get Tor - # Browser going on all Windows platforms >= XP. In order to do so we link - # against msvcr100 (which we ship with the browser) as msvcrt on Windows XP - # does not contain the secure functions Firefox uses. That in turn makes it - # necessary to re-compile the mingw-w64 runtime libraries as well as they are - # linked against msvcrt by default. See bug 9084 for a more detailed - # discussion. - - # FIXME: We need sudo for all of this because otherwise - # the toolchain can't find the alternate prefix for the CRT headers :/ - + unzip -d $INSTDIR mingw-w64-win32-utils.zip + # Make sure our custom mingw gets used. + export PATH=$INSTDIR/mingw-w64/bin:$PATH # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec sed 's/msvcrt/msvcr100/' -i msvcr100.spec - mkdir binutils - cd binutils - tar -xjvf ../binutils.tar.bz2 - sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i binutils-*/ld/pe-dll.c - binutils-*/configure --prefix=/usr --target=i686-w64-mingw32 --disable-multilib - make - sudo make install - cd .. - - mkdir mingw-w64 - cd mingw-w64 - unzip ../mingw-w64-svn-snapshot.zip - # - mkdir mingw-w64-headers32 && cd mingw-w64-headers32 - ../mingw-w64-svn/mingw-w64-headers/configure --host=i686-w64-mingw32 --prefix=/usr/i686-w64-mingw32/ --enable-sdk=all --enable-secure-api --enable-idl - sudo make install - sudo ln -s /usr/i686-w64-mingw32 /usr/mingw - sudo mkdir -p /usr/i686-w64-mingw32/lib - cd .. - cd .. - # First stage of gcc compilation - mkdir gcc - cd gcc - tar -xjvf ../gcc.tar.bz2 - # Linking libgcc against msvcrt is hard-coded... - sed 's/msvcrt/msvcr100/' -i gcc-*/gcc/config/i386/t-mingw-w32 - # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take - # CFLAGS_FOR_TARGET. - export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec" - gcc-*/configure --prefix=/usr --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ - make all-gcc - sudo make install-gcc - cd .. - # - cd mingw-w64 - mkdir mingw-w64-crt32 && cd mingw-w64-crt32 - ../mingw-w64-svn/mingw-w64-crt/configure --host=i686-w64-mingw32 --prefix=/usr/i686-w64-mingw32 - make - sudo make install - cd .. - # - mkdir widl32 && cd widl32 - ../mingw-w64-svn/mingw-w64-tools/widl/configure --prefix=/usr --target=i686-w64-mingw32 - make - sudo make install - cd .. - cd .. - # Second stage of gcc compilation - cd gcc - make - sudo make install - # - cd .. - # + # Building the browser cd tor-browser mv .mozconfig-mingw .mozconfig # FIXME @@ -130,7 +58,7 @@ script: | # is therefore just a workaround which should get fixed but is at least # justified as the signature of _strcmpi and _stricmp is the same, see: # http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. - sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c + sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c export HOST_LDFLAGS=" " export LDFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" # Our flags don't get passed to NSS. We need to do that manually using an @@ -170,14 +98,12 @@ script: | # Stripping again updates the PE header checksums to be correct i686-w64-mingw32-strip $INSTDIR/Browser/gkmedias.dll i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll - # + + # Making the .ja files deterministic and grabbing the results cd $INSTDIR ~/build/re-dzip.sh Browser/omni.ja - if [ -f Browser/webapprt/omni.ja ]; then - ~/build/re-dzip.sh Browser/webapprt/omni.ja - fi - if [ -f Browser/browser/omni.ja ]; then - ~/build/re-dzip.sh Browser/browser/omni.ja - fi + ~/build/re-dzip.sh Browser/webapprt/omni.ja + ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-win32-gbuilt.zip Browser + cp tor-browser-win32-gbuilt.zip $OUTDIR diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index bb6998b..3263b48 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -18,10 +18,6 @@ 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" - "bug10297.patch" @@ -35,60 +31,33 @@ files: - "bug8402-master.patch" - "binutils.tar.bz2" - "dzip.sh" -- "openssl.tar.gz" +- "binutils-win32-utils.zip" +- "openssl-win32-utils.zip" +- "libevent-win32-utils.zip" +- "zlib-win32-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 - # 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 $INSTDIR/Tor/ mkdir -p $INSTDIR/Data/Tor/ - mkdir -p $OUTDIR/ - # - mkdir binutils - cd binutils - tar -xjvf ../binutils.tar.bz2 - sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i binutils-*/ld/pe-dll.c - binutils-*/configure --prefix=/usr --target=i686-w64-mingw32 --disable-multilib - make - sudo make install - cd .. - # - export CFLAGS="-mwindows" - export LDFLAGS="-mwindows" - 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 -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 - make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 install + unzip -d $INSTDIR binutils-win32-utils.zip + unzip -d $INSTDIR zlib-win32-utils.zip + unzip -d $INSTDIR libevent-win32-utils.zip + unzip -d $INSTDIR openssl-win32-utils.zip cp $INSTDIR/zlib/lib/*.dll $INSTDIR/Tor/ - cd .. - # - cd libevent - ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --disable-static --host=i686-w64-mingw32 --prefix=$INSTDIR/libevent - make $MAKEOPTS - make install cp $INSTDIR/libevent/bin/*.dll $INSTDIR/Tor/ - 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 #enable-ec_nistp_64_gcc_128 - make - make install cp $INSTDIR/openssl/bin/*.dll $INSTDIR/Tor/ - cd .. + # Make sure our custom ld gets used. + # 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 # cd tor git update-index --refresh -q @@ -114,7 +83,7 @@ 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 --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ @@ -124,7 +93,6 @@ script: | install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ # 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/ # diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml new file mode 100644 index 0000000..4e321a0 --- /dev/null +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -0,0 +1,145 @@ +--- +name: "utils-windows" +suites: +- "precise" +architectures: +- "i386" +packages: +- "git-core" +- "unzip" +- "zip" +- "autoconf" +- "autoconf2.13" +- "automake" +- "mingw-w64" +- "faketime" +- "libtool" +# XXX: Only needed to dump the spec. +- "g++-mingw-w64-i686" +# Needed for compiling gcc. +- "libmpc-dev" +reference_datetime: "2000-01-01 00:00:00" +remotes: +- "url": "https://github.com/libevent/libevent.git" + "dir": "libevent" +- "url": "https://github.com/madler/zlib.git" + "dir": "zlib" +files: +# XXX: we need to make this input tarball deterministic :/ +- "mingw-w64-svn-snapshot.zip" +- "binutils.tar.bz2" +- "gcc.tar.bz2" +- "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 + + # Building binutils + tar xjf binutils.tar.bz2 + cd binutils* + # XXX: This is needed due to bug 10102. + sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + ./configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib + make $MAKEOPTS + make install + # XXX: We currently do this as we are not using our own compiler but only our + # own binutils for compiling tor. See bug 10077. Nevertheless, we need both + # for cross-compiling Tor Browser. + cd $INSTDIR + ~/build/dzip.sh binutils-$BINUTILS_VER-win32-utils.zip mingw-w64 + # Make sure our ld etc. is found and used. + export PATH=$INSTDIR/mingw-w64/bin:$PATH + cd ~/build + + # Building mingw-w64 + mkdir -p mingw-w64/mingw-w64-headers32 + cd mingw-w64 + unzip ../mingw-w64-svn-snapshot.zip + cd mingw-w64-headers32 + ../mingw-w64-svn/mingw-w64-headers/configure --host=i686-w64-mingw32 --prefix=$INSTDIR/mingw-w64/i686-w64-mingw32 --enable-sdk=all --enable-secure-api --enable-idl + make install + cd .. + cd .. + # First stage of gcc compilation + mkdir gcc + cd gcc + tar -xjvf ../gcc.tar.bz2 + # We don't want to link against msvcrt.dll due to bug 9084. + i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec + sed 's/msvcrt/msvcr100/' -i ~/build/msvcr100.spec + # Linking libgcc against msvcrt is hard-coded... + sed 's/msvcrt/msvcr100/' -i gcc-*/gcc/config/i386/t-mingw-w32 + # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take + # CFLAGS_FOR_TARGET. + export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec" + gcc-*/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ + # XXX: Using $MAKEOPTS (tested with -j4) breaks the build which does not + # happen in a non-gitian environment. This is probably related to bug 11459. + make all-gcc + make install-gcc + cd .. + # + cd mingw-w64 + mkdir mingw-w64-crt32 && cd mingw-w64-crt32 + ../mingw-w64-svn/mingw-w64-crt/configure --host=i686-w64-mingw32 --prefix=$INSTDIR/mingw-w64/i686-w64-mingw32 + make $MAKEOPTS + make install + cd .. + # + mkdir widl32 && cd widl32 + ../mingw-w64-svn/mingw-w64-tools/widl/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 + make $MAKEOPTS + make install + cd .. + cd .. + # Second stage of gcc compilation + cd gcc + make $MAKEOPTS + make install + cd .. + + # Building zlib + export CFLAGS="-mwindows" + export LDFLAGS="-mwindows" + 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 -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 + make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 install + cd .. + + # Building Libevent + cd libevent + ./autogen.sh + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --disable-static --host=i686-w64-mingw32 --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 Windows. + ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --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 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 + + cp *-utils.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 4c9de72..574f578 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -114,7 +114,7 @@ then ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml if [ $? -ne 0 ]; then - #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./utils-fail-linux.log.`date +%Y%m%d%H%M%S` exit 1 fi @@ -129,7 +129,7 @@ then ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip cd .. - #cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/ + #cp -a result/utils-linux-res.yml inputs/ else echo echo "****** SKIPPING already built Utilities Component of Linux Bundle (1/5 for Linux) ******" @@ -164,7 +164,7 @@ then cp -a build/out/tor-linux*-gbuilt.zip inputs/ cp -a build/out/tor-linux*-debug.zip inputs/ - #cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/ + #cp -a result/tor-linux-res.yml inputs/ else echo echo "****** SKIPPING already built Tor Component of Linux Bundle (2/5 for Linux) ******" @@ -188,7 +188,7 @@ then cp -a build/out/tor-browser-linux*-gbuilt.zip inputs/ cp -a build/out/tor-browser-linux*-debug.zip inputs/ - #cp -a result/torbrowser-linux-res.yml $GITIAN_DIR/inputs/ + #cp -a result/torbrowser-linux-res.yml inputs/ else echo echo "****** SKIPPING already built TorBrowser Component of Linux Bundle (3/5 for Linux) ******" @@ -211,7 +211,7 @@ then cp -a build/out/pluggable-transports-linux*-gbuilt.zip inputs/ cp -a build/out/pluggable-transports-linux*-debug.zip inputs/ - #cp -a result/pluggable-transports-linux-res.yml $GITIAN_DIR/inputs/ + #cp -a result/pluggable-transports-linux-res.yml inputs/ else echo echo "****** SKIPPING already built Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index f93fb57..dcb9012 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -17,7 +17,6 @@ fi . $VERSIONS_FILE - WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder DESCRIPTOR_DIR=$PWD/descriptors/ @@ -43,7 +42,7 @@ fi cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Windows\");" > $GITIAN_DIR/inputs/torbrowser.version +echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Windows\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions @@ -53,7 +52,7 @@ cp $WRAPPER_DIR/gpg/ubuntu-wine.gpg $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 @@ -74,6 +73,12 @@ 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 +ZLIB_TAG_ORIG=$ZLIB_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" @@ -95,32 +100,73 @@ fi cd $GITIAN_DIR -if [ ! -f $GITIAN_DIR/inputs/tor-win32-gbuilt.zip ]; +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 ]; then - echo - echo "****** Starting Tor Component of Windows Bundle (1/4 for Windows) ******" - echo + echo + echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" + echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/windows/gitian-utils.yml + if [ $? -ne 0 ]; + then + #mv var/build.log ./utils-fail-win.log.`date +%Y%m%d%H%M%S` + exit 1 + fi + + cd inputs + cp -a ../build/out/*-utils.zip . + ln -sf binutils-$BINUTILS_VER-win32-utils.zip binutils-win32-utils.zip + ln -sf mingw-w64-$GCC_VER-win32-utils.zip mingw-w64-win32-utils.zip + 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 + cd .. + #cp -a result/utils-win-res.yml inputs/ +else + echo + echo "****** SKIPPING already built Utilities Component of Windows Bundle (1/5 for Windows) ******" + 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 binutils-$BINUTILS_VER-win32-utils.zip binutils-win32-utils.zip + ln -sf mingw-w64-$GCC_VER-win32-utils.zip mingw-w64-win32-utils.zip + 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 + cd .. +fi + +if [ ! -f inputs/tor-win32-gbuilt.zip ]; +then + echo + echo "****** Starting Tor Component of Windows Bundle (2/5 for Windows) ******" + echo + + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` exit 1 fi - - cp -a build/out/tor-win32-gbuilt.zip $GITIAN_DIR/inputs/ - #cp -a result/tor-windows-res.yml $GITIAN_DIR/inputs/ + + cp -a build/out/tor-win32-gbuilt.zip inputs/ + #cp -a result/tor-windows-res.yml inputs/ else - echo - echo "****** SKIPPING already built Tor Component of Windows Bundle (1/4 for Windows) ******" - echo + echo + echo "****** SKIPPING already built Tor Component of Windows Bundle (2/5 for Windows) ******" + echo fi -if [ ! -f $GITIAN_DIR/inputs/tor-browser-win32-gbuilt.zip ]; +if [ ! -f inputs/tor-browser-win32-gbuilt.zip ]; then - echo - echo "****** Starting Torbrowser Component of Windows Bundle (2/4 for Windows) ******" - echo + echo + echo "****** Starting Torbrowser Component of Windows Bundle (3/5 for Windows) ******" + echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml if [ $? -ne 0 ]; @@ -129,19 +175,19 @@ then exit 1 fi - cp -a build/out/tor-browser-win32-gbuilt.zip $GITIAN_DIR/inputs/ - #cp -a result/torbrowser-windows-res.yml $GITIAN_DIR/inputs/ + cp -a build/out/tor-browser-win32-gbuilt.zip inputs/ + #cp -a result/torbrowser-windows-res.yml inputs/ else - echo - echo "****** SKIPPING already built Torbrowser Component of Windows Bundle (2/4 for Windows) ******" - echo + echo + echo "****** SKIPPING already built Torbrowser Component of Windows Bundle (3/5 for Windows) ******" + echo fi -if [ ! -f $GITIAN_DIR/inputs/pluggable-transports-win32-gbuilt.zip ]; +if [ ! -f inputs/pluggable-transports-win32-gbuilt.zip ]; then - echo - echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" - echo + echo + 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 if [ $? -ne 0 ]; @@ -150,42 +196,39 @@ then 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/ + cp -a build/out/pluggable-transports-win32-gbuilt.zip inputs/ + #cp -a result/pluggable-transports-windows-res.yml inputs/ else - echo - echo "****** SKIPPING already built Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" - echo + echo + echo "****** SKIPPING already built Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" + echo fi -if [ ! -f $GITIAN_DIR/inputs/bundle-windows.gbuilt ]; -then - echo - echo "****** Starting Bundling+Localization of Windows Bundle (4/4 for Windows) ******" - echo - - cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +if [ ! -f inputs/bundle-windows.gbuilt ]; +then + echo + echo "****** Starting Bundling+Localization of Windows Bundle (5/5 for Windows) ******" + echo + cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S` exit 1 fi - + mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - touch $GITIAN_DIR/inputs/bundle-windows.gbuilt + touch inputs/bundle-windows.gbuilt else - echo - echo "****** SKIPPING Bundling+Localization of Windows Bundle (4/4 for Windows) ******" - echo + echo + echo "****** SKIPPING Bundling+Localization of Windows Bundle (5/5 for Windows) ******" + echo fi -echo +echo echo "****** Windows Bundle complete ******" -echo - -# FIXME: docs +echo

1 0

[tor-browser/tor-browser-24.5.0esr-1] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 08 May '14

08 May '14

commit 5de848c3020ce157c8743af710dea282f22202d4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 8 05:48:10 2014 -0700 fixup! Tor Browser's official .mozconfigs. Bug 11816: We don't need to specify a path to MIDL anymore. --- .mozconfig-mingw | 1 - 1 file changed, 1 deletion(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 2cfcf09..78f9a06 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -1,6 +1,5 @@ #Specify the cross compile export CROSS_COMPILE=1 -export MIDL=/usr/bin/i686-w64-mingw32-widl ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32

1 0