- tbb-commits - lists.torproject.org

[tor-browser-build/master] Update rbm for #34320
by gk＠torproject.org 21 Jun '20

21 Jun '20

commit d61aff9cf0f51de9d6fa4a8c9cb5a71e203bce4f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 1 00:11:29 2020 +0200 Update rbm for #34320 We also clean projects/release/dmg2mar since TMPDIR is now set by rbm. --- projects/release/dmg2mar | 2 -- rbm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/release/dmg2mar b/projects/release/dmg2mar index ad1058e..d6175f5 100644 --- a/projects/release/dmg2mar +++ b/projects/release/dmg2mar @@ -1,6 +1,4 @@ #!/bin/bash [% c("var/set_default_env") -%] -export TMPDIR=[% shell_quote(c("tmp_dir")) %] -mkdir -p "$TMPDIR" cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %] [% shell_quote(c("basedir")) %]/tools/dmg2mar diff --git a/rbm b/rbm index 5f8c0ac..c50d8e2 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 5f8c0ac72abfa72cc80d2ff24627c3e3f8db963f +Subproject commit c50d8e22c4fcddc4ed567815b1b0135419c2a53c

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_34320'
by gk＠torproject.org 21 Jun '20

21 Jun '20

commit e5bcf4726abf69b1f3733a3b965162b2335ae4ef Merge: 7cfa5d9 d61aff9 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 21 19:35:36 2020 +0000 Merge remote-tracking branch 'boklm/bug_34320' projects/release/dmg2mar | 2 -- rbm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)

1 0

[rbm/master] Bug 34320: Set TMPDIR when running scripts
by gk＠torproject.org 21 Jun '20

21 Jun '20

