tbb-commits September 2014

tbb-commits@lists.torproject.org

2 participants
83 discussions

[torbutton/master] Bug #10751.2: Adapt Torbutton to Australis UI.
by mikeperry＠torproject.org 29 Sep '14

29 Sep '14

commit 4024c6ff958724d226a5a30b68316b25fb876616 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 25 16:46:54 2014 -0700 Bug #10751.2: Adapt Torbutton to Australis UI. Use CustomizableUI, if it is available, to add TorButton's button to navigation toolbar. --- src/chrome/content/torbutton.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 153cc3c..4ca6614 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -541,14 +541,21 @@ function torbutton_init() { if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button")) { torbutton_log(3, 'Adding button'); try { - var toolbutton = torbutton_get_button_from_toolbox(); - var navbar = document.getElementById("nav-bar"); - // XXX: Will probably fail on fennec. Also explicitly forbidden - // by MDC style guides (for good reason). Fix later.. - var urlbar = document.getElementById("urlbar-container"); - navbar.insertBefore(toolbutton, urlbar); - navbar.setAttribute("currentset", navbar.currentSet); - document.persist("nav-bar", "currentset"); + if (CustomizableUI) { + // ESR31-style toolbar + CustomizableUI.addWidgetToArea("torbutton-button", CustomizableUI.AREA_NAVBAR, 0); + } else { + // ESR24-style toolbar + // TODO: Remove this branch once TBB-ESR24 has been retired. + var toolbutton = torbutton_get_button_from_toolbox(); + var navbar = document.getElementById("nav-bar"); + // XXX: Will probably fail on fennec. Also explicitly forbidden + // by MDC style guides (for good reason). Fix later.. + var urlbar = document.getElementById("urlbar-container"); + navbar.insertBefore(toolbutton, urlbar); + navbar.setAttribute("currentset", navbar.currentSet); + document.persist("nav-bar", "currentset"); + } torbutton_log(3, 'Button added'); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); } catch(e) {

1 0

[tor-browser-bundle/master] Add the update responses script
by gk＠torproject.org 26 Sep '14

26 Sep '14

