Commit 74bbaa04 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'boklm/bug_27531_v2'

parents 64ef8a5d f79412df
......@@ -22,6 +22,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs
rm -Rf $pydir
[% ELSE -%]
cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper
chmod +x $PTDIR/fteproxy.wrapper
cp -a bin/fteproxy $PTDIR/fteproxy.bin
cp -ra fteproxy $PTDIR/
[% END -%]
......
......@@ -28,3 +28,5 @@ input_files:
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
enable: '[% c("var/windows") %]'
- filename: fteproxy.wrapper
enable: '[% c("var/linux") %]'
#!/bin/sh
basedir=$(dirname "$0")
libdir=$(cd "$basedir"/fteproxy-lib ; pwd)
if test -z "$LD_LIBRARY_PATH"
then
export LD_LIBRARY_PATH="$libdir"
else
export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH"
fi
exec "$basedir/fteproxy.bin" "$@"
......@@ -28,8 +28,8 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %]
export PYTHON=python2
make
cp -ra fte $PTDIR/
mkdir -p $distdir/TorBrowser/Tor
cp /var/tmp/dist/gmp/lib/libgmp.so.10 $distdir/TorBrowser/Tor/
mkdir -p $PTDIR/fteproxy-lib
cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib
[% END -%]
cp -a {LICENSE,README.md} $DOCSDIR/
cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2
......
## fteproxy configuration
ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed
ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed
## obfs4proxy configuration
ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment