- tbb-commits - lists.torproject.org

[tor-browser-build/master] Add support for optional local configuration file rbm.local.conf
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit 99f69d0aa0665e57a5036f66e16dbdcd0fea94d0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 00:40:49 2017 +0100 Add support for optional local configuration file rbm.local.conf Update rbm and add example rbm.local.conf file. --- .gitignore | 1 + README | 2 ++ README.BUILD_ERRORS | 2 ++ rbm | 2 +- rbm.local.conf.example | 22 ++++++++++++++++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c755fcf..98554a3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ alpha alpha_nightly nightly hardened +rbm.local.conf diff --git a/README b/README index 775f782..001a692 100644 --- a/README +++ b/README @@ -89,6 +89,8 @@ the RBM_NO_DEBUG environment variable to 1: export RBM_NO_DEBUG=1 +Or set the debug option to 0 in the rbm.local.conf file. + If you want to select the output directory, you can use rbm's --output-dir option. You can look at the Makefile to find the rbm command for what you want to build, and add the --output-dir option. For example if you diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index c1ee70c..6be4319 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -42,3 +42,5 @@ $ mkdir /home/user/tmp $ export TMPDIR=/home/user/tmp ---- +You can also define the tmp_dir option in the rbm.local.conf file. + diff --git a/rbm b/rbm index af970a5..a57b484 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit af970a558f122acaba080e0b015e3293f74509fb +Subproject commit a57b4846c8aba5697ce1f197996e2962ffb5b534 diff --git a/rbm.local.conf.example b/rbm.local.conf.example new file mode 100644 index 0000000..fab3213 --- /dev/null +++ b/rbm.local.conf.example @@ -0,0 +1,22 @@ +--- +### This file is used to override options from rbm.conf to adapt them +### to your local setup. +### +### Copy this file as rbm.local.conf to enable it, and uncomment the +### options you want to modify. + + +### The tmp_dir option defines where temporary files are stored. +### You should modify this if your /tmp partition is small. +#tmp_dir: /tmp + +### The debug option defines whether a debugging shell should be opened +### automatically in the build directory/container in case of build +### failure. If you are doing automated builds, you might want to disable +### this. +#debug: 0 + +var: + local_conf: 1 + +# vim: filetype=yaml sw=2

1 0

[tor-browser-build/master] Add docker_image_prefix option to rbm.local.conf
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit e30719ad9b5ad2c63156d88e63a5d4a082021455 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 01:31:22 2017 +0100 Add docker_image_prefix option to rbm.local.conf --- README | 12 ++++++++++++ projects/docker-image/config | 1 - rbm.conf | 1 + rbm.local.conf.example | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/README b/README index 956e162..e3672ec 100644 --- a/README +++ b/README @@ -169,6 +169,18 @@ There will be a script to clean old build files and containers that are no longer used, but it has not been added yet. +Multiple build directories on the same host +------------------------------------------- + +You can do multiple builds of Tor Browser in different directories on +the same host. However the docker images namespace is global, so you +may have some conflicts with the same image names used by the +different builds. By default, the docker images are prefixed with +tor-browser_$USER. You can change this prefix by defining the +docker_image_prefix option in rbm.local.conf, using a different prefix +for each of your build directories. + + Common Build Errors ------------------- diff --git a/projects/docker-image/config b/projects/docker-image/config index 27d2654..1968b77 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -1,7 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% sha256(c("pre")).substr(0, 12) %]' remote_docker: 1 -docker_image_prefix: '[% GET c("var/project_name") ? c("var/project_name") : "rbm-build" %]_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]' docker_save_image: '[% c("docker_image_prefix") %]:[% c("filename") %]' pkg_type: build diff --git a/rbm.conf b/rbm.conf index 5dfdc30..47ffbfb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -155,6 +155,7 @@ targets: docker_image: '[% pc("docker-image", "docker_save_image") %]' +docker_image_prefix: '[% GET c("var/project_name") ? c("var/project_name") : "rbm-build" %]_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]' # change the default gpg_wrapper to allow git tag signed using an # expired key. diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 42bf431..20f081f 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -16,6 +16,12 @@ ### this. #debug: 0 +### If you are doing multiple builds in different directories on the +### same host, you should define docker_image_prefix with a different +### value for each build directory, so that the different builds don't +### use the same docker image names. +#docker_image_prefix: tor-browser_XXXXX + var: local_conf: 1

1 0

[rbm/master] Add support for optional local configuration file rbm.local.conf
by boklm＠torproject.org 13 Feb '17

13 Feb '17

