July 2017 - tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 22499: Add fteproxy, obfsproxy, and dependencies, for Linux
by boklm＠torproject.org 24 Jul '17

24 Jul '17

commit 7ebcf64903bf540504ff96dbe5324284957e1524 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 24 10:47:43 2017 +0200 Bug 22499: Add fteproxy, obfsproxy, and dependencies, for Linux --- keyring/obfsproxy.gpg | Bin 0 -> 2215 bytes keyring/pyptlib.gpg | Bin 0 -> 2215 bytes projects/argparse/build | 16 ++++++++++++++++ projects/argparse/config | 19 +++++++++++++++++++ projects/fteproxy/build | 16 ++++++++++++++++ projects/fteproxy/config | 20 ++++++++++++++++++++ projects/libfte/build | 22 ++++++++++++++++++++++ projects/libfte/config | 23 +++++++++++++++++++++++ projects/obfsproxy/build | 18 ++++++++++++++++++ projects/obfsproxy/config | 22 ++++++++++++++++++++++ projects/parsley/build | 16 ++++++++++++++++ projects/parsley/config | 19 +++++++++++++++++++ projects/pycrypto/build | 24 ++++++++++++++++++++++++ projects/pycrypto/config | 20 ++++++++++++++++++++ projects/pyptlib/build | 16 ++++++++++++++++ projects/pyptlib/config | 21 +++++++++++++++++++++ projects/pyyaml/build | 16 ++++++++++++++++ projects/pyyaml/config | 19 +++++++++++++++++++ projects/twisted/build | 16 ++++++++++++++++ projects/twisted/config | 19 +++++++++++++++++++ projects/txsocksx/build | 21 +++++++++++++++++++++ projects/txsocksx/config | 19 +++++++++++++++++++ projects/zope.interface/build | 16 ++++++++++++++++ projects/zope.interface/config | 19 +++++++++++++++++++ 24 files changed, 417 insertions(+) diff --git a/keyring/obfsproxy.gpg b/keyring/obfsproxy.gpg new file mode 100644 index 0000000..4381baa Binary files /dev/null and b/keyring/obfsproxy.gpg differ diff --git a/keyring/pyptlib.gpg b/keyring/pyptlib.gpg new file mode 100644 index 0000000..4381baa Binary files /dev/null and b/keyring/pyptlib.gpg differ diff --git a/projects/argparse/build b/projects/argparse/build new file mode 100644 index 0000000..938c5e9 --- /dev/null +++ b/projects/argparse/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/argparse.py $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/argparse/config b/projects/argparse/config new file mode 100644 index 0000000..87f80b0 --- /dev/null +++ b/projects/argparse/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 1.2.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/a/argparse/argparse-[% c("version") %].tar.gz' + sha256sum: ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/projects/fteproxy/build b/projects/fteproxy/build new file mode 100644 index 0000000..b33c3a5 --- /dev/null +++ b/projects/fteproxy/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +cp -a bin/fteproxy $PTDIR/fteproxy.bin +cp -ra fteproxy $PTDIR/ +cp -a {COPYING,README.md} $DOCSDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fteproxy/config b/projects/fteproxy/config new file mode 100644 index 0000000..059381b --- /dev/null +++ b/projects/fteproxy/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/kpdyer/fteproxy.git +# tag 0.2.19 +git_hash: 597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/libfte/build b/projects/libfte/build new file mode 100644 index 0000000..fc7b9f6 --- /dev/null +++ b/projects/libfte/build @@ -0,0 +1,22 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% c("var/setarch") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %] +ln -s /var/tmp/dist/gmp thirdparty/gmp +export PYTHON=python2 +make +cp -ra fte $PTDIR/ +cp -a {LICENSE,README.md} $DOCSDIR/ +cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/libfte/config b/projects/libfte/config new file mode 100644 index 0000000..e2219a7 --- /dev/null +++ b/projects/libfte/config @@ -0,0 +1,23 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/kpdyer/libfte.git +git_hash: 85ef8ae58dbf0d02ea26b627e343784b5574c428 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - project: gmp + name: gmp diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build new file mode 100644 index 0000000..841c608 --- /dev/null +++ b/projects/obfsproxy/build @@ -0,0 +1,18 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/obfsproxy $PTDIR/ +cp -a bin/obfsproxy $PTDIR/obfsproxy.bin +cp -a {LICENSE,README} $DOCSDIR +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config new file mode 100644 index 0000000..ad436dd --- /dev/null +++ b/projects/obfsproxy/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: 0.2.12 +git_url: https://git.torproject.org/pluggable-transports/obfsproxy.git +git_hash: 'obfsproxy-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfsproxy.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + DOCSDIR_project: Obsfproxy + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/parsley/build b/projects/parsley/build new file mode 100644 index 0000000..ea5f19a --- /dev/null +++ b/projects/parsley/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/Parsley-[% c('version') %].tar.gz +cd /var/tmp/build/Parsley-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/parsley.py build/ometa build/terml $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/parsley/config b/projects/parsley/config new file mode 100644 index 0000000..72d5bfc --- /dev/null +++ b/projects/parsley/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 1.2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/P/Parsley/Parsley-[% c("version") %].tar.gz' + sha256sum: 50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 diff --git a/projects/pycrypto/build b/projects/pycrypto/build new file mode 100644 index 0000000..9b005ab --- /dev/null +++ b/projects/pycrypto/build @@ -0,0 +1,24 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% c("var/setarch") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +[% IF c("var/linux-i686") -%] + export CFLAGS=-m32 + export CXXFLAGS=-m32 + export LDFLAGS=-m32 +[% END -%] +./configure --build=i686-linux-gnu [% c("var/configure_opt") %] +$PYTHON setup.py build --build-lib build +cp -a build/Crypto $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/pycrypto/config b/projects/pycrypto/config new file mode 100644 index 0000000..3a9f24b --- /dev/null +++ b/projects/pycrypto/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: 2.6.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-dev + - python-setuptools + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - URL: 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-[% c("version") %].tar.gz' + sha256sum: f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/projects/pyptlib/build b/projects/pyptlib/build new file mode 100644 index 0000000..1dc0c07 --- /dev/null +++ b/projects/pyptlib/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/pyptlib $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/pyptlib/config b/projects/pyptlib/config new file mode 100644 index 0000000..e8ca100 --- /dev/null +++ b/projects/pyptlib/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: 0.0.6 +git_url: https://git.torproject.org/pluggable-transports/pyptlib.git +git_hash: 'pyptlib-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: pyptlib.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/pyyaml/build b/projects/pyyaml/build new file mode 100644 index 0000000..c10855c --- /dev/null +++ b/projects/pyyaml/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/PyYAML-[% c('version') %].tar.gz +cd /var/tmp/build/PyYAML-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/yaml $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/pyyaml/config b/projects/pyyaml/config new file mode 100644 index 0000000..5324c10 --- /dev/null +++ b/projects/pyyaml/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 3.11 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-[% c("version") %].tar.gz' + sha256sum: c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 diff --git a/projects/twisted/build b/projects/twisted/build new file mode 100644 index 0000000..acc5c9d --- /dev/null +++ b/projects/twisted/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 +cd /var/tmp/build/Twisted-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/twisted $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/twisted/config b/projects/twisted/config new file mode 100644 index 0000000..f2f7de8 --- /dev/null +++ b/projects/twisted/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 13.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2' + sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 diff --git a/projects/txsocksx/build b/projects/txsocksx/build new file mode 100644 index 0000000..3491a26 --- /dev/null +++ b/projects/txsocksx/build @@ -0,0 +1,21 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +# Let's pretend we have the setup dependency already as we don't want to get +# it downloaded during building. Just pretending and thus avoiding another +# dependency should be fine here as txsocksx catches the exception due to +# missing __version__ and __sha__ . +mkdir vcversioner-1.14.1.1-py2.7.egg +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/txsocksx $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/txsocksx/config b/projects/txsocksx/config new file mode 100644 index 0000000..6142943 --- /dev/null +++ b/projects/txsocksx/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/habnabit/txsocksx.git +git_hash: 216eb0894a1755872f4789f9458aa6cf543b8433 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/zope.interface/build b/projects/zope.interface/build new file mode 100644 index 0000000..23501a3 --- /dev/null +++ b/projects/zope.interface/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +unzip -d /var/tmp/build $rootdir/[% project %]-[% c('version') %].zip +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/zope $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/zope.interface/config b/projects/zope.interface/config new file mode 100644 index 0000000..9743b79 --- /dev/null +++ b/projects/zope.interface/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 4.0.5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-[% c("version") %].zip' + sha256sum: 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc

1 0

[tor-browser-build/master] Add a set_PTDIR_DOCSDIR option
by boklm＠torproject.org 24 Jul '17

24 Jul '17

commit 96d8b9e72e2eddb0c542b2fe5ddac0e39b3879a6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 24 10:38:30 2017 +0200 Add a set_PTDIR_DOCSDIR option --- projects/meek/build | 8 +------- projects/obfs4/build | 6 +----- projects/snowflake/build | 8 ++------ rbm.conf | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/projects/meek/build b/projects/meek/build index 8d1beb7..81734be 100644 --- a/projects/meek/build +++ b/projects/meek/build @@ -2,13 +2,7 @@ [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] -[% IF c("var/osx") %] - PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" - DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/meek" -[% ELSE %] - PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" - DOCSDIR="$distdir/TorBrowser/Docs/meek" -[% END %] +[% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] diff --git a/projects/obfs4/build b/projects/obfs4/build index 61ef481..287704a 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -2,11 +2,7 @@ [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] -[% IF c("var/osx") %] - PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" -[% ELSE %] - PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" -[% END %] +[% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] diff --git a/projects/snowflake/build b/projects/snowflake/build index 9d9c1fb..f3616f4 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -7,20 +7,16 @@ export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] distdir=/var/tmp/dist/[% project %] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR [% IF c("var/osx") %] - PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" - DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/snowflake" export CGO_ENABLED=1 export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" -[% ELSE %] - PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" - DOCSDIR="$distdir/TorBrowser/Docs/snowflake" [% END %] -mkdir -p $PTDIR $DOCSDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/go-webrtc') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] diff --git a/rbm.conf b/rbm.conf index 49899ca..ce444d4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -82,6 +82,11 @@ var: export HOME=$rootdir umask 0022 + DOCSDIR_project: '[% project %]' + set_PTDIR_DOCSDIR: | + PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" + DOCSDIR="$distdir/TorBrowser/Docs/[% c("var/DOCSDIR_project") %]" + targets: notarget: linux-x86_64 noint: @@ -202,6 +207,9 @@ targets: - zip - unzip faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 + set_PTDIR_DOCSDIR: | + PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" + DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/[% c("var/DOCSDIR_project") %]" # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 23 Jul '17