commit c50d8e22c4fcddc4ed567815b1b0135419c2a53c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 29 20:34:23 2020 +0200 Bug 34320: Set TMPDIR when running scripts --- doc/rbm_config.asc | 3 ++- lib/RBM.pm | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 1935cd3..43feb9a 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -139,7 +139,8 @@ tmp_dir:: rbm_tmp_dir:: A directory created inside +tmp_dir+ using +File::Temp+, that you can use to store temporary files. This directory is removed - automatically when rbm exits. + automatically when rbm exits. When running scripts, the TMPDIR + environment variable is also set to this directory. output_dir:: The directory where output files (tarballs, spec files or diff --git a/lib/RBM.pm b/lib/RBM.pm index 7cc9e24..b9ad1ad 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -461,8 +461,9 @@ sub run_script { my ($project, $cmd, $f) = @_; $f //= \&capture_exec; my @res; + local $ENV{TMPDIR} = project_config($project, 'rbm_tmp_dir'); if ($cmd =~ m/^#/) { - my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); + my (undef, $tmp) = File::Temp::tempfile(DIR => $ENV{TMPDIR}); path($tmp)->spew_utf8($cmd); chmod 0700, $tmp; @res = $f->($tmp); @@ -1146,7 +1147,7 @@ sub build_run { foreach my $s (@scripts) { my $cmd = $scripts_root{$s} ? project_config($project, 'suexec', { suexec_cmd => "$srcdir/$s" }) : "$srcdir/$s"; - if (system_log($build_log, $cmd) != 0) { + if (run_script($project, $cmd, sub { system_log($build_log, @_) }) != 0) { $error = "Error running $script_name"; if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n";

1 0

[tor-launcher/master] Bug 33998: Use CSS grid instead of XUL grid.
by gk＠torproject.org 18 Jun '20

18 Jun '20

commit 0cdf02857f3e30d5b0bd4696cf5de1c69874ce9c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 2 11:46:48 2020 -0400 Bug 33998: Use CSS grid instead of XUL grid. Mozilla is removing support for XUL <grid>. --- src/chrome/content/network-settings-shared.js | 105 +++++++++++++------------- src/chrome/skin/network-settings.css | 6 ++ 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/src/chrome/content/network-settings-shared.js b/src/chrome/content/network-settings-shared.js index b125d24..07dcc12 100644 --- a/src/chrome/content/network-settings-shared.js +++ b/src/chrome/content/network-settings-shared.js @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -12,58 +12,57 @@ var proxySettings = ` <button class="helpButton" oncommand="onOpenHelp('proxyHelpContent')"/> </hbox> <groupbox id="proxySpecificSettings"> - <grid flex="1"> - <columns> - <column/> - <column/> - </columns> - <rows> - <row align="center"> - <label value="&torsettings.useProxy.type;" control="proxyType" - class="rightAlign"/> - <hbox align="center"> - <menulist id="proxyType" sizetopopup="always" - placeholder="&torsettings.useProxy.type.placeholder;" - oncommand="onProxyTypeChange()"> - <menupopup id="proxyType_menuPopup"> - <menuitem label="&torsettings.useProxy.type.socks4;" - value="SOCKS4"/> - <menuitem label="&torsettings.useProxy.type.socks5;" - value="SOCKS5"/> - <menuitem label="&torsettings.useProxy.type.http;" - value="HTTP"/> - </menupopup> - </menulist> - </hbox> - </row> - <row align="center"> - <label value="&torsettings.useProxy.address;" control="proxyAddr" - class="rightAlign"/> - <hbox align="center"> - <html:input id="proxyAddr" size="20" style="-moz-box-flex: 1;" - placeholder="&torsettings.useProxy.address.placeholder;"/> - <separator orient="vertical"/> - <label value="&torsettings.useProxy.port;" control="proxyPort"/> - <html:input id="proxyPort" size="4"/> - </hbox> - </row> - <row align="center"> - <label id="proxyUsernameLabel" - value="&torsettings.useProxy.username;" - control="proxyUsername" class="rightAlign"/> - <hbox align="center"> - <html:input id="proxyUsername" size="14" style="-moz-box-flex: 1;" - placeholder="&torsettings.optional;"/> - <separator orient="vertical"/> - <label id="proxyPasswordLabel" - value="&torsettings.useProxy.password;" - control="proxyPassword"/> - <html:input id="proxyPassword" size="14" type="password" - placeholder="&torsettings.optional;"/> - </hbox> - </row> - </rows> - </grid> + <box id="proxySpecificSettingsGrid"> + <hbox align="center"> + <label value="&torsettings.useProxy.type;" control="proxyType" + class="rightAlign"/> + </hbox> + <hbox align="center"> + <menulist id="proxyType" sizetopopup="always" + placeholder="&torsettings.useProxy.type.placeholder;" + oncommand="onProxyTypeChange()"> + <menupopup id="proxyType_menuPopup"> + <menuitem label="&torsettings.useProxy.type.socks4;" + value="SOCKS4"/> + <menuitem label="&torsettings.useProxy.type.socks5;" + value="SOCKS5"/> + <menuitem label="&torsettings.useProxy.type.http;" + value="HTTP"/> + </menupopup> + </menulist> + </hbox> + <box/> + + <hbox align="center"> + <label value="&torsettings.useProxy.address;" control="proxyAddr" + class="rightAlign"/> + </hbox> + <hbox align="center"> + <html:input id="proxyAddr" size="20" style="-moz-box-flex: 1;" + placeholder="&torsettings.useProxy.address.placeholder;"/> + <separator orient="vertical"/> + <label value="&torsettings.useProxy.port;" control="proxyPort"/> + <html:input id="proxyPort" size="4"/> + </hbox> + <box/> + + <hbox align="center"> + <label id="proxyUsernameLabel" + value="&torsettings.useProxy.username;" + control="proxyUsername" class="rightAlign"/> + </hbox> + <hbox align="center"> + <html:input id="proxyUsername" size="14" + placeholder="&torsettings.optional;"/> + <separator orient="vertical"/> + <label id="proxyPasswordLabel" + value="&torsettings.useProxy.password;" + control="proxyPassword"/> + <html:input id="proxyPassword" size="14" type="password" + placeholder="&torsettings.optional;"/> + </hbox> + <box/> + </box> </groupbox> </vbox> `; diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index f60c5c6..0c0d53a 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -43,6 +43,7 @@ wizard label { } .rightAlign { + -moz-box-flex: 1; text-align: right; } @@ -125,6 +126,11 @@ window.os-mac #bridgeList { display: none; } +#proxySpecificSettingsGrid { + display: grid; + grid-template-columns: auto auto 1fr; /* the third column is for spacing */ +} + /* reuse Mozilla's help button from the Firefox hamburger menu */ .helpButton { background: url('chrome://global/skin/icons/help.svg') no-repeat center center;

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 16940: After update, load local change notes.
by gk＠torproject.org 16 Jun '20

16 Jun '20

commit 5102454cb075e8435b56e1e948a078864b7c8d5b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 13 14:45:03 2020 -0400 fixup! Bug 16940: After update, load local change notes. --- browser/base/content/abouttbupdate/aboutTBUpdate.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index ab4c53df007c..8489cfef5083 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -13,7 +13,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src chrome:" /> + <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <title>&aboutTBUpdate.changelogTitle;</title> <link rel="stylesheet" type="text/css" href="chrome://browser/content/abouttbupdate/aboutTBUpdate.css"/>

1 0

[tor-browser-build/master] Merge remote-tracking branch 'jrand/namecoin-3.3.11'
by gk＠torproject.org 14 Jun '20

14 Jun '20

commit 7cfa5d9cdb6f18bfed3e3d8ebe992c9b23084b26 Merge: 95c2aff 2efbd8c Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 21:16:10 2020 +0000 Merge remote-tracking branch 'jrand/namecoin-3.3.11' projects/electrum-nmc/config | 8 ++++---- projects/stemns/config | 2 +- projects/stemns/settings_services.py | 12 ++++++++++++ .../tor-browser/Bundle-Data/linux/Data/Electrum-NMC/config | 1 + 4 files changed, 18 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 34399: Bump electrum-nmc version
by gk＠torproject.org 14 Jun '20

14 Jun '20

commit 2efbd8cbc0d69447f3047c151921aabc19f5682b Author: JeremyRand <jeremyrand(a)airmail.cc> Date: Tue Jun 9 11:28:25 2020 +0000 Bug 34399: Bump electrum-nmc version This update fixes Python 3.8+ compatibility. --- projects/electrum-nmc/config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index a782d38..008a471 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -1,8 +1,10 @@ # vim: filetype=yaml sw=2 filename: 'Electrum-NMC-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 3.3.9.1 +version: 3.3.11 git_url: https://github.com/namecoin/electrum-nmc.git -git_hash: 50eb796d875a45d19f5b194b9d85d6c64d55a0fe +# Note: this Git hash is from the master-3.3.11 branch; the final 3.3.11 isn't +# tagged yet. +git_hash: 463a3a2cb4f5932339a2a1c2d1c2fb40ff049d9d # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. var: container:

1 0

[tor-browser-build/master] Bug 33752: Bump electrum-nmc and stemns versions
by gk＠torproject.org 14 Jun '20

14 Jun '20

commit a4b3eeb55f0dcb1cf04b38dc4697f30f8fa9048e Author: JeremyRand <jeremyrand(a)airmail.cc> Date: Wed Apr 15 11:33:25 2020 +0000 Bug 33752: Bump electrum-nmc and stemns versions These updates include network performance and reliability improvements. --- projects/electrum-nmc/config | 6 ++---- projects/stemns/config | 2 +- projects/stemns/settings_services.py | 12 ++++++++++++ .../tor-browser/Bundle-Data/linux/Data/Electrum-NMC/config | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 57cabe5..a782d38 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -1,10 +1,8 @@ # vim: filetype=yaml sw=2 filename: 'Electrum-NMC-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 3.3.8 +version: 3.3.9.1 git_url: https://github.com/namecoin/electrum-nmc.git -# Note: this Git hash has a couple of fixes on top of the 3.3.8 tag, which -# aren't yet in a release tag. -git_hash: 74b87da8f2ddbbf33c23cc8e63b0e1515f427d86 +git_hash: 50eb796d875a45d19f5b194b9d85d6c64d55a0fe # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. var: container: diff --git a/projects/stemns/config b/projects/stemns/config index df2ac5c..efb5793 100644 --- a/projects/stemns/config +++ b/projects/stemns/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/namecoin/StemNS.git -git_hash: '32ed59be344d6bb949faa4a2bf70ae058bfe4d21' +git_hash: '68d437491c0308545e149181768cd98e45c1ac82' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: diff --git a/projects/stemns/settings_services.py b/projects/stemns/settings_services.py index 57897f0..2819c75 100644 --- a/projects/stemns/settings_services.py +++ b/projects/stemns/settings_services.py @@ -1,4 +1,16 @@ +import base64 +import urllib.request + +def unpause_namecoin(): + request = urllib.request.Request("http://127.0.0.1:8336/", data=b'{"id":"stemns","method":"unpausenetwork","params":[]}') + auth = b"user:password" + authb64 = base64.b64encode(auth).decode("utf-8") + request.add_header("Authorization", f"Basic {authb64}") + urllib.request.urlopen(request) + _service_to_command = { "bit.onion": ['TorBrowser/ncprop279/ncprop279', '--conf=TorBrowser/Data/ncprop279/ncprop279.conf'], "bit": ['TorBrowser/ncprop279/ncprop279', '--conf=TorBrowser/Data/ncprop279/ncprop279.conf'], } + +_bootstrap_callback = unpause_namecoin diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Electrum-NMC/config b/projects/tor-browser/Bundle-Data/linux/Data/Electrum-NMC/config index df1ab17..f718572 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Electrum-NMC/config +++ b/projects/tor-browser/Bundle-Data/linux/Data/Electrum-NMC/config @@ -1,4 +1,5 @@ { + "pause_network": true, "proxy": "socks5:127.0.0.1:9150::", "rpcpassword": "password", "rpcport": 8336,

1 0

[torbutton/master] Bug 33890: Rename xul files to xhtml
by gk＠torproject.org 14 Jun '20

14 Jun '20

commit 6c3d159ae4fbf133cbbbad242b482d139a68a2e4 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 9 20:48:45 2020 +0200 Bug 33890: Rename xul files to xhtml Also remove a customizeToolbar.xul line from chrome.manifest, since it's not needed. --- chrome.manifest | 1 - chrome/content/tor-circuit-display.js | 2 +- components/external-app-blocker.js | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/chrome.manifest b/chrome.manifest index 6d9d12d4..ab1c1420 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -132,7 +132,6 @@ locale torbutton zh-TW chrome/locale/zh-TW/ locale torbutton zu chrome/locale/zu/ skin torbutton classic/1.0 chrome/skin/ -style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css # Firefox 4-style component registration component {f605ec27-d867-44b5-ad97-2a29276642c3} components/dragDropFilter.js diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 119f6fca..8a51bbfd 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -5,7 +5,7 @@ // call earlier functions). The file can be processed // with docco.js to produce pretty documentation. // -// This script is to be embedded in torbutton.xul. It defines a single global +// This script is to be embedded in torbutton.xhtml. It defines a single global // function, createTorCircuitDisplay(), which activates the automatic Tor // circuit display for the current tab and any future tabs. // diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js index 9d5cbd79..89d6d252 100644 --- a/components/external-app-blocker.js +++ b/components/external-app-blocker.js @@ -73,7 +73,7 @@ ExternalAppBlocker.prototype = /* * The _showPrompt() implementation uses some XUL and JS that is part of the * browser's confirmEx() implementation. Specifically, _showPrompt() depends - * on chrome://global/content/commonDialog.xul as well as some of the code + * on chrome://global/content/commonDialog.xhtml as well as some of the code * in resource://gre/modules/SharedPromptUtils.jsm. */ _showPrompt: function(aWindowContext) { @@ -107,7 +107,7 @@ ExternalAppBlocker.prototype = }; let propBag = PromptUtils.objectToPropBag(args); - let uri = "chrome://global/content/commonDialog.xul"; + let uri = "chrome://global/content/commonDialog.xhtml"; let promptWin = Services.ww.openWindow(parentWin, uri, "_blank", "centerscreen,chrome,titlebar", propBag); promptWin.addEventListener("load", aEvent => {

1 0

[torbutton/master] Bug 34209: about:tor fails to load in debug build of Tor Browser
by gk＠torproject.org 14 Jun '20

14 Jun '20

commit ff1557013e1ee3035b45565b96d54e46ef03266a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 13 14:39:57 2020 -0400 Bug 34209: about:tor fails to load in debug build of Tor Browser Add object-src 'none' to the about:tor content security policy. --- chrome/content/aboutTor/aboutTor.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index edfa4677..5e9ffea0 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -20,7 +20,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src resource:;" /> + <meta http-equiv="Content-Security-Policy" content="default-src resource:; object-src 'none'" /> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all"

1 0