[tor-browser-bundle/master] Merge remote-tracking branch 'kpdyer/fte' - tbb-commits

27 Feb 2014

commit 61e89f20a8d8ff5c8eda89526a70ae11769723af
Merge: 7db9add 83a3d0f
Author: Mike Perry mikeperry-git@torproject.org
Date:   Thu Feb 27 13:48:46 2014 -0800
Merge remote-tracking branch 'kpdyer/fte'
Conflicts:
    	gitian/mkbundle-linux.sh
    	gitian/mkbundle-mac.sh
    	gitian/mkbundle-windows.sh
    	gitian/versions.beta
Bundle-Data/beta/linux/torrc-defaults-appendix     |    5 +++
 Bundle-Data/beta/mac/torrc-defaults-appendix       |    5 +++
 Bundle-Data/beta/windows/torrc-defaults-appendix   |    4 ++
 Bundle-Data/mac-tor.sh                             |    1 +
 gitian/build-helpers/wine-wrappers/g++.py          |   39 +++++++++++++++++++
 gitian/build-helpers/wine-wrappers/setup.py        |    2 +-
 .../linux/gitian-pluggable-transports.yml          |   22 +++++++++++
 .../mac/gitian-pluggable-transports.yml            |   28 ++++++++++++-
 .../windows/gitian-pluggable-transports.yml        |   41 +++++++++++++++++++-
 gitian/fetch-inputs.sh                             |    8 ++--
 gitian/gpg/GMP.gpg                                 |  Bin 0 -> 1527 bytes
 gitian/mkbundle-linux.sh                           |    2 +-
 gitian/mkbundle-mac.sh                             |    2 +-
 gitian/mkbundle-windows.sh                         |    2 +-
 gitian/versions.beta                               |    9 ++++-
 15 files changed, 159 insertions(+), 11 deletions(-)
diff --cc gitian/descriptors/windows/gitian-pluggable-transports.yml
index de105b1,c03c46d..48efba5

--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@@ -193,12 -201,32 +212,32 @@@ script: 
    cd flashproxy
    find -type f | xargs touch --date="$REFERENCE_DATETIME"
    make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON"
 -  py2exe_zip_timestomp dist/flashproxy-client/py2exe-flashproxy.zip
 -  cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/
 +  py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip
 +  cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/
    mkdir -p $INSTDIR/Docs/FlashProxy
 -  cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
 +  cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
    cd ..
    #
+   cd fteproxy
+   cp $INSTDIR/gmp/bin/*dll* .
+   cp $INSTDIR/gmp/lib/*dll* .
+   ln -s $INSTDIR/gmp thirdparty/gmp
+   find -type f | xargs touch --date="$REFERENCE_DATETIME"
+   make win32
+   make thirdparty/re2/obj/libre2.a
+   LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace
+   LD_PRELOAD= $INSTPYTHON setup.py py2exe
+   py2exe_zip_timestomp dist/fteproxy.zip
+   mkdir -p $PTDIR/fte
+   mkdir -p $PTDIR/fte/tests
+   cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/
+   cp -an fte/VERSION $PTDIR/fte
+   cp -ran fte/defs $PTDIR/fte
+   cp -ran fte/tests/dfas $PTDIR/fte/tests
+   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/
    #
diff --cc gitian/mkbundle-linux.sh
index c7e730a,d2901d8..34485ae
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@@ -134,7 -129,7 +134,7 @@@ the
    echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******"
    echo
-   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
 -  ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_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,fteproxy=$FTEPROXY_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 --cc gitian/mkbundle-mac.sh
index 6c0fb52,1f5eb18..e8b3aa1
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@@ -131,7 -126,7 +131,7 @@@ the
    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 $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
 -  ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_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,fteproxy=$FTEPROXY_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 --cc gitian/mkbundle-windows.sh
index e6d2cf9,c30ccf1..037b031
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@@ -132,7 -127,7 +132,7 @@@ the
    echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******"
    echo
-   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
 -  ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_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,fteproxy=$FTEPROXY_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 --cc gitian/versions.beta
index 3977261,775d7f9..97bf8ca
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@@ -13,9 -13,10 +13,10 @@@ NSIS_TAG=v0.
  ZLIB_TAG=v1.2.8
  LIBEVENT_TAG=release-2.0.21-stable
  MINGW_REV=6184
- PYPTLIB_TAG=pyptlib-0.0.4
- OBFSPROXY_TAG=obfsproxy-0.2.3
+ PYPTLIB_TAG=pyptlib-0.0.5
+ OBFSPROXY_TAG=obfsproxy-0.2.4
 -FLASHPROXY_TAG=1.4
 +FLASHPROXY_TAG=1.6
+ FTEPROXY_TAG=0.2.6
GITIAN_TAG=tor-browser-builder-3.0-4

    