commit a57b4846c8aba5697ce1f197996e2962ffb5b534 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 00:28:45 2017 +0100 Add support for optional local configuration file rbm.local.conf --- NEWS | 2 ++ doc/rbm_cli.asc | 3 +++ doc/rbm_config.asc | 29 ++++++++++++++++++++++++++--- lib/RBM.pm | 10 +++++++++- lib/RBM/DefaultConfig.pm | 1 + rbm | 3 ++- 6 files changed, 43 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 82890a5..1a1789f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add support for optional local configuration file rbm.local.conf + - add the git_submodule option - add the hg_opt option diff --git a/doc/rbm_cli.asc b/doc/rbm_cli.asc index 92b84ef..66f6025 100644 --- a/doc/rbm_cli.asc +++ b/doc/rbm_cli.asc @@ -31,6 +31,9 @@ The following options can be set on the command line : --sysconf-file=<file>:: Set the optional system configuration file path + --localconf-file=<file>:: + Set the optional local configuration file path + --target=<target>:: Set the target. This option can be used multiple times to use more than one target. See link:rbm_targets.html[rbm_targets(7)] for diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 27b8f7a..e8decd9 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -8,11 +8,13 @@ rbm_config - The rbm configuration DESCRIPTION ----------- -All configuration options can be defined in 3 different places : +All configuration options can be defined in 5 different places : -- in the main configuration in your working directory +- in the main configuration in your working directory (+rbm.conf+) -- in the global system configuration +- in the local configuration in your working directory (+rbm.local.conf+) + +- in the global system configuration (+/etc/rbm.conf+) - in a project configuration @@ -30,6 +32,14 @@ The option values are used with the following priority order : - project config +- local config for matching step and target + +- local config for matching step + +- local config for matching target + +- local config + - workspace config for matching step and target - workspace config for matching step @@ -62,6 +72,13 @@ This is where you will put configuration relevant to all projects under this working directory. All relative paths used in the configuration are relative from the +rbm.conf+ location. +The local configuration file is +rbm.local.conf+ (or the file defined +by the +localconf_file+ option), in the same directory as the +rbm.conf+ +file. If the file does not exists, it is ignored. The +rbm.local.conf+ +file is used to override some options from +rbm.conf+ relevent to your +local setup, whithout modifying the +rbm.conf+ file which is usually +maintained in a VCS. + An example +rbm.conf+ file will look like this : ---- @@ -89,6 +106,12 @@ sysconf_file:: is +/etc/rbm.conf+. This can also be set with the --sysconf-file command line parameter. +localconf_file:: + The path to an optional local configuration file. The default + is +rbm.local.conf+. If the path is relative, it is relative to + the directory where the +rbm.conf+ file is located. This can + also be set with the --localconf-file command line parameter. + projects_dir:: The directory containing the projects definitions. The default value is +projects+. diff --git a/lib/RBM.pm b/lib/RBM.pm index ad39526..4b5bfe9 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -61,6 +61,13 @@ sub load_system_config { $config->{system} = -f $cfile ? load_config_file($cfile) : {}; } +sub load_local_config { + my ($project) = @_; + my $cfile = project_config($project ? $project : 'undef', 'localconf_file'); + $cfile = path($cfile); + $config->{local} = -f $cfile ? load_config_file($cfile) : {}; +} + sub find_config_file { for (my $dir = getcwd; $dir ne '/'; $dir = dirname($dir)) { return "$dir/rbm.conf" if -f "$dir/rbm.conf"; @@ -209,7 +216,8 @@ sub project_config { my $opt_save = $config->{opt}; $config->{opt} = { %{$config->{opt}}, %$options } if $options; $res = config($project, $name, $options, ['opt'], ['run'], - ['projects', $project], [], ['system'], ['default']); + ['projects', $project], ['local'], [], + ['system'], ['default']); if (!$options->{no_tmpl} && defined($res) && !ref $res && !notmpl(confkey_str($name), $project)) { $res = process_template($project, $res, diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 8172f04..052cf16 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -103,6 +103,7 @@ sub docker_version { our %default_config = ( sysconf_file => '/etc/rbm.conf', + localconf_file=> 'rbm.local.conf', tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', projects_dir => 'projects', output_dir => 'out', diff --git a/rbm b/rbm index 52f3076..c618ada 100755 --- a/rbm +++ b/rbm @@ -95,7 +95,7 @@ sub set_options { gpg-keyring=s gpg-keyring-dir=s gpg-args=s gpg-bin=s sysconf-file=s debsign-keyid=s use-pbuilder! step=s target=s@ publish-src-dir=s debug! hg-clone-dir=s - hg-hash=s); + hg-hash=s localconf-file=s); my %val; Getopt::Long::GetOptionsFromArray(\@_, \%val, @options) || exit 1; foreach my $k (keys %val) { @@ -108,6 +108,7 @@ sub set_options { $RBM::config->{run}{$l} = $val{$k}; } RBM::load_system_config(@_); + RBM::load_local_config(@_); return $RBM::config->{run}{args} = \@_; }

1 0

[tor-browser-build/master] Update rbm
by boklm＠torproject.org 12 Feb '17

12 Feb '17

commit 465a77590547aedce0f99d1fbb8e85fd411a6619 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 12 23:36:33 2017 +0100 Update rbm - Fix docker_remote_finish for docker >= 1.10.0 - If the TMPDIR env var exists, use it instead of /tmp --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 9f78558..af970a5 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 9f78558d15854848d045a38b35666e1b78aad7db +Subproject commit af970a558f122acaba080e0b015e3293f74509fb

1 0

[tor-browser-build/master] Add a README.BUILD_ERRORS file listing some common errors
by boklm＠torproject.org 12 Feb '17

12 Feb '17

commit 88146b2f6e947d35d672f0b82e39283a46dfe0d4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 13 00:06:13 2017 +0100 Add a README.BUILD_ERRORS file listing some common errors --- README | 7 +++++++ README.BUILD_ERRORS | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/README b/README index 2c36d74..775f782 100644 --- a/README +++ b/README @@ -164,3 +164,10 @@ Cleaning obsolete files and containers images There will be a script to clean old build files and containers that are no longer used, but it has not been added yet. + +Common Build Errors +------------------- + +You can look at the README.BUILD_ERRORS file for a list of common build +errors and their solutions. + diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS new file mode 100644 index 0000000..c1ee70c --- /dev/null +++ b/README.BUILD_ERRORS @@ -0,0 +1,44 @@ +This file lists some common build errors and their solutions. + + +Error starting remote +--------------------- + +If you have an error like this: + +---- +Error: Error starting remote: +/bin/sh: 1: adduser: not found +Segmentation fault (core dumped) +---- + +You might be having this issue: +https://github.com/docker/docker/issues/28705 + +When the kernel is configured with CONFIG_LEGACY_VSYSCALL_NONE, running +Debian Wheezy containers fails with a segfault. This should be fixed by +adding "vsyscall=emulate"to the kernel cmdline. + +If you are building inside Qubes, you can change the kernel cmdline for +the VM you are using with something like this in dom0: + +---- +$ qvm-pref --get [vmname] kernelopts +nopat +$ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' +---- + + +tmp partition is full +--------------------- + +If your /tmp partition is small, you will get a 'No space left on device' +error during the build. To select an other directory with more space +available to store temporary files, you can define the TMPDIR environment +variable: + +---- +$ mkdir /home/user/tmp +$ export TMPDIR=/home/user/tmp +---- +

1 0

[rbm/master] Fix docker_remote_finish for docker >= 1.10.0
by boklm＠torproject.org 12 Feb '17

12 Feb '17

commit dbd2143279680104971dc2b08877f252a38a1b2c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 12 23:11:13 2017 +0100 Fix docker_remote_finish for docker >= 1.10.0 With docker >= 1.10.0, the -f flag on 'docker tag' is deprecated: https://docs.docker.com/engine/deprecated/#/f-flag-on-docker-tag However we need it when using an older version of docker. To add it only when needed, we parse the output from 'docker version'. --- lib/RBM/DefaultConfig.pm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 100ad2c..8eaf9dd 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -86,6 +86,21 @@ sub get_arch { return $stdout; } +sub docker_version { + my ($stdout, $stderr, $success) + = capture_exec('docker', 'version', '--format', '{{.Client.Version}}'); + if ($success) { + chomp $stdout; + return $stdout; + } + ($stdout, $stderr, $success) = capture_exec('docker', 'version'); + RBM::exit_error("Error running 'docker version'") unless $success; + foreach my $line (split "\n", $stdout) { + return $1 if ($line =~ m/Client version: (.*)$/); + } + RBM::exit_error("Could not find docker version"); +} + our %default_config = ( sysconf_file => '/etc/rbm.conf', tmp_dir => '/tmp', @@ -382,6 +397,10 @@ OPT_END #### #### #### + docker_version => \&docker_version, +#### +#### +#### docker_build_image => 'rbm-[% sha256(c("build_id")).substr(0, 12) %]', #### #### @@ -408,7 +427,7 @@ OPT_END #!/bin/sh set -e [% IF c('docker_save_image') -%] -docker tag -f [% c('docker_build_image') %] [% c('docker_save_image') %] +docker tag [% IF versioncmp(c('docker_version'), '1.10.0') == -1; GET '-f'; END; %] [% c('docker_build_image') %] [% c('docker_save_image') %] [% END -%] docker rmi -f [% c('docker_build_image') %] > /dev/null OPT_END

1 0

[rbm/master] If the TMPDIR env var exists, use it instead of /tmp
by boklm＠torproject.org 12 Feb '17

12 Feb '17

commit af970a558f122acaba080e0b015e3293f74509fb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 12 23:24:09 2017 +0100 If the TMPDIR env var exists, use it instead of /tmp --- lib/RBM/DefaultConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 8eaf9dd..8172f04 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -103,7 +103,7 @@ sub docker_version { our %default_config = ( sysconf_file => '/etc/rbm.conf', - tmp_dir => '/tmp', + tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', projects_dir => 'projects', output_dir => 'out', git_clone_dir => 'git_clones',

1 0

[tor-browser-build/master] Bug 21326: Update the "Using a system-installed Tor" section.
by boklm＠torproject.org 09 Feb '17

09 Feb '17

commit 176897d72a0bf89008648d865e1bf4f2b8909fda Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 14:06:44 2017 -0500 Bug 21326: Update the "Using a system-installed Tor" section. Adjust the comments to account for recent Torbutton changes. --- projects/tor-browser/RelativeLink/start-tor-browser | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index f556389..a78b367 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -3,7 +3,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# Copyright 2015 The Tor Project. See LICENSE for licensing information. +# Copyright 2017 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -316,17 +316,13 @@ EOF # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> +# network.security.ports.banned [...],<SocksPort>,<ControlPort> +# network.proxy.socks 127.0.0.1 +# network.proxy.socks_port <SocksPort> # extensions.torbutton.inserted_button true # extensions.torbutton.launch_warning false # extensions.torbutton.loglevel 2 # extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0

[tor-browser-build/master] Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge.
by boklm＠torproject.org 09 Feb '17

09 Feb '17

commit d3fc9ca42b27291e3a03ca8baca6f73547105800 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge. https://lists.torproject.org/pipermail/tor-project/2017-January/000906.html --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index bd92585..c56d316 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,6 +37,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3");

1 0

[tor-browser-build/master] Use OpenSSL 1.0.2k in nightlies
by boklm＠torproject.org 09 Feb '17

09 Feb '17

commit cf76fe40cbf2b58d69cde9613fcf60527550d48c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 9 12:29:46 2017 +0100 Use OpenSSL 1.0.2k in nightlies --- projects/openssl/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/openssl/config b/projects/openssl/config index dcdac50..637f3d1 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -24,9 +24,15 @@ targets: pre_pkginst: dpkg --add-architecture i386 compiler: macosx-toolchain-gcc + nightly: + version: 1.0.2k + input_files: - project: docker-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' sha256sum: e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 + targets: + nightly: + sha256sum: 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0

1 0

[tor-browser-build/master] Add option to sign the sha256sums-unsigned-build.txt file
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit c0242adc7a6a414bb183a3f07dddd64b7e3a51bc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 19:23:44 2017 +0100 Add option to sign the sha256sums-unsigned-build.txt file --- README | 9 +++++++++ projects/release/config | 3 +++ 2 files changed, 12 insertions(+) diff --git a/README b/README index 0b8e510..2c36d74 100644 --- a/README +++ b/README @@ -149,6 +149,15 @@ the build files in the tor-browser-builds/ directory (unless you changed the publish_dir option). +Signing builds +-------------- + +If the environment variable RBM_SIGN_BUILD is set to 1, the +sha256sums-unsigned-build.txt file will be signed with gpg. +You can use the RBM_GPG_OPTS environment variable to add some options +to the gpg command used to sign the file. + + Cleaning obsolete files and containers images --------------------------------------------- diff --git a/projects/release/config b/projects/release/config index 09b4c0e..daa78dd 100644 --- a/projects/release/config +++ b/projects/release/config @@ -125,4 +125,7 @@ build: | [% END -%] cd "$destdir" sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt + [% IF ENV.RBM_SIGN_BUILD -%] + gpg -abs [% ENV.RBM_GPG_OPTS %] sha256sums-unsigned-build.txt + [% END -%] cat sha256sums-unsigned-build.txt

1 0

[tor-browser-build/master] Include *.zip files in sha256sums-unsigned-build.txt
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit 444f6e2210d62b5fd6ab8c204a1c93594bf37ec4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 14:04:06 2017 +0100 Include *.zip files in sha256sums-unsigned-build.txt --- projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/config b/projects/release/config index 527e269..09b4c0e 100644 --- a/projects/release/config +++ b/projects/release/config @@ -124,5 +124,5 @@ build: | mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt + sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt cat sha256sums-unsigned-build.txt

1 0

[tor-browser-bundle/master] Bug 21402: verify sandbox git tag's gpg signature
by gk＠torproject.org 06 Feb '17

06 Feb '17

commit 917d38c1d58c8cb11ff5b016054d2589d313882e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 13:43:44 2017 +0100 Bug 21402: verify sandbox git tag's gpg signature --- gitian/verify-tags.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index e8dfe3f..4b17550 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -104,6 +104,7 @@ meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG cmake cmake.gpg $CMAKE_TAG +sandbox obfs4proxy.gpg $SANDBOX_TAG EOF while read dir commit; do

1 0

[tor-browser-build/master] Add linux sandbox
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit 918acde2b07acc72313ed8f69f0fd4a2622d772a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 13:58:21 2017 +0100 Add linux sandbox --- projects/go/config | 9 ++++++++- projects/goerrors/config | 16 ++++++++++++++++ projects/gogb/config | 22 ++++++++++++++++++++++ projects/gogb/gb-build-dir.patch | 31 +++++++++++++++++++++++++++++++ projects/release/config | 8 ++++++++ projects/sandbox/build | 27 +++++++++++++++++++++++++++ projects/sandbox/config | 29 +++++++++++++++++++++++++++++ 7 files changed, 141 insertions(+), 1 deletion(-) diff --git a/projects/go/config b/projects/go/config index a5920f5..9341f98 100644 --- a/projects/go/config +++ b/projects/go/config @@ -12,7 +12,7 @@ var: export GOOS=[% c("var/GOOS") %] export GOARCH=[% c("var/GOARCH") %] export GOPATH=/var/tmp/dist/gopath - export PATH=/var/tmp/dist/go/bin:"$PATH" + export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" # Template build script for building a go library. # This can be called as projects/go/var/build_go_lib. @@ -26,9 +26,16 @@ var: distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + [% FOREACH dep = c("var/go_lib_deps") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/' _ dep) %] + [% END -%] mkdir -p $(dirname "$GOPATH/src/[% c("var/go_lib") %]") mv /var/tmp/build/[% project %]-[% c('version') %] "$GOPATH/src/[% c("var/go_lib") %]" cd "$GOPATH/src/[% c("var/go_lib") %]" + for p in $(ls -1 $rootdir/*.patch 2> /dev/null | sort) + do + patch -p1 < $p + done [% IF c("var/go_lib_install") -%] [% FOREACH inst IN c("var/go_lib_install") %] go install [% inst %] diff --git a/projects/goerrors/config b/projects/goerrors/config new file mode 100644 index 0000000..4451f7b --- /dev/null +++ b/projects/goerrors/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pkg/errors +git_hash: 248dadf4e9068a0b3e79f02ed0a610d935de5302 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/pkg/errors + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/gogb/config b/projects/gogb/config new file mode 100644 index 0000000..a358819 --- /dev/null +++ b/projects/gogb/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/constabulary/gb +git_hash: 06cc925cce6592e922dcc4839a8b44feb384e71e +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/constabulary/gb + go_lib_install: github.com/constabulary/gb/cmd/gb + go_lib_deps: + - goerrors + +input_files: + - project: docker-image + - name: go + project: go + - name: goerrors + project: goerrors + - filename: gb-build-dir.patch diff --git a/projects/gogb/gb-build-dir.patch b/projects/gogb/gb-build-dir.patch new file mode 100644 index 0000000..a52ca69 --- /dev/null +++ b/projects/gogb/gb-build-dir.patch @@ -0,0 +1,31 @@ +From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Tue, 6 Dec 2016 21:34:16 +0000 +Subject: [PATCH] Make the gb build directory deterministic + + +diff --git a/context.go b/context.go +index 53c00da..d040082 100644 +--- a/context.go ++++ b/context.go +@@ -3,7 +3,6 @@ package gb + import ( + "fmt" + "io" +- "io/ioutil" + "os" + "os/exec" + "path/filepath" +@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) { + }, + GcToolchain(), + } +- workdir, err := ioutil.TempDir("", "gb") ++ workdir := filepath.Join(os.TempDir(), "gb") ++ err := os.Mkdir(workdir, 0777) + if err != nil { + return nil, err + } +-- +2.10.2 + diff --git a/projects/release/config b/projects/release/config index 26dd8b7..527e269 100644 --- a/projects/release/config +++ b/projects/release/config @@ -75,6 +75,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-linux-x86_64 + - name: sandbox-linux-x86_64 + project: sandbox + enable: '[% c("var/torbrowser-linux-x86_64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-linux-x86_64 + - name: linux-i686 project: tor-browser enable: '[% c("var/torbrowser-linux-i686") %]' @@ -114,6 +121,7 @@ build: | [% END -%] [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt diff --git a/projects/sandbox/build b/projects/sandbox/build new file mode 100644 index 0000000..28b5a48 --- /dev/null +++ b/projects/sandbox/build @@ -0,0 +1,27 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/gogb') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +# we don't have access to the git repository during the build +sed -i Makefile -e 's|git rev-parse --short HEAD > data/revision|echo [% c("abbrev") %] > data/revision|' +# Unset GOOS and GOARCH as they change some file names, and we don't need +# them as we are only building on x86_64 +unset GOOS +unset GOARCH +make +cp bin/sandboxed-tor-browser $distdir + +cd $distdir/.. +[% c('zip', { + zip_src => [ project ], + zip_args => dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/sandbox/config b/projects/sandbox/config new file mode 100644 index 0000000..54fe4df --- /dev/null +++ b/projects/sandbox/config @@ -0,0 +1,29 @@ +# vim: filetype=yaml sw=2 +version: 0.0.3 +git_url: https://git.schwanenlied.me/yawning/sandboxed-tor-browser +git_hash: 'sandboxed-tor-browser-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfs4.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 +distribution: Debian-8.7 + +var: + deps: + - libx11-dev + - pkg-config + - libgtk-3-dev + - libnotify-dev + - zip + +targets: + nightly: + git_hash: master + tag_gpg_id: 0 + +input_files: + - project: docker-image + - name: go + project: go + - name: gogb + project: gogb

1 0

[tor-browser-bundle/master] No CXX needed for tor
by gk＠torproject.org 06 Feb '17

06 Feb '17

commit a8623422e47d1802a111e3fe8019b5984bec95be Author: Georg Koppen <gk(a)torproject.org> Date: Sat Feb 4 10:52:37 2017 +0000 No CXX needed for tor --- gitian/descriptors/mac/gitian-tor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index ee1d848..946f915 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -62,7 +62,6 @@ script: | CROSS_SYSROOT="/home/debian/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" export CC="/home/debian/build/clang/bin/clang $FLAGS" - export CXX="/home/debian/build/clang/bin/clang++ $FLAGS" export CPP="/home/debian/build/clang/bin/clang $FLAGS -E" export LLVMCONFIG="/home/debian/build/clang/bin/llvm-config" export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"

1 0

[tor-browser-build/master] macosx-toolchain-gcc: add option to use 10.7 SDK
by boklm＠torproject.org 01 Feb '17

01 Feb '17

commit a226f20743c19cf7930264d76e0b914bd425cec5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 1 23:35:44 2017 +0100 macosx-toolchain-gcc: add option to use 10.7 SDK We need the 10.7 SDK to build GO. --- projects/macosx-toolchain-gcc/build | 1 + projects/macosx-toolchain-gcc/config | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build index 1b21d76..778194d 100644 --- a/projects/macosx-toolchain-gcc/build +++ b/projects/macosx-toolchain-gcc/build @@ -4,4 +4,5 @@ rootdir=$(pwd) destdir='[% dest_dir _ '/' _ c('filename') %]' mkdir -p "$destdir" mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb +mv -f [% c('input_files_by_name/SDK_10_7') %] "$destdir"/MacOSX10.7.sdk.tar.gz mv -f [% c('input_files_by_name/toolchain') %] "$destdir"/toolchain.tar.xz diff --git a/projects/macosx-toolchain-gcc/config b/projects/macosx-toolchain-gcc/config index 1a56401..31ac46f 100644 --- a/projects/macosx-toolchain-gcc/config +++ b/projects/macosx-toolchain-gcc/config @@ -6,7 +6,6 @@ var: setup: | macosx_toolchain_gcc_dir=/var/tmp/dist/macosx-toolchain-gcc mkdir -p $macosx_toolchain_gcc_dir - dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/toolchain.tar.xz export PATH="$macosx_toolchain_gcc_dir/apple-osx/bin:$PATH" # For OpenSSL @@ -14,15 +13,28 @@ var: #For gmp, need to trick it so it knows we're doing a 64 bit build for i in $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - # XXX Clean up these flags? - export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + + [% IF pc(c('origin_project'), "var/10_7_SDK") %] + export AR=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-ar + export CC=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc + export CXX=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-g++ + tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/MacOSX10.7.sdk.tar.gz + export CFLAGS="-isysroot $macosx_toolchain_gcc_dir/MacOSX10.7.sdk" + [% ELSE %] + dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir + # XXX Clean up these flags? + export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" + export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + [% END %] input_files: - name: SDK URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10… sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc + - name: SDK_10_7 + URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… + sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf - name: toolchain URL: https://people.torproject.org/~mikeperry/mirrors/sources/multiarch-darwin11… sha256sum: 65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9

1 0

[tor-browser-build/master] Add meek and obfs4
by boklm＠torproject.org 01 Feb '17

01 Feb '17

commit 9cbe67960c0d80f393a72715dab4fb32afed7094 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 1 23:50:33 2017 +0100 Add meek and obfs4 --- keyring/goptlib.gpg | Bin 0 -> 5876 bytes keyring/meek.gpg | Bin 0 -> 5876 bytes keyring/obfs4.gpg | Bin 0 -> 41312 bytes projects/ed25519/config | 18 ++++++++++ projects/go/build | 74 ++++++++++++++++++++++++++++++++++++++++ projects/go/config | 80 ++++++++++++++++++++++++++++++++++++++++++++ projects/goptlib/config | 18 ++++++++++ projects/goxcrypto/config | 24 +++++++++++++ projects/goxnet/config | 22 ++++++++++++ projects/meek/build | 49 +++++++++++++++++++++++++++ projects/meek/config | 15 +++++++++ projects/obfs4/build | 34 +++++++++++++++++++ projects/obfs4/config | 30 +++++++++++++++++ projects/siphash/config | 16 +++++++++ projects/tor-browser/build | 17 ++++++++-- projects/tor-browser/config | 4 +++ projects/uniuri/config | 20 +++++++++++ 17 files changed, 419 insertions(+), 2 deletions(-) diff --git a/keyring/goptlib.gpg b/keyring/goptlib.gpg new file mode 100644 index 0000000..f3b543f Binary files /dev/null and b/keyring/goptlib.gpg differ diff --git a/keyring/meek.gpg b/keyring/meek.gpg new file mode 100644 index 0000000..f3b543f Binary files /dev/null and b/keyring/meek.gpg differ diff --git a/keyring/obfs4.gpg b/keyring/obfs4.gpg new file mode 100644 index 0000000..f26a4cd Binary files /dev/null and b/keyring/obfs4.gpg differ diff --git a/projects/ed25519/config b/projects/ed25519/config new file mode 100644 index 0000000..5bab68b --- /dev/null +++ b/projects/ed25519/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/agl/ed25519.git +git_hash: c4161f4c7483313562781c61b9a20aba73daf9de +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/agl/ed25519 + go_lib_install: + - github.com/agl/ed25519/extra25519 + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/go/build b/projects/go/build new file mode 100644 index 0000000..2efd928 --- /dev/null +++ b/projects/go/build @@ -0,0 +1,74 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist + +[% IF c("var/linux") %] + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 +[% END %] + +mkdir -p /var/tmp/build + +# Building go 1.4.x +# This is needed to bootstrap the go that we actually use +# https://golang.org/doc/install/source#go14 +tar -C /var/tmp/build --transform='s,^go\>,go1.4,' -xf $rootdir/[% c('input_files_by_name/go14') %] +cd /var/tmp/build/go1.4/src +# Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. +# https://github.com/golang/go/issues/13114#issuecomment-186922245 +# Disable CC etc. that are set up for cross builds. +CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash +export GOROOT_BOOTSTRAP="/var/tmp/build/go1.4" + +cd $rootdir +[% IF ! c("var/linux") %] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END %] + +# Building go +# http://golang.org/doc/install/source#environment +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/go') %] +export GOROOT="$distdir" +cd /var/tmp/dist/go/src +[% IF c("var/linux") -%] + ./make.bash +[% ELSIF c("var/osx") -%] + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" + # http://golang.org/doc/install/source#environment + export GOOS=darwin + export GOARCH=386 + # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. + # https://github.com/golang/go/issues/17732 + sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash +[% ELSIF c("var/windows") -%] + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec i686-w64-mingw32-gcc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" + # http://golang.org/doc/install/source#environment + export GOOS=windows + export GOARCH=386 + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash +[% END -%] + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/go/config b/projects/go/config new file mode 100644 index 0000000..a5920f5 --- /dev/null +++ b/projects/go/config @@ -0,0 +1,80 @@ +# vim: filetype=yaml sw=2 +version: 1.7.4 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +var: + go14_version: 1.4.3 + + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] + export GOOS=[% c("var/GOOS") %] + export GOARCH=[% c("var/GOARCH") %] + export GOPATH=/var/tmp/dist/gopath + export PATH=/var/tmp/dist/go/bin:"$PATH" + + # Template build script for building a go library. + # This can be called as projects/go/var/build_go_lib. + # You need to define /var/go_lib, and optionaly var/go_lib_install as + # a list of install targets. + build_go_lib: | + #!/bin/bash + set -e + rootdir=$(pwd) + [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] + distdir=/var/tmp/dist/[% project %] + mkdir -p /var/tmp/build + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + mkdir -p $(dirname "$GOPATH/src/[% c("var/go_lib") %]") + mv /var/tmp/build/[% project %]-[% c('version') %] "$GOPATH/src/[% c("var/go_lib") %]" + cd "$GOPATH/src/[% c("var/go_lib") %]" + [% IF c("var/go_lib_install") -%] + [% FOREACH inst IN c("var/go_lib_install") %] + go install [% inst %] + [% END %] + [% ELSE %] + go install [% c("var/go_lib") %] + [% END %] + cd /var/tmp/dist + [% c('tar', { + tar_src => [ 'gopath' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] + +targets: + windows-i686: + var: + GOOS: windows + GOARCH: 386 + osx-x86_64: + var: + arch_deps: + - libc6-i386 + - libstdc++6:i386 + pre_pkginst: dpkg --add-architecture i386 + compiler: macosx-toolchain-gcc + 10_7_SDK: 1 + GOOS: darwin + GOARCH: 386 + linux: + var: + GOOS: linux + linux-x86_64: + var: + GOARCH: amd64 + linux-i686: + var: + GOARCH: 386 + +input_files: + - project: docker-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") || c("var/osx") %]' + - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' + name: go + sha256sum: 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc + - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' + name: go14 + sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/goptlib/config b/projects/goptlib/config new file mode 100644 index 0000000..dd520ec --- /dev/null +++ b/projects/goptlib/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml sw=2 +version: 0.5 +git_url: https://git.torproject.org/pluggable-transports/goptlib.git +git_hash: '[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: goptlib.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: git.torproject.org/pluggable-transports/goptlib.git + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config new file mode 100644 index 0000000..8362f28 --- /dev/null +++ b/projects/goxcrypto/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/crypto +git_hash: 4ed45ec682102c643324fae5dff8dab085b6c300 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: golang.org/x/crypto + go_lib_install: + - golang.org/x/crypto/curve25519 + - golang.org/x/crypto/hkdf + - golang.org/x/crypto/nacl/secretbox + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/goxnet/config b/projects/goxnet/config new file mode 100644 index 0000000..507f997 --- /dev/null +++ b/projects/goxnet/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/net +git_hash: 7dbad50ab5b31073856416cdcfeb2796d682f844 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: golang.org/x/net + go_lib_install: + - golang.org/x/net/proxy + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/meek/build b/projects/meek/build new file mode 100644 index 0000000..d195e90 --- /dev/null +++ b/projects/meek/build @@ -0,0 +1,49 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% 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 %] +mkdir -p $PTDIR $DOCSDIR + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +cd meek-client +go build -ldflags '-s' +cp -a meek-client[% IF c("var/windows") %].exe[% END %] $PTDIR + +cd ../meek-client-torbrowser +go build -ldflags '-s' +cp -a meek-client-torbrowser[% IF c("var/windows") %].exe[% END %] $PTDIR + + +[% IF c("var/windows") %] + cd ../terminateprocess-buffer + go build -ldflags '-s' + cp -a terminateprocess-buffer.exe $PTDIR +[% END %] + +cd .. +cp -a README doc/* $DOCSDIR + +cd firefox +[% c('zip', { + zip_src => [ '.' ], + zip_args => '$distdir/meek-http-helper(a)bamsoftware.com.xpi', + }) %] + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/meek/config b/projects/meek/config new file mode 100644 index 0000000..84ed2bd --- /dev/null +++ b/projects/meek/config @@ -0,0 +1,15 @@ +# vim: filetype=yaml sw=2 +version: 0.25 +git_url: https://git.torproject.org/pluggable-transports/meek.git +git_hash: '[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: meek.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +input_files: + - project: docker-image + - name: go + project: go + - name: goptlib + project: goptlib diff --git a/projects/obfs4/build b/projects/obfs4/build new file mode 100644 index 0000000..ff313e9 --- /dev/null +++ b/projects/obfs4/build @@ -0,0 +1,34 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% 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 %] +mkdir -p $PTDIR + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" +ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" +cd obfs4proxy +go build -ldflags '-s' +cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/obfs4/config b/projects/obfs4/config new file mode 100644 index 0000000..952b054 --- /dev/null +++ b/projects/obfs4/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: 0.0.5 +git_url: https://git.torproject.org/pluggable-transports/obfs4.git +git_hash: 'obfs4proxy-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfs4.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +targets: + nightly: + git_hash: master + tag_gpg_id: 0 + +input_files: + - project: docker-image + - name: go + project: go + - name: goptlib + project: goptlib + - name: ed25519 + project: ed25519 + - name: siphash + project: siphash + - name: uniuri + project: uniuri + - name: goxcrypto + project: goxcrypto + - name: goxnet + project: goxnet diff --git a/projects/siphash/config b/projects/siphash/config new file mode 100644 index 0000000..0f3f4b5 --- /dev/null +++ b/projects/siphash/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/dchest/siphash.git +git_hash: 42ba037e748c9062a75e0924705c43b893edefcd +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/dchest/siphash + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/tor-browser/build b/projects/tor-browser/build index a5f9e1d..e25a1d8 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -52,7 +52,9 @@ mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton@torprojec mv [% c('input_files_by_name/https-everywhere') %] $TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi mv [% c('input_files_by_name/noscript') %] $TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi -# TODO: add meek xpi +tar -C $TBDIR -xf [% c('input_files_by_name/obfs4') %] +tar -C $TBDIR -xf [% c('input_files_by_name/meek') %] +mv $TBDIR/meek-http-helper(a)bamsoftware.com.xpi $TBDIR/$MEEKPROFILEPATH/extensions/ tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_files_by_name/fonts') %] @@ -105,7 +107,18 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b cp -a Bundle-Data/Docs $TBDIR/$DOCSPATH tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x -# TODO: install pluggable transports here +cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults +cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js + +[% IF c("var/osx") %] + pushd $TBDIR + # Create the meek-template-sha256sum.txt file by generating a list + # of hashes (one for each file within the meek-http-helper profile) and + # and then generating one final hash from the contents of the list. + sha256sum `find $MEEKPROFILEPATH -type f | sort` | sha256sum | sed -e 's/ *-$//' > $MEEKPROFILEPATH/meek-template-sha256sum.txt + popd +[% END %] [% IF c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 9ec262b..01463d9 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -42,6 +42,10 @@ input_files: name: https-everywhere - project: fonts name: fonts + - project: meek + name: meek + - project: obfs4 + name: obfs4 - filename: Bundle-Data - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript diff --git a/projects/uniuri/config b/projects/uniuri/config new file mode 100644 index 0000000..62fa8ef --- /dev/null +++ b/projects/uniuri/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/dchest/uniuri +git_hash: 8902c56451e9b58ff940bbe5fec35d5f9c04584a +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/dchest/uniuri + +targets: + nightly: + git_hash: master + +input_files: + - project: docker-image + - name: go + project: go

1 0

[torbutton/maint-1.9.6] Bug 21330: Non-usable scrollbar appears in tor browser security settings
by gk＠torproject.org 01 Feb '17

01 Feb '17

commit 2a311617e1045cf5316fdab9aea1df9b1c7d02d4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 1 10:45:36 2017 -0500 Bug 21330: Non-usable scrollbar appears in tor browser security settings Wait until after the security settings window has finished loading before enabling the description box's scrollbar. --- src/chrome/content/preferences.js | 5 +++++ src/chrome/content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1f94dbb..1e47cad 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -41,6 +41,11 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; }; // Write the two prefs from the current settings. diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index bb6e31f..554312c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox flex="1" width="400" style="overflow: auto;"> + <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[torbutton/master] Bug 21330: Non-usable scrollbar appears in tor browser security settings
by gk＠torproject.org 01 Feb '17

01 Feb '17

commit 9c4a20bec5d1f3fc38a103b4f47c1039f48119dd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 1 10:45:36 2017 -0500 Bug 21330: Non-usable scrollbar appears in tor browser security settings Wait until after the security settings window has finished loading before enabling the description box's scrollbar. --- src/chrome/content/preferences.js | 5 +++++ src/chrome/content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1f94dbb..1e47cad 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -41,6 +41,11 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; }; // Write the two prefs from the current settings. diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index bb6e31f..554312c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox flex="1" width="400" style="overflow: auto;"> + <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[tor-browser-bundle/master] Bug 21343: Remove unused FTE related parts for macOS
by gk＠torproject.org 31 Jan '17

31 Jan '17

commit fc71d02f70b8bd05fbd4cd09650b175ea29fe186 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 30 12:46:01 2017 +0000 Bug 21343: Remove unused FTE related parts for macOS --- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 3 - .../mac/gitian-pluggable-transports.yml | 148 --------------------- gitian/descriptors/mac/gitian-utils.yml | 21 --- gitian/mkbundle-mac.sh | 18 +-- 4 files changed, 4 insertions(+), 186 deletions(-) diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index f5eb5e4..271b36c 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -1,6 +1,3 @@ -## fteproxy configuration -ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed - ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 8fc4df7..5f47b47 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -7,21 +7,9 @@ architectures: - "i386" packages: - "unzip" -- "python-setuptools" -- "python-dev" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: -- "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" - "dir": "pyptlib" -- "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" - "dir": "obfsproxy" -- "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" - "dir": "txsocksx" - "url": "https://git.torproject.org/pluggable-transports/goptlib.git" "dir": "goptlib" - "url": "https://git.torproject.org/pluggable-transports/meek.git" @@ -38,20 +26,11 @@ remotes: "dir": "obfs4" files: - "versions" -- "pycrypto.tar.gz" -- "argparse.tar.gz" -- "pyyaml.tar.gz" -- "zope.interface.zip" -- "twisted.tar.bz2" -- "parsley.tar.gz" - "go14.tar.gz" - "go.tar.gz" -- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "MacOSX10.7.sdk.tar.gz" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" -- "gmp-mac64-utils.zip" -- "openssl-mac64-utils.zip" script: | INSTDIR="$HOME/install" source versions @@ -60,13 +39,10 @@ script: | PTDIR="$TBDIR/Contents/MacOS/Tor/PluggableTransports" DOCSDIR="$TBDIR/Contents/Resources/TorBrowser/Docs" TORBINDIR="$TBDIR/Contents/MacOS/Tor" - # TODO: Fix packaging of fte so it can be included. See bug 18495. - INCLUDE_FTE=0 else PTDIR="$TBDIR/TorBrowser/Tor/PluggableTransports" DOCSDIR="$TBDIR/TorBrowser/Docs" TORBINDIR="$TBDIR/TorBrowser/Tor" - INCLUDE_FTE=1 fi export LIBRARY_PATH="$INSTDIR/lib" export REFERENCE_DATETIME @@ -77,29 +53,14 @@ script: | mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # - # dpkg requires sbin directories in the PATH - export PATH="/usr/sbin:/sbin:$PATH" - sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6 tar xaf MacOSX10.7.sdk.tar.gz export PATH="$PATH:$HOME/build/apple-osx/bin/" - if [ "z$INCLUDE_FTE" = "z1" ]; then - unzip -d $INSTDIR gmp-mac64-utils.zip - unzip -d $INSTDIR openssl-mac64-utils.zip - # FTE only needs libgmp.10.dylib and no libgmpxx anymore. - cp $INSTDIR/gmp/lib/libgmp.10.dylib $TORBINDIR/ - FTE_EXTRA_CFLAGS=" -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" - else - FTE_EXTRA_CFLAGS="" - fi - # export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar export CC=$HOME/build/apple-osx/bin/i686-apple-darwin11-gcc export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ - # http://bugs.python.org/issue9437 - export LDSHARED="$CC -pthread -shared" # Building go 1.4.x # This is needed to bootstrap the go that we actually use @@ -134,115 +95,6 @@ script: | cd ../.. export PATH="$PATH:$PWD/go/bin" - if [ "z$INCLUDE_FTE" = "z1" ]; then - - # Building pyptlib - cd pyptlib - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build - cp -a build/pyptlib $PTDIR/ - cd .. - - # Building PyCrypto - tar xzf pycrypto.tar.gz - cd pycrypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # https://bugs.launchpad.net/pycrypto/+bug/1096207 for ac_cv_func_malloc_0_nonnull. - ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-apple-darwin11 - LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers - python setup.py build --build-lib build - cp -a build/Crypto $PTDIR/ - cd .. - - # Building argparse - tar xzf argparse.tar.gz - cd argparse-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build - cp -a build/argparse.py $PTDIR/ - cd .. - - # Building Zope interfaces - unzip zope.interface.zip - cd zope.interface-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build - cp -a build/zope $PTDIR/ - cd .. - - # Building PyYAML - tar xzf pyyaml.tar.gz - cd PyYAML-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build - cp -a build/yaml $PTDIR/ - cd .. - - # Building Twisted - tar xjf twisted.tar.bz2 - cd Twisted-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers - python setup.py build --build-lib build - cp -a build/twisted $PTDIR/ - cd .. - - # Building Parsley - tar xzf parsley.tar.gz - cd Parsley-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build - cp -a build/parsley.py $PTDIR/ - cp -a build/ometa $PTDIR/ - cp -a build/terml $PTDIR/ - cd .. - - # Building txsocksx - cd txsocksx - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # 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 - python setup.py build --build-lib build - cp -a build/txsocksx $PTDIR/ - cd .. - - # Building obfsproxy - cd obfsproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build - cp -a build/obfsproxy $PTDIR/ - cp -a bin/obfsproxy $PTDIR/obfsproxy.bin - mkdir -p $DOCSDIR/Obfsproxy - cp -a {LICENSE,README} $DOCSDIR/Obfsproxy - # XXX: Workaround for bug 11190 - sed 's/python2/python/' -i $PTDIR/obfsproxy.bin - cd .. - - # Building libfte - cd libfte - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make - cp -ra fte $PTDIR/ - mkdir -p $DOCSDIR/libfte - cp -a {LICENSE,README.md} $DOCSDIR/libfte - cp -an thirdparty/re2/LICENSE $DOCSDIR/libfte/LICENSE.re2 - cd .. - - # Building fteproxy - cd fteproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - cp -a bin/fteproxy $PTDIR/fteproxy.bin - cp -ra fteproxy $PTDIR/ - mkdir -p $DOCSDIR/fteproxy - cp -a {COPYING,README.md} $DOCSDIR/fteproxy - cd .. - - fi - # end of 'INCLUDE_FTE' section - # Building goptlib cd goptlib find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index f54d5cb..55d6c7f 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -27,7 +27,6 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "openssl.tar.gz" -- "gmp.tar.bz2" - "versions" - "dzip.sh" - "libfaketime.patch" @@ -78,8 +77,6 @@ script: | export PATH="$PATH:$HOME/build/apple-osx/bin/" # For OpenSSL ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc - #For gmp, need to trick it so it knows we're doing a 64 bit build - for i in ~/build/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; # XXX Clean up these flags? export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" @@ -109,27 +106,9 @@ script: | make install cd .. - # Building GMP - tar xjf gmp.tar.bz2 - cd gmp-* - # |configure| can't cope with nano seconds faked. And even if we would revert - # that feature it would hang sometimes for unknown but to libfaketime related - # reasons. - export LD_PRELOAD="" - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # Even if we are not shipping libgmpxx anymore we still need --enable-xcc - # during compile time. - ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - make - make install - cd .. - # Grabbing the results cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent - ~/build/dzip.sh gmp-$GMP_VER-mac64-utils.zip gmp - cp *utils.zip $OUTDIR/ fi diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 3536553..789cc80 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -55,17 +55,10 @@ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ rm -f $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip (cd PTConfigs/mac && $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip TorBrowser.app.meek-http-helper) -if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then -# FTE is temporarily disabled due to bug 18495 and snowflake is Linux-only for +cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +# FTE is temporarily removed due to bug 18495 and snowflake is Linux-only for # now. - grep -v 'fteproxy' PTConfigs/mac/torrc-defaults-appendix > $GITIAN_DIR/inputs/torrc-defaults-appendix-mac grep -Ev 'default_bridge\.fte|default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js -else - cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac - # We don't have snowflake available on macOS yet. - grep -v 'default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js - -fi cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/ cp mac-tor.sh $GITIAN_DIR/inputs/ @@ -144,8 +137,7 @@ cd $GITIAN_DIR if [ ! -f inputs/clang-$CLANG_VER-linux64-wheezy-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ - ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip -o \ - ! -f inputs/gmp-$GMP_VER-mac64-utils.zip ]; + ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip ]; then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" @@ -162,7 +154,6 @@ then ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip - ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip cd .. #cp -a result/utils-mac-res.yml inputs/ else @@ -176,7 +167,6 @@ else ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip - ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip cd .. fi @@ -229,7 +219,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_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`

1 0

[tor-browser-bundle/master] Bug 21348: Make snowflake only available on Linux for now
by gk＠torproject.org 31 Jan '17

31 Jan '17

commit ff0756e4778736cb2e05f260bf277c20bcd2d31a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 30 14:25:18 2017 +0000 Bug 21348: Make snowflake only available on Linux for now --- gitian/mkbundle-mac.sh | 9 ++++++--- gitian/mkbundle-windows.sh | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 16140b1..3536553 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -56,12 +56,15 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ rm -f $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip (cd PTConfigs/mac && $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip TorBrowser.app.meek-http-helper) if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then -# FTE is temporarily disabled due to bug 18495. +# FTE is temporarily disabled due to bug 18495 and snowflake is Linux-only for +# now. grep -v 'fteproxy' PTConfigs/mac/torrc-defaults-appendix > $GITIAN_DIR/inputs/torrc-defaults-appendix-mac - grep -v 'default_bridge\.fte' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js + grep -Ev 'default_bridge\.fte|default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js else cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac - cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ + # We don't have snowflake available on macOS yet. + grep -v 'default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js + fi cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/ cp mac-tor.sh $GITIAN_DIR/inputs/ diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 1afa840..6254937 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -55,7 +55,8 @@ cd $WRAPPER_DIR/../Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows -cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ +# We don't have snowflake available on Windows yet. +grep -v 'default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/ cd windows

1 0

[tor-browser-build/master] Update firefox git branch used in nightly
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit 3f1189540ba9280ea23646477a1141d1589ede4e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 12:06:23 2017 +0100 Update firefox git branch used in nightly --- projects/firefox/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/firefox/config b/projects/firefox/config index 52fc7c5..578d353 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -21,6 +21,12 @@ var: - python targets: + nightly: + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + tag_gpg_id: 0 + var: + torbrowser_update_channel: default + linux-x86_64: var: martools_filename: mar-tools-linux64.zip

1 0

[tor-browser-bundle/hardened-builds] Use OpenSSL 1.0.2k in nightlies
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 1e136a1fc6cb23a876131c9bd61a000c145c8c72 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 30 11:26:43 2017 +0000 Use OpenSSL 1.0.2k in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index dca64e1..7f10c69 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -58,7 +58,7 @@ UNIURI_TAG=master GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2j +OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -113,7 +113,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 +OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/master] Use OpenSSL 1.0.2k in nightlies
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit be6acd09550d0f52d9a543a84d118676b3562a4f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 30 11:26:43 2017 +0000 Use OpenSSL 1.0.2k in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index ac8cfd1..94b3003 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,7 @@ UNIURI_TAG=master GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2j +OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -112,7 +112,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 +OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/maint-6.5] Bug 21326: Update the "Using a system-installed Tor" section.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit a02be8d3897859489daaf07679f25088857d5bdb Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 14:06:44 2017 -0500 Bug 21326: Update the "Using a system-installed Tor" section. Adjust the comments to account for recent Torbutton changes. --- RelativeLink/start-tor-browser | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index f556389..a78b367 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -3,7 +3,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# Copyright 2015 The Tor Project. See LICENSE for licensing information. +# Copyright 2017 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -316,17 +316,13 @@ EOF # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> +# network.security.ports.banned [...],<SocksPort>,<ControlPort> +# network.proxy.socks 127.0.0.1 +# network.proxy.socks_port <SocksPort> # extensions.torbutton.inserted_button true # extensions.torbutton.launch_warning false # extensions.torbutton.loglevel 2 # extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0