- tbb-commits - lists.torproject.org

[tor-launcher/master] Remove superfluous whitespace.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 0717ad71785545ec167c531d60b5410a19ebbc1a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 10:03:50 2015 +0000 Remove superfluous whitespace. --- src/chrome/content/network-settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f100f90..aa07e1e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -123,7 +123,7 @@ function initDialog() // Hide the Tor Browser logo and associated separator element if the // TOR_HIDE_BROWSER_LOGO environment variable is set. let env = Cc["@mozilla.org/process/environment;1"] - .getService(Ci.nsIEnvironment); + .getService(Ci.nsIEnvironment); if (env.exists("TOR_HIDE_BROWSER_LOGO")) wizardElem.setAttribute("tor_hide_browser_logo", true);

1 0

[tor-launcher/master] Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit c1ee486489e33bb07164448b096afba5d899f661 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 12 17:39:45 2015 -0500 Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set. If the TOR_HIDE_BROWSER_LOGO environment variable is set, hide Tor Browser logo within the network settings wizard. Based on contributions from linostar and proper. --- src/chrome/content/network-settings-wizard.xul | 12 ++++++------ src/chrome/content/network-settings.js | 9 ++++++++- src/chrome/skin/network-settings.css | 7 ++++++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 04251f9..33ba6c5 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -35,7 +35,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator orient="vertical" /> + <separator class="tbb-logo-separator" orient="vertical" /> <groupbox flex="1"> <description>&torsettings.prompt;</description> </groupbox> @@ -60,7 +60,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.proxyQuestion;</label> @@ -79,7 +79,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <label class="instructions">&torSettings.enterProxy;</label> <groupbox id="proxySpecificSettings" /> </wizardpage> @@ -89,7 +89,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.bridgeQuestion;</label> @@ -109,7 +109,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <vbox> <label id="bridgeSettingsPrompt" class="question">&torSettings.bridgeSettingsPrompt;</label> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 908e711..f100f90 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -120,6 +120,13 @@ function initDialog() var haveWizard = (wizardElem != null); if (haveWizard) { + // Hide the Tor Browser logo and associated separator element if the + // TOR_HIDE_BROWSER_LOGO environment variable is set. + let env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists("TOR_HIDE_BROWSER_LOGO")) + wizardElem.setAttribute("tor_hide_browser_logo", true); + // Set "Copy Tor Log" label and move it after the Quit (cancel) button. var copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index e4142d4..331ae42 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, The Tor Project, Inc. + * Copyright (c) 2015, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -94,6 +94,11 @@ button.firstAnswer { margin-right: 20px; } +wizard[tor_hide_browser_logo="true"] .tbb-logo, +wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { + display: none; +} + #bridgeCustomEntry { margin-left: 30px; }

1 0

[torbutton/master] Bug 14100: Add option to hide NetworkSettings
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 765fee607af6fa88b99476dee10298e5db3b9eb1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 09:36:35 2015 +0000 Bug 14100: Add option to hide NetworkSettings This patch hides the NetworkSettings menuitem if the environment variable TOR_NO_DISPLAY_NETWORK_SETTINGS is set. Thanks to linostar for writing it. --- src/chrome/content/torbutton.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bf06e04..4715fb6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2386,6 +2386,16 @@ function torbutton_close_on_toggle(mode, newnym) { // New Identity where it is not supported (ie no control port). function torbutton_check_protections() { + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + + // Bug 14100: check for the existence of an environment variable + // in order to toggle the visibility of networksettings menuitem + if (env.exists("TOR_NO_DISPLAY_NETWORK_SETTINGS")) + document.getElementById("torbutton-networksettings").hidden = true; + else + document.getElementById("torbutton-networksettings").hidden = false; + var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref;

1 0

[torbutton/master] Bug #13078: environment variable to skip TorButton control port verification
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 38a59e819604de5018db5db54fb08fd9e1581d1f Author: Patrick Schleizer <adrelanos(a)riseup.net> Date: Sun Sep 7 20:49:41 2014 +0000 Bug #13078: environment variable to skip TorButton control port verification --- src/chrome/content/torbutton.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5aed682..bf06e04 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1875,8 +1875,12 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. + const kEnvSkipControlPortTest = "TOR_SKIP_CONTROLPORTTEST"; + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); if (m_tb_control_port && !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful;

1 0

[tor-browser-bundle/maint-4.0] We are at 4.0.3 now
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 2a3a14746c15aed4350425ce96e2b7967cafee85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:08:20 2015 +0000 We are at 4.0.3 now --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 911afdd..7cd1a03 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ channels: release: 4.0.3 alpha: 4.5-alpha-2 versions: - 4.0.2: + 4.0.3: platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/4.0.3

1 0

[tor-browser-bundle/maint-4.0] Update the config.yml
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 1c40c56419150c42daf5b874b4dccd52507b8d85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:04:58 2015 +0000 Update the config.yml --- tools/update-responses/config.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index bdecdec..911afdd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,23 +6,21 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.2 - alpha: 4.5-alpha-1 + release: 4.0.3 + alpha: 4.5-alpha-2 versions: 4.0.2: - platformVersion: 31.3.0 + platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.2 + download_url: https://www.torproject.org/dist/torbrowser/4.0.3 incremental_from: - - 4.0 - - 4.0.1 - 4.5-alpha-1: - platformVersion: 31.2.0 + - 4.0.2 + 4.5-alpha-2: + platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2 incremental_from: - - 4.0 - - 4.0.1 + - 4.5-alpha-1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-4.0] Preparing 4.0.3.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 9c67ead33843115e7f4dcd2f7ce96c6008b19d0d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:35:17 2015 +0000 Preparing 4.0.3. Update Changelog; bump version of Tor Launcher, Firefox and NoScript. --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ gitian/versions | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 50f7974..12f5180 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 4.0.3 -- Jan 13 2014 + * All Platforms + * Update Firefox to 31.4.0esr + * Update NoScript to 2.6.9.10 + * Update meek to 0.15 + * Update Tor Launcher to 0.2.7.0.2 + * Translation updates only + Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms * Update Firefox to 31.3.0esr diff --git a/gitian/versions b/gitian/versions index a8c9475..ee4435c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,16 +1,16 @@ -TORBROWSER_VERSION=4.0.2 +TORBROWSER_VERSION=4.0.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 TOR_TAG=tor-0.2.5.10 -TORLAUNCHER_TAG=0.2.7.0.1 +TORLAUNCHER_TAG=0.2.7.0.2 TORBUTTON_TAG=1.7.0.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 @@ -33,7 +33,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-4.0] Bug 13857: allow making incrementals MARs for a specific channel
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit c39111b403e519aa56660c32c65fc9a64519ac17 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 14:43:12 2014 +0100 Bug 13857: allow making incrementals MARs for a specific channel The gen_incrementals can now receive a channel name as argument. In that case, incremental MARs will be created for this channel only. If there is no argument, incremental MARs for all channels are created. Makefile rules have been added for the different channels. --- gitian/Makefile | 8 +++++++- gitian/README.build | 7 +++++++ tools/update-responses/update_responses | 24 +++++++++++++++--------- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index b2e3224..5b646c8 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,7 +33,13 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals + ../tools/update-responses/gen_incrementals release + +incrementals-alpha: + ../tools/update-responses/gen_incrementals alpha + +incrementals-beta: + ../tools/update-responses/gen_incrementals beta update_responses: ../tools/update-responses/update_responses diff --git a/gitian/README.build b/gitian/README.build index 24a67a8..a5de8e2 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -71,6 +71,13 @@ Detailed Explanation of Scripts: - match-nightly: The equivalent to the 'match' rule for nightly packages - match-alpha: The equivalent to the 'match' rule for alpha packages - match-beta: The equivalent to the 'match' rule for beta packages + - hash-nightly: The equivalent to the 'hash' rule for nightly packages + - hash-alpha: The equivalent to the 'hash' rule for alpha packages + - hash-beta: The equivalent to the 'hash' rule for beta packages + - incrementals-alpha: The equivalent to the 'incrementals' rule for + alpha packages + - incrementals-beta: The equivalent to the 'incrementals' rule for + beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5b85037..e66b27d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -180,14 +180,6 @@ sub create_missing_incremental_mars_for_version { $pm->wait_all_children; } -sub create_all_missing_incremental_mars { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { - get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); - } -} - sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -195,6 +187,16 @@ sub get_config { // $config->{$name}; } +sub channel_to_version { + my ($config, @channels) = @_; + return values %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + } + return map { $config->{channels}{$_} } @channels; +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -325,9 +327,13 @@ my %actions = ( clean_htdocs; }, gen_incrementals => sub { + my ($config) = @_; extract_martools; check_deps; - create_all_missing_incremental_mars(@_); + foreach my $version (channel_to_version($config, @ARGV)) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } }, );

1 0

[tor-browser-bundle/maint-4.0] Separate MAR file/htdocs generation.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit dca3ac0e09d1feda5d4f370960f824c0124f6492 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 21:44:36 2015 +0000 Separate MAR file/htdocs generation. This is part of d852329ac0979d8005e9e8bdd9b3f8a049fc2db4 which we need in order to be able to backport #13857 cleanly. The related part of the commit message is: Change update_responses to select the action to be done based on the program name, thereby separating the incremental MAR file generation (done via a new 'gen_incrementals' symlink) from the htdocs generation. Also added an 'update_responses' make target. Thanks to boklm for help with this. --- gitian/Makefile | 3 +++ tools/update-responses/gen_incrementals | 1 + tools/update-responses/update_responses | 34 ++++++++++++++++++++++++------- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 2c17656..b2e3224 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,6 +33,9 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: + ../tools/update-responses/gen_incrementals + +update_responses: ../tools/update-responses/update_responses hash: diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b28b575..5b85037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; @@ -13,6 +14,7 @@ use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +use File::Basename; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -158,7 +160,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars { +sub create_missing_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -178,6 +180,14 @@ sub create_missing_incremental_mars { $pm->wait_all_children; } +sub create_all_missing_incremental_mars { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -224,7 +234,6 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); - create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) { @@ -309,8 +318,19 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } -extract_martools; -check_deps; -write_responses($config); -write_htaccess($config); -clean_htdocs; +my %actions = ( + update_responses => sub { + write_responses(@_); + write_htaccess(@_); + clean_htdocs; + }, + gen_incrementals => sub { + extract_martools; + check_deps; + create_all_missing_incremental_mars(@_); + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

[tor-browser-bundle/maint-4.0] Bug 13857: allow updating responses for a specific channel
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 06e8c9e859109da8bff3668e95cd3641bde48083 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 19:19:19 2014 +0100 Bug 13857: allow updating responses for a specific channel The update_responses command can now receive a channel name as argument. In that case, only the xml responses for the selected channel(s) are updated. The files are now located in directory htdocfiles/$channel and each channel has its own .htaccess file in that directory. Makefile rules have been added to update the different channels. --- gitian/Makefile | 8 +++- gitian/README.build | 4 ++ tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 66 ++++++++++++++++----------- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 5b646c8..33403b5 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -42,7 +42,13 @@ incrementals-beta: ../tools/update-responses/gen_incrementals beta update_responses: - ../tools/update-responses/update_responses + ../tools/update-responses/update_responses release + +update_responses-alpha: + ../tools/update-responses/update_responses alpha + +update_responses-beta: + ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions diff --git a/gitian/README.build b/gitian/README.build index a5de8e2..b3e8be5 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -78,6 +78,10 @@ Detailed Explanation of Scripts: alpha packages - incrementals-beta: The equivalent to the 'incrementals' rule for beta packages + - update_responses-alpha: The equivalent to the 'update_responses' rule + for alpha packages + - update_responses-beta: The equivalent to the 'update_responses' rule + for beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml deleted file mode 100644 index 910e99d..0000000 --- a/tools/update-responses/htdocs/no-update.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates></updates> diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e66b27d..0c487e3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -24,7 +24,7 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); +my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; sub exit_error { @@ -46,17 +46,21 @@ sub get_nbprocs { } sub write_htdocs { - my ($file, $content) = @_; + my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; - write_file("$htdocsdir/$file", $content); - $htdocsfiles{$file} = 1; + mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; + write_file("$htdocsdir/$channel/$file", $content); + $htdocsfiles{$channel}->{$file} = 1; } sub clean_htdocs { - opendir(my $d, $htdocsdir); - my @files = grep { ! $htdocsfiles{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$_" } @files; + my (@channels) = @_; + foreach my $channel (@channels) { + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; + } } sub get_sha512_hex_of_file { @@ -233,8 +237,10 @@ sub get_response { } sub write_responses { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; get_version_files($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; @@ -249,43 +255,44 @@ sub write_responses { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}); - write_htdocs("$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$version-$os-$lang.xml", $resp); foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}, $files->{$os}{$lang}{partial}{$from_version}); - write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); } } } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } } sub write_htaccess { - my ($config) = @_; - my $htaccess = "RewriteEngine On\n"; + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; my $flags = "[last]"; - foreach my $channel (sort keys %{$config->{channels}}) { + foreach my $channel (@channels) { + my $htaccess = "RewriteEngine On\n"; my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; - $htaccess .= "RewriteRule " - . "^$channel/[^\/]+/$version/ " - . "no-update.xml $flags\n"; + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) { foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt " - . "$version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } + write_htdocs($channel, '.htaccess', $htaccess); } - write_htdocs('.htaccess', $htaccess); } sub check_deps { @@ -322,9 +329,16 @@ sub extract_martools { my %actions = ( update_responses => sub { - write_responses(@_); - write_htaccess(@_); - clean_htdocs; + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + } + write_responses($config, @channels); + write_htaccess($config, @channels); + clean_htdocs(@channels); }, gen_incrementals => sub { my ($config) = @_;

1 0