commit c2b76dcc4a854d7cecb44acac2bea1cf23cf51e6 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Thu Sep 25 19:39:19 2014 +0200 Add the update responses script Add the update responses script in directory tools/update-responses. This adds the content of commit 2c3625507a5c12b4c15b6681a8b694114a0cfb7b from https://github.com/boklm/tb-update-response. --- tools/update-responses/.gitignore | 1 + tools/update-responses/README.md | 45 +++++++ tools/update-responses/config.yml | 16 +++ tools/update-responses/htdocs/no-update.xml | 2 + tools/update-responses/update_responses | 169 +++++++++++++++++++++++++++ 5 files changed, 233 insertions(+) diff --git a/tools/update-responses/.gitignore b/tools/update-responses/.gitignore new file mode 100644 index 0000000..c077014 --- /dev/null +++ b/tools/update-responses/.gitignore @@ -0,0 +1 @@ +htdocs diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md new file mode 100644 index 0000000..ee21bac --- /dev/null +++ b/tools/update-responses/README.md @@ -0,0 +1,45 @@ +Tor Browser Update Responses script +=================================== + +This repository contains a script to generate responses for Tor Browser +updater. + +See ticket [#12622](https://trac.torproject.org/projects/tor/ticket/12622) +for details. + + +Dependencies +------------ + +The following perl modules need to be installed to run the script: + FindBin YAML File::Slurp Digest::SHA XML::Writer + +On Debian / Ubuntu you can install them with: + +``` + # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ + libdigest-sha-perl libxml-writer-perl +``` + +On Red Hat / Fedora you can install them with: + +``` + # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer + do yum install "perl($module)"; done +``` + + +URL Format +---------- + +The URL format is: + https://something/$channel/$build_target/$tb_version/$lang?force=1 + +'build_target' is the OS for which the browser was built. The correspo +ndance between the build target and the OS name that we use in archive +files is defined in the config.yml file. + +'tb_version' is the Tor Browser version. + +'lang' is the locale. + diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml new file mode 100644 index 0000000..8b5475a --- /dev/null +++ b/tools/update-responses/config.yml @@ -0,0 +1,16 @@ +--- +build_targets: + linux32: Linux_x86-gcc3 + linux64: Linux_x86_64-gcc3 + win32: WINNT_x86-gcc3 + osx32: Darwin_x86-gcc3 +channels: + alpha: 4.0-alpha-3 +versions: + 4.0-alpha-3: + platformVersion: 24.8.1 + detailsURL: https://www.torproject.org/projects/torbrowser.html.en + download_url: https://www.torproject.org/dist/torbrowser/4.0-alpha-3 +# osx32: +# minSupportedOSVersion: 10.7 +# unsupported: 1 diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml new file mode 100644 index 0000000..910e99d --- /dev/null +++ b/tools/update-responses/htdocs/no-update.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates></updates> diff --git a/tools/update-responses/releases/.directory b/tools/update-responses/releases/.directory new file mode 100644 index 0000000..e69de29 diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses new file mode 100755 index 0000000..e082592 --- /dev/null +++ b/tools/update-responses/update_responses @@ -0,0 +1,169 @@ +#!/usr/bin/perl -w + +use strict; +use FindBin; +use YAML qw(LoadFile); +use File::Slurp; +use Digest::SHA; +use XML::Writer; + +my $htdocsdir = "$FindBin::Bin/htdocs"; +my $config = LoadFile("$FindBin::Bin/config.yml"); +my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + exit (exists $_[1] ? $_[1] : 1); +} + +sub build_target_by_os { + $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +} + +sub write_htdocs { + my ($file, $content) = @_; + mkdir $htdocsdir unless -d $htdocsdir; + write_file("$htdocsdir/$file", $content); + $htdocsfiles{$file} = 1; +} + +sub clean_htdocs { + opendir(my $d, $htdocsdir); + my @files = grep { ! $htdocsfiles{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$_" } @files; +} + +sub get_sha512_hex_of_file { + my ($file) = @_; + my $sha = Digest::SHA->new("512"); + $sha->addfile($file); + return $sha->hexdigest; +} + +sub get_version_files { + my ($config, $version) = @_; + return if $config->{versions}{$version}{files}; + my $files = {}; + my $vdir = "$FindBin::Bin/releases/$version"; + opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; + foreach my $file (readdir $d) { + next unless -f "$vdir/$file"; + if ($file =~ m/^tor-browser-([^-]+)-${version}_(.+)\.mar$/) { + my ($os, $lang) = ($1, $2); + $files->{$os}{$lang}{complete} = { + type => 'complete', + URL => "$config->{versions}{$version}{download_url}/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + }; + next; + } + if ($file =~ m/^tor-browser-([^-]+)-([^-]+)-${version}_(.+)\.mar$/) { + my ($os, $from_version, $lang) = ($1, $2, $3); + $files->{$os}{$lang}{partial}{$from_version} = { + type => 'partial', + URL => "$config->{versions}{$version}{download_url}/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + } + } + } + closedir $d; + $config->{versions}{$version}{files} = $files; +} + +sub get_config { + my ($config, $version, $os, $name) = @_; + return $config->{versions}{$version}{$os}{$name} + // $config->{versions}{$version}{$name} + // $config->{$name}; +} + +sub get_response { + my ($config, $version, $os, @patches) = @_; + my $res; + my $writer = XML::Writer->new(OUTPUT => \$res, ENCODING => 'UTF-8'); + $writer->xmlDecl; + $writer->startTag('updates'); + if (get_config($config, $version, $os, 'unsupported')) { + $writer->startTag('update', + unsupported => 'true', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + ); + goto CLOSETAGS; + } + my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + $writer->startTag('update', + type => 'minor', + displayVersion => $version, + appVersion => $version, + platformVersion => get_config($config, $version, $os, 'platformVersion'), + buildID => '20000101000000', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + ); + foreach my $patch (@patches) { + $writer->startTag('patch', %$patch); + $writer->endTag('patch'); + } + CLOSETAGS: + $writer->endTag('update'); + $writer->endTag('updates'); + $writer->end; + return $res; +} + +sub write_responses { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + my $files = $config->{versions}{$version}{files}; + foreach my $os (keys %$files) { + foreach my $lang (keys %{$files->{$os}}) { + my $resp = get_response($config, $version, $os, + $files->{$os}{$lang}{complete}); + write_htdocs("$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); + } + } + } + } +} + +sub write_htaccess { + my ($config) = @_; + my $htaccess = "RewriteEngine On\n"; + my $flags = "[last]"; + foreach my $channel (keys %{$config->{channels}}) { + my $version = $config->{channels}{$channel}; + my $files = $config->{versions}{$version}{files}; + $htaccess .= "RewriteRule " + . "^$channel/[^\/]+/$version/ " + . "no-update.xml $flags\n"; + foreach my $os (keys %$files) { + my $bt = build_target_by_os($os); + foreach my $lang (keys %{$files->{$os}}) { + foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$channel/$bt " + . "$version-$os-en-US.xml $flags\n"; + } + } + write_htdocs('.htaccess', $htaccess); +} + +write_responses($config); +write_htaccess($config); +clean_htdocs;