23 Jul '17

commit bfcbfba01775d65a282df68469aa9c526ef13fbb Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 23 20:49:36 2017 +0000 Update translations for tor-browser-manual --- el/el.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/el/el.po b/el/el.po index 9d42ae97b..1cdd55576 100644 --- a/el/el.po +++ b/el/el.po @@ -269,6 +269,8 @@ msgid "" "Select “yes” when asked if your Internet Service Provider blocks connections" " to the Tor network." msgstr "" +"Επιλέξτε \"Ναι\" όταν ερωτηθείτε αν ο πάροχός σας του ίντερνετ μπλοκάρει " +"συνδέσεις προς το δίκτυο Tor" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -595,6 +597,8 @@ msgid "" "The following firewall software have been known to interfere with Tor and " "may need to be temporarily disabled:" msgstr "" +"Τα ακόλουθα προγράμματα τείχους προστασίας είναι γνωστό οτι παρεμβαίνουν στο" +" Tor και μπορεί να χρειαστεί να απενεργοποιηθούν προσωρινά." #: known-issues.page:23 msgid "Webroot SecureAnywhere" @@ -683,7 +687,7 @@ msgstr "" #: managing-identities.page:29 msgid "The URL bar" -msgstr "" +msgstr "Η γραμμή διευθύνσεων" #: managing-identities.page:30 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 23 Jul '17

23 Jul '17

commit f29b521a92eead92882aa535dc7105742842ed74 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 23 19:49:32 2017 +0000 Update translations for tor-browser-manual --- el/el.po | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/el/el.po b/el/el.po index 51208dcf0..9d42ae97b 100644 --- a/el/el.po +++ b/el/el.po @@ -11,12 +11,13 @@ # Adrian Pappas <pappasadrian(a)gmail.com>, 2017 # Michael T. <mixalis.tsokaris(a)gmail.com>, 2017 # Leonidas P. <papadakospan(a)gmail.com>, 2017 +# Evgenios Kostis <blueyed80(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Leonidas P. <papadakospan(a)gmail.com>, 2017\n" +"Last-Translator: Evgenios Kostis <blueyed80(a)gmail.com>, 2017\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,12 +67,18 @@ msgid "" "real Internet (IP) address, and will not know who you are unless you " "explicitly identify yourself." msgstr "" +"Οι διαχειριστές των ιστοσελίδων και των υπηρεσιών που χρησιμοποιείς, και " +"οποιοσδήποτε τις παρακολουθεί, θα βλέπει μια σύνδεση που προέρχεται από το " +"δίκτυο Tor, αντί της πραγματικής σου διεύθυνσης ίντερνετ (IP), και δεν θα " +"γνωρίζει ποιος είσαι εκτός εάν εσκεμμένα το αποκαλύψεις." #: about-tor-browser.page:34 msgid "" "In addition, Tor Browser is designed to prevent websites from " "“fingerprinting” or identifying you based on your browser configuration." msgstr "" +"Επιπλέον, ο φυλλομετρητής Tor έχει σχεδιαστεί να αποτρέπει ιστοσελίδες από " +"το να σε \"ταυτοποιήσουν\" βάση των ρυθμίσεων του φυλλομετρητή σου." #: about-tor-browser.page:39 msgid "" @@ -168,6 +175,8 @@ msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" +"Στείλε email στο bridges(a)torproject.org από ένα λογαριασμό Gmail, Yahoo ή " +"Riseup ή" #: bridges.page:51 msgid "Entering bridge addresses" @@ -213,7 +222,7 @@ msgstr "Τι να κάνετε αν το δίκτυο Tor είναι μπλοκ #: circumvention.page:10 msgid "Circumvention" -msgstr "" +msgstr "Παράκαμψη" #: circumvention.page:12 msgid ""

1 0

[webwml/master] Twitter link for Tommy
by atagar＠torproject.org 23 Jul '17

23 Jul '17

commit a9047d89d182841672065c73c8fdb46d2a5c3e31 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 23 10:58:58 2017 -0700 Twitter link for Tommy --- about/en/corepeople.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index a1880c81..310927b9 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -744,6 +744,7 @@ table.people tr td:first-child { <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> + <div class="icon"><a href="https://twitter.com/tommycollison"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> <div class="icon"><a href="../keys/t0mmy.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#t0mmy">Tommy Collison</a></div> <div class="field"><b>IRC:</b> t0mmy</div>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Jul '17

23 Jul '17

commit cbcd4572c664ef834fa3f62262ed6449316a9e95 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 23 17:15:43 2017 +0000 Update translations for liveusb-creator --- el/el.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/el/el.po b/el/el.po index b8471f708..c68ca14c2 100644 --- a/el/el.po +++ b/el/el.po @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-30 13:14+0200\n" -"PO-Revision-Date: 2017-07-23 16:45+0000\n" +"PO-Revision-Date: 2017-07-23 16:49+0000\n" "Last-Translator: Leonidas P.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -355,7 +355,7 @@ msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start on it. Please try installing on a " "different model." -msgstr "Το στικάκι USB \"%(pretty_name)s\" είναι ρυθμισμένο ως μη αφαιρέσιμο από τον κατασκευαστή του και το Tails θα αποτύχει να ξεκινήσει σε αυτό. Παρακαλώ προσπαθήστε να εγκαταστήσετε σε διαφορετικό μοντέλο." +msgstr "Αυτή η μονάδα δίσκου USB \"%(pretty_name)s\" είναι ρυθμισμένο ως μη αφαιρέσιμο από τον κατασκευαστή του και το Tails θα αποτύχει να εκκινηθεί σε αυτό. Παρακαλώ προσπαθήστε να εγκαταστήσετε σε διαφορετικό μοντέλο." #: ../tails_installer/gui.py:498 #, python-format @@ -516,7 +516,7 @@ msgid "" "To run Tails Installer you need an ISO image which can be downloaded from " "the Tails website: <a " "href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" -msgstr "Για να εκκινήσετε το πρόγραμμα εγκατάστασης του Tails χρειάζεστε μία εικόνα ISO που μπορεί να ληφθεί από τον ιστότοπο του Tails: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" +msgstr "Για την εκκίνηση του προγράμματος εγκατάστασης του Tails χρειάζεστε μία εικόνα ISO που μπορεί να ληφθεί από τον ιστότοπο του Tails: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" #: ../data/tails-installer-launcher.ui.h:2 msgid "Install" @@ -524,11 +524,11 @@ msgstr "Εγκατάσταση" #: ../data/tails-installer-launcher.ui.h:3 msgid "• Install Tails on a new USB stick." -msgstr "• Εγκατάσταση του Tails σε ένα νέο στικάκι USB." +msgstr "• Εγκατάσταση του Tails σε μία νέα μονάδα δίσκου USB." #: ../data/tails-installer-launcher.ui.h:4 msgid "• The USB stick that you install on is formatted and all data is lost." -msgstr "" +msgstr "Η μονάδα δίσκου USB στην οποία γίνεται εγκατάσταση είναι διαμορφωμένη και όλα τα δεδομένα έχουν χαθεί." #: ../data/tails-installer-launcher.ui.h:5 msgid "Upgrade" @@ -536,7 +536,7 @@ msgstr "Αναβάθμιση" #: ../data/tails-installer-launcher.ui.h:6 msgid "• Upgrade a Tails USB stick to the version of an ISO image." -msgstr "" +msgstr "• Αναβάθμιση μίας μονάδας δίσκου USB Tails στην έκδοση μίας εικόνας ISO." #: ../data/tails-installer-launcher.ui.h:7 msgid ""

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 23 Jul '17

23 Jul '17

commit 3fbc0880dfa0883d21d58f816e66137122edcea5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 23 16:47:18 2017 +0000 Update translations for torbutton-torbuttondtd --- el/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/torbutton.dtd b/el/torbutton.dtd index 628e98455..1b2ae1440 100644 --- a/el/torbutton.dtd +++ b/el/torbutton.dtd @@ -13,7 +13,7 @@ <!ENTITY torbutton.button.tooltip "Κάντε κλικ για να εκκίνηση του Torbutton"> <!ENTITY torbutton.prefs.security_settings "Ρυθμίσεις ασφαλείας του περιηγητή Tor"> <!ENTITY torbutton.prefs.restore_defaults "Επαναφορά προεπιλογών"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.custom_warning "Οι προσαρμοσμένες προτιμήσεις του φυλλομετρητή σας έχουν οδηγήσει σε ασυνήθιστες ρυθμίσεις ασφάλειας. Για λόγους ασφαλείας και ιδιωτικότητας, προτείνουμε να επιλέξετε ένα από τα προεπιλεγμένα επίπεδα ασφάλειας."> <!ENTITY torbutton.cookiedialog.title "Διαχείριση Προστασίας Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Προστατευμένα"> <!ENTITY torbutton.cookiedialog.domainCol "Οικοδεσπότης"> @@ -30,9 +30,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Αλλάξτε τις λεπτομέρειες που σας διακρίνει από άλλους χρήστες του Tor Browser "> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Διατηρήστε αυτό το κουτί επιλεγμένο για να κρύψετε από τους ιστοτόπους πράγματα που θα μπορούσαν να είναι μοναδικά για εσάς, συμπεριλαμβανομένων της απόδοσης του υπολογιστή, της διάταξης του πληκτρολογίου, της γλώσσας, της τοποθεσίας των εγκατεστημένων προσθέτων, της κατάστασης του δικτύου, του προσανατολισμού της οθόνης, του μεγέθους της οθόνης, των επιπέδων zoom ανά site, των υποστηριζόμενων τύπων αρχείων, των χρωμάτων του συστήματος και των δυνατοτήτων WebGL."> <!ENTITY torbutton.prefs.sec_caption "Επίπεδο ασφάλειας"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Το Slider Ασφάλειας σας αφήνει να απενεργοποιήσετε ορισμένα χαρακτηριστικά του φυλλομετρητή που μπορεί να τον κάνουν πιο ευάλωτο σε προσπάθειες hacking."> <!ENTITY torbutton.prefs.sec_low "Χαμηλό (προεπιλεγμένο)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Αυτό παρέχει την πιο εύχρηστη εμπειρία."> <!ENTITY torbutton.prefs.sec_low_desc "Σε αυτό το επίπεδο ασφάλειας, όλες οι δυνατότητες του browser είναι ενεργοποιημένες.">

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Jul '17

23 Jul '17

commit 3c47fa9cb07d890a648de2df614f95821d578e5f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 23 16:45:43 2017 +0000 Update translations for liveusb-creator --- el/el.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/el/el.po b/el/el.po index e75c98604..b8471f708 100644 --- a/el/el.po +++ b/el/el.po @@ -14,6 +14,7 @@ # isv31 <36b043a6(a)anon.leemail.me>, 2014 # James Bridge <jcbgr(a)yahoo.co.uk>, 2012 # kotkotkot <kotakota(a)gmail.com>, 2012 +# Leonidas P., 2017 # metamec, 2015 # nikcha <nikosx(a)gmail.com>, 2008 # platonas, 2013 @@ -23,8 +24,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-30 13:14+0200\n" -"PO-Revision-Date: 2017-07-15 17:54+0000\n" -"Last-Translator: Evgenios Kostis <blueyed80(a)gmail.com>\n" +"PO-Revision-Date: 2017-07-23 16:45+0000\n" +"Last-Translator: Leonidas P.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -354,7 +355,7 @@ msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start on it. Please try installing on a " "different model." -msgstr "" +msgstr "Το στικάκι USB \"%(pretty_name)s\" είναι ρυθμισμένο ως μη αφαιρέσιμο από τον κατασκευαστή του και το Tails θα αποτύχει να ξεκινήσει σε αυτό. Παρακαλώ προσπαθήστε να εγκαταστήσετε σε διαφορετικό μοντέλο." #: ../tails_installer/gui.py:498 #, python-format @@ -504,7 +505,7 @@ msgstr "" #: ../data/tails-installer.ui.h:3 msgid "Target Device:" -msgstr "" +msgstr "Συσκευή Στόχος:" #: ../data/tails-installer.ui.h:4 msgid "Install Tails" @@ -515,15 +516,15 @@ msgid "" "To run Tails Installer you need an ISO image which can be downloaded from " "the Tails website: <a " "href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" -msgstr "" +msgstr "Για να εκκινήσετε το πρόγραμμα εγκατάστασης του Tails χρειάζεστε μία εικόνα ISO που μπορεί να ληφθεί από τον ιστότοπο του Tails: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" #: ../data/tails-installer-launcher.ui.h:2 msgid "Install" -msgstr "" +msgstr "Εγκατάσταση" #: ../data/tails-installer-launcher.ui.h:3 msgid "• Install Tails on a new USB stick." -msgstr "" +msgstr "• Εγκατάσταση του Tails σε ένα νέο στικάκι USB." #: ../data/tails-installer-launcher.ui.h:4 msgid "• The USB stick that you install on is formatted and all data is lost."

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 23 Jul '17

23 Jul '17

commit a803d8b385a0bcac18946b66362ee178b9b1a64f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 23 16:15:57 2017 +0000 Update translations for tails-persistence-setup_completed --- el/el.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/el/el.po b/el/el.po index b3654b164..5f3be64df 100644 --- a/el/el.po +++ b/el/el.po @@ -8,6 +8,7 @@ # dpdt1 <dpdt1(a)espiv.net>, 2013 # dpdt1 <dpdt1(a)espiv.net>, 2012 # James Bridge <jcbgr(a)yahoo.co.uk>, 2012 +# Leonidas P., 2017 # metamec, 2015 # mitzie <zacharias.mitzelos(a)gmail.com>, 2012 # Wasilis Mandratzis <inactive+Wasilis(a)transifex.com>, 2013 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-06-06 08:15+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-05-15 13:51+0200\n" +"PO-Revision-Date: 2017-07-23 16:12+0000\n" +"Last-Translator: Leonidas P.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,12 +59,12 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Προφίλ του Pidgin και κλειδοθήκη OTR " #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 -msgid "Icedove" -msgstr "Icedove" +msgid "Thunderbird" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 -msgid "Icedove profiles and locally stored email" -msgstr "Προφίλ Icedove και τοπικά αποθηκευμένα email" +msgid "Thunderbird profiles and locally stored email" +msgstr "Προφίλ Thunderbird και τοπικά αποθηκευμένο email" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 23 Jul '17

23 Jul '17

commit 4af2759a8946048050563dce036e80b0fcd7b964 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 23 16:15:50 2017 +0000 Update translations for tails-persistence-setup --- el/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/el.po b/el/el.po index ed33f5310..5f3be64df 100644 --- a/el/el.po +++ b/el/el.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-07-14 14:21+0000\n" +"PO-Revision-Date: 2017-07-23 16:12+0000\n" "Last-Translator: Leonidas P.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "Προφίλ του Pidgin και κλειδοθήκη OTR " #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Thunderbird" -msgstr "" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Thunderbird profiles and locally stored email"

1 0