[tbb-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'erinn/tbb-4.x-hardening'

[mikeperry at torproject.org]

commit 393ac6898933fc17d31edb6be518ca8c957c6034
Merge: 59cb26c e92aa0a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Aug 29 15:11:04 2014 -0700

    Merge remote-tracking branch 'erinn/tbb-4.x-hardening'

 gitian/build-helpers/i686-w64-mingw32-g++          |    2 +-
 gitian/build-helpers/i686-w64-mingw32-gcc          |    2 +-
 gitian/build-helpers/i686-w64-mingw32-ld           |    7 +-
 gitian/build-helpers/wine-wrappers/dllwrap.py      |    2 +-
 gitian/build-helpers/wine-wrappers/g++.py          |    2 +-
 gitian/build-helpers/wine-wrappers/gcc.py          |    2 +-
 gitian/descriptors/windows/gitian-firefox.yml      |   24 +--
 .../windows/gitian-pluggable-transports.yml        |   12 +-
 gitian/descriptors/windows/gitian-tor.yml          |   18 +-
 gitian/descriptors/windows/gitian-utils.yml        |   24 ++-
 gitian/mkbundle-windows.sh                         |    6 +-
 gitian/patches/enable-reloc-section-ld.patch       |  216 ++++++++++++++++++++
 12 files changed, 264 insertions(+), 53 deletions(-)

diff --cc gitian/descriptors/windows/gitian-firefox.yml
index 4ea551f,0968911..d6a6756
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@@ -69,19 -72,12 +71,12 @@@ script: 
    find -type f | xargs touch --date="$REFERENCE_DATETIME"
    rm -f configure
    rm -f js/src/configure
 -  make -f client.mk configure
 +  make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}"
    find -type f | xargs touch --date="$REFERENCE_DATETIME"
    #
-   # FIXME: MinGW doens't like being built with hardening, and Firefox doesn't
-   # like being configured with it
-   # XXX: These changes cause the exes to crash on launch.
-   #mkdir -p ~/build/bin/
-   #cp ~/build/i686* ~/build/bin/
-   #export PATH=~/build/bin:$PATH
-   # XXX: the path to ld is hardcoded in mingw.. This forces gcc's linking to
-   # use our flags:
-   #sudo mv /usr/bin/i686-w64-mingw32-ld /usr/bin/i686-w64-mingw32-ld.orig
-   #sudo cp ~/build/bin/i686-w64-mingw32-ld /usr/bin/
+   mkdir -p ~/build/bin/
+   cp ~/build/i686* ~/build/bin/
+   export PATH=~/build/bin:$PATH
    #
    make $MAKEOPTS -f client.mk build
    #