1 0

[tor-browser-bundle/maint-3.6] Fix wrong changelog entry.
by gk＠torproject.org 26 Sep '14

26 Sep '14

commit e3cf791da65d0aca2fec7faac5a22a1954d44122 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 26 14:02:15 2014 +0000 Fix wrong changelog entry. --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e927d9c..916ad5d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,6 @@ Tor Browser Bundle 3.6.6 -- Sep 24 2014 * Bug 10804: Workaround fix for some cases of startup hang * Linux * Bug 9150: Make RPATH unavailable on Tor binary. - * Bug 13031: Add full RELRO protection. Tor Browser Bundle 3.6.5 -- Sep 2 2014 * All Platforms

1 0

[tor-browser-bundle/master] Bug 13245: Prevent non-english TBBs from upgrading to english version.
by mikeperry＠torproject.org 25 Sep '14

25 Sep '14

commit a92ec3e06a17f1a19c35590c8ad93081b180ef4e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 25 19:05:59 2014 -0700 Bug 13245: Prevent non-english TBBs from upgrading to english version. --- gitian/descriptors/linux/gitian-bundle.yml | 6 ++++++ gitian/descriptors/mac/gitian-bundle.yml | 6 ++++++ gitian/descriptors/windows/gitian-bundle.yml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 38882f3..d3b030c 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -183,6 +183,12 @@ script: | rm -rf defaults popd + # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + pushd tor-browser_$LANG/Browser/ + echo "$LANG" > update.locale + zip -Xm omni.ja update.locale + popd + # Recreate precomplete file (needs to be accurate for full MAR updates). pushd tor-browser_$LANG/Browser rm -f precomplete diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 9801826..bd8bb5d 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -227,6 +227,12 @@ script: | rm -rf defaults popd + # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + pushd ~/build/dmg/$DEST.app/Contents/MacOS/ + echo "$LANG" > update.locale + zip -Xm omni.ja update.locale + popd + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then pushd ~/build/dmg/ ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 79d6340..2d50f9c 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -162,6 +162,12 @@ script: | rm -rf defaults popd + # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + pushd "Tor Browser"/Browser/ + echo "$LANG" > update.locale + zip -Xm omni.ja update.locale + popd + # Recreate precomplete file (needs to be accurate for full MAR updates). pushd "Tor Browser"/Browser/ rm -f precomplete

1 0

[tor-browser-bundle/master] Update changelog for 4.0a3 (and fix 3.6.6 changelog for history).
by mikeperry＠torproject.org 25 Sep '14

25 Sep '14

commit 2e91690f2dac97c8ece8384b38085833a6ccb7e6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 25 19:07:26 2014 -0700 Update changelog for 4.0a3 (and fix 3.6.6 changelog for history). --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6f3ea04..82e8138 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -11,6 +11,7 @@ Tor Browser 4.0-alpha-3 -- Sep 24 2014 * Bug 13049: Browser update failure (self.update is undefined) * Bug 13047: Updater should not send Kernel and GTK version * Bug 12998: Prevent intermediate certs from being written to disk + * Bug 13245: Prevent non-english TBBs from upgrading to english version. * Linux: * Bug 9150: Make RPATH unavailable on Tor binary. * Bug 13031: Add full RELRO protection. @@ -27,7 +28,6 @@ Tor Browser Bundle 3.6.6 -- Sep 24 2014 * Bug 10804: Workaround fix for some cases of startup hang * Linux * Bug 9150: Make RPATH unavailable on Tor binary. - * Bug 13031: Add full RELRO protection. Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * All Platforms

1 0

[tor-browser-bundle/master] Use the commit for Tor Launcher as well.
by gk＠torproject.org 24 Sep '14

24 Sep '14

commit 72ec0faa93ceb840a897e2e6953334ced2a8ff7b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 24 15:03:46 2014 +0000 Use the commit for Tor Launcher as well. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index be1283f..c4938d0 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 286f860..d71c824 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -89,7 +89,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 520119b..d7fc722 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -82,7 +82,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index eb368a9..2c60e6e 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -36,7 +36,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0

[tor-browser-bundle/maint-3.6] Use the commit for Tor Launcher as well.
by gk＠torproject.org 24 Sep '14

24 Sep '14

commit 4fd2bc0dda2c3c510f8062d3420e9a3c8f6e94fc Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 24 15:00:03 2014 +0000 Use the commit for Tor Launcher as well. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index cdaf51d..e4a428b 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 3cd137b..c3dfb83 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -91,7 +91,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e582d17..4d24561 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -86,7 +86,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 29f1e34..8778eca 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -37,7 +37,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0

[tor-browser-bundle/maint-3.6] Also switch gitian to commit hash.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 54b54404bebf330a2addd7fc77730326fe6de756 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 24 02:26:42 2014 -0700 Also switch gitian to commit hash. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- gitian/versions | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index ea6d171..cdaf51d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -83,7 +83,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index e852989..3cd137b 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -90,7 +90,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index ecabeae..e582d17 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -85,7 +85,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 7531589..29f1e34 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -36,7 +36,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 8aa818e..36269f3 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -144,6 +144,6 @@ done cd "$INPUTS_DIR" -verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" +#verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" git checkout "$GITIAN_TAG" diff --git a/gitian/versions b/gitian/versions index 7c38d91..a52facf 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=ae72871ea2e1c731ee34bba27a47fcce1b79786e #tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Also switch gitian to commit hash.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 4d5787fb137e5275c5c23588caa1956770f3c67e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 24 02:28:08 2014 -0700 Also switch gitian to commit hash. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index e3b145d..be1283f 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -83,7 +83,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 9e8ec7c..286f860 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -88,7 +88,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 595ff29..520119b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -81,7 +81,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index afcd70d..eb368a9 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -35,7 +35,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 5b1a304..97bc56e 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -147,6 +147,6 @@ done cd "$INPUTS_DIR" -verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" +#verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" git checkout "$GITIAN_TAG" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 20e38f8..ccfb542 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=ae72871ea2e1c731ee34bba27a47fcce1b79786e #tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Also update the tag verification for Tor Launcher..
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 6312ab050bfbcc9d70576c5cb993f923054b96a3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 24 02:17:43 2014 -0700 Also update the tag verification for Tor Launcher.. --- gitian/verify-tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a4f6ca1..5b1a304 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -90,7 +90,6 @@ while read dir keyring tag; do verify_git "$dir" "$WRAPPER_DIR/gpg/$keyring" "$tag" done << EOF tbb-windows-installer tbb-windows-installer.gpg $NSIS_TAG -tor-launcher torbutton.gpg $TORLAUNCHER_TAG tor-browser torbutton.gpg $TORBROWSER_TAG torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG @@ -112,6 +111,7 @@ libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG fteproxy $FTEPROXY_TAG txsocksx $TXSOCKSX_TAG +tor-launcher $TORLAUNCHER_TAG EOF # Verify signatures on signed packages

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits September 2014