- tbb-commits - lists.torproject.org

[tor-browser-build/master] README: mention which version of runc is needed
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit b386c5f8af06e605bdb84c5bae8bde3c8afbd485 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:10:54 2017 +0200 README: mention which version of runc is needed --- README | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README b/README index fa968ff..2fcfadf 100644 --- a/README +++ b/README @@ -5,8 +5,12 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runC (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). -On Debian jessie, the runc package is available in backports. +for runc (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). +On Debian jessie, the runc package is available in backports. On Debian +stretch, the runc package is available in the main repository. +Version 0.1.1 of runc is required (which is the version available in +Debian stretch and jessie-backports). It is not yet working with runc +version 1.0.0: https://trac.torproject.org/projects/tor/ticket/23039 Your user account should have access sudo access, which is required to be able to extract container file systems, start containers and copy

1 0

[tor-browser-build/master] Include uid in tmp containers directory
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit 9084d642cfc291df76b9fd4acecdce5aeb7f71b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:09:07 2017 +0200 Include uid in tmp containers directory This should allow multiple users to do builds on the same machine. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index ce444d4..4ef6b90 100644 --- a/rbm.conf +++ b/rbm.conf @@ -28,7 +28,7 @@ var: build: [% c("build", { filename => 'f', output_dir => '/out' }) %] container: - dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' + dir: '[% c("tmp_dir") %]/[% c("uid") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%]

1 0

[tor-browser-bundle/maint-7.0] Bug 23028: update argparse URL
by gk＠torproject.org 25 Jul '17

25 Jul '17

1 0

[tor-browser-bundle/master] Bug 23028: update argparse URL
by gk＠torproject.org 25 Jul '17

25 Jul '17

1 0

[tor-browser-build/master] Bug 20929: Bump GCC version to 5.4.0
by gk＠torproject.org 25 Jul '17

25 Jul '17

commit 51ed356d2d4d411b7566987a7cc63d61c0ecd9d4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jul 25 14:32:21 2017 +0200 Bug 20929: Bump GCC version to 5.4.0 We bump our GCC compiler to 5.4.0 as this fixes some bugs in previous versions. It allows us in particular to build debug builds for Windows with mingw-w64. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> --- projects/gcc/config | 4 ++-- projects/mingw-w64/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/gcc/config b/projects/gcc/config index 6bf14ad..de4ecc5 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 5.1.0 +version: 5.4.0 var: container: use_container: 1 @@ -59,4 +59,4 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' - sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad + sha256sum: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 5e2c748..61a34bd 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -6,7 +6,7 @@ version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 5.1.0 + gcc_version: 5.4.0 deps: - automake - build-essential @@ -21,7 +21,7 @@ var: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.bz2' - sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad + sha256sum: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a - name: binutils project: binutils - filename: i686-w64-mingw32-g++

1 0

[tor-browser-bundle/master] Bug 20929: Bump GCC version to 5.4.0
by gk＠torproject.org 25 Jul '17

25 Jul '17

commit f890b38fd0ffc2572edc0e4dafc8a3aa3d16faa0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 11 15:27:58 2017 +0000 Bug 20929: Bump GCC version to 5.4.0 We bump our GCC compiler to 5.4.0 as this fixes some bugs in previous versions. It allows us in particular to build debug builds for Windows with mingw-w64. --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6351f27..025e277 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -56,7 +56,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.1.0 +GCC_VER=5.4.0 CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -128,7 +128,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b89befb..f0c4be7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.1.0 +GCC_VER=5.4.0 CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -131,7 +131,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da

1 0

[tor-launcher/master] Bug 22592: Default bridge settings are not removed
by gk＠torproject.org 25 Jul '17

25 Jul '17

commit 2a938feb78b49098ead0599769835cbc2a7dc183 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jul 24 16:13:28 2017 -0400 Bug 22592: Default bridge settings are not removed When the user clicks on "Remove Settings and Connect", clear the preference `extensions.torlauncher.default_bridge_type` to ensure that default bridges are not used any more. --- src/chrome/content/network-settings.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 5df4e1e..830ef31 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1493,6 +1493,9 @@ function applyBridgeSettings(aUseDefaults) if (!settings) return false; + if (aUseDefaults) + TorLauncherUtil.setCharPref(kPrefDefaultBridgeType, ""); + return setConfAndReportErrors(settings, "bridgeSettings"); }

1 0

[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

[tor-browser-build/master] Bug 22884: about:tor page is not showing up
by boklm＠torproject.org 20 Jul '17

20 Jul '17

commit c8adacae7f34fa569b09eb1b1fb1930fb638d6a8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 19 10:05:48 2017 -0400 Bug 22884: about:tor page is not showing up Whitelist about:tor so that NoScript does not block its JavaScript. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0