[tor-browser-bundle/master] Bug 11629: Merge changes due to fteproxy 0.2.14. - tbb-commits

11 May 2014

commit 682f8f4d26d7df1b49a23c40dd7e7ca18f44ab90
Author: Georg Koppen gk@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

    