- tbb-commits - lists.torproject.org

[tor-browser-build/master] Remove torbutton from projects/release
by boklm＠torproject.org 23 Aug '19

23 Aug '19

commit 7d1b5facf83069f7d8a055a6f0e65350e39a75f2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 23 09:42:51 2019 +0200 Remove torbutton from projects/release Torbutton was removed with commit 44c6bc36a106f2e95eec12c296041bd13c999c58. --- projects/release/build | 1 - projects/release/config | 8 -------- 2 files changed, 9 deletions(-) diff --git a/projects/release/build b/projects/release/build index 3e930e0..347d9a8 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,6 @@ mkdir -p "$destdir" [% END -%] [% IF c("var/torbrowser-src") -%] mv [% c('input_files_by_name/src-firefox') %] \ - [% c('input_files_by_name/src-torbutton') %] \ [% c('input_files_by_name/src-tor-launcher') %] \ "$destdir"/ [% END -%] diff --git a/projects/release/config b/projects/release/config index 0133c3f..524eadf 100644 --- a/projects/release/config +++ b/projects/release/config @@ -188,14 +188,6 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-src - - name: src-torbutton - project: torbutton - enable: '[% c("var/torbrowser-src") %]' - pkg_type: src-tarballs - target: - - '[% c("var/build_target") %]' - - torbrowser-src - - name: src-tor-launcher project: tor-launcher enable: '[% c("var/torbrowser-src") %]'

1 0

[tor-browser-build/master] Re-enable missing configure arguments
by gk＠torproject.org 23 Aug '19

23 Aug '19

commit 4dbcdaaca258bf7c9a8486f103ad9e0816426a36 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 23 06:22:00 2019 +0000 Re-enable missing configure arguments We disabled a bunch of configure arguments to get nightly builds going as some of the required patches were not available back then. Re-enable the missing arguments now. --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 5d4d2a3..31b812a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -154,7 +154,7 @@ fi rm -f configure rm -f js/src/configure -./mach configure --with-distribution-id=org.torproject --enable-bundled-fonts +./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts --with-branding=[% c("var/branding_directory") %] # Don't build with --verbose anymore or otherwise Stylo compilation breaks on # Linux. See: #30321 for details. ./mach build

1 0

[tor-browser-build/master] Revert "No .mar files an non-en-US locales for nightlies right now"
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 536715a6c5d134bc25ebb07147c81c422c11c3b3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 22 21:42:26 2019 +0000 Revert "No .mar files an non-en-US locales for nightlies right now" This reverts commit 4ae27ff4c296983624c4701e8fed38619a75ca6f. --- rbm.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index c7c3320..ca3f058 100644 --- a/rbm.conf +++ b/rbm.conf @@ -146,8 +146,6 @@ targets: fetch: 1 var: nightly: 1 - testbuild: 1 - build_mar: 0 channel: nightly torbrowser_version: tbb-nightly

1 0

[tor-browser-build/master] Pick up 68.0 -3 for updater patches
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit c54f90e102124dcd77d6efb9e186a4e3215972a8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 22 21:41:11 2019 +0000 Pick up 68.0 -3 for updater patches --- projects/firefox/config | 2 +- projects/firefox/mozconfig-linux-i686 | 2 +- projects/firefox/mozconfig-linux-x86_64 | 2 +- projects/firefox/mozconfig-osx-x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index a1073d5..f6ce67c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -49,7 +49,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-3' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index ff65c87..c8f19a4 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -28,7 +28,7 @@ ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 ac_add_options --enable-default-toolkit=cairo-gtk3 -# XXX: ac_add_options --enable-tor-browser-update +ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 69dc4ef..12f1b28 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -23,7 +23,7 @@ ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 ac_add_options --enable-default-toolkit=cairo-gtk3 -# XXX: ac_add_options --enable-tor-browser-update +ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 188bcc9..07dd023 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -38,7 +38,7 @@ ac_add_options --enable-optimize ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir -#ac_add_options --enable-tor-browser-update +ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar

1 0

[tor-launcher/master] Bug 31488: Moat: support a comma-separated list of transports
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 71ade2c3d4bb53fdd61f5a40fa574bc614db5d6a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 22 09:45:38 2019 -0400 Bug 31488: Moat: support a comma-separated list of transports Improve our ClientTransportPlugin config parser to recognize "meek" and "meek_client" when they appear within a comma-separated list of transports. --- src/chrome/content/network-settings.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index a4f2866..8c1db0f 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -642,14 +642,26 @@ function onOpenBridgeDBRequestPrompt() let meekClientArgs; reply.lineArray.forEach(aLine => { + // Parse each ClientTransportPlugin line and look for the meek or + // meek_lite transport. This code works a lot like the Tor daemon's + // parse_transport_line() function. let tokens = aLine.split(' '); - if ((tokens.length > 2) && - ((tokens[0] == "meek") || (tokens[0] == "meek_lite")) && - (tokens[1] == "exec")) + if ((tokens.length > 2) && (tokens[1] == "exec")) { - meekTransport = tokens[0]; - meekClientPath = tokens[2]; - meekClientArgs = tokens.slice(3); + let transportArray = tokens[0].split(",").map(aStr => aStr.trim()); + let transport = transportArray.find( + aTransport => (aTransport === "meek")); + if (!transport) + { + transport = transportArray.find( + aTransport => (aTransport === "meek_lite")); + } + if (transport) + { + meekTransport = transport; + meekClientPath = tokens[2]; + meekClientArgs = tokens.slice(3); + } } });

1 0

[tor-launcher/master] Bug 31487: Modify moat client code so it is compatible with ESR68
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit f69f055708526c207eb69f40f577da9a80cd75ca Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 22 09:39:20 2019 -0400 Bug 31487: Modify moat client code so it is compatible with ESR68 Account for changes to XPCOM APIs. --- src/modules/tl-bridgedb.jsm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index de580bc..8cc7919 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -532,7 +532,7 @@ _MoatRequestor.prototype = let noTimeout = 0xFFFFFFFF; // UINT32_MAX let proxyInfo = proxyPS.newProxyInfoWithAuth(this.mMeekClientProxyType, this.mMeekClientIP, this.mMeekClientPort, - userName, password, + userName, password, undefined, undefined, flags, noTimeout, undefined); let uriStr = TorLauncherUtil.getCharPref(this.kPrefMoatService); if (!uriStr) @@ -546,14 +546,14 @@ _MoatRequestor.prototype = // There does not seem to be a way to directly create an nsILoadInfo from // JavaScript, so we create a throw away non-proxied channel to get one. - let loadInfo = Services.io.newChannelFromURI2(uri, undefined, + let loadInfo = Services.io.newChannelFromURI(uri, undefined, Services.scriptSecurityManager.getSystemPrincipal(), undefined, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, Ci.nsIContentPolicy.TYPE_OTHER).loadInfo; let httpHandler = Services.io.getProtocolHandler("http") .QueryInterface(Ci.nsIHttpProtocolHandler); - let ch = httpHandler.newProxiedChannel2(uri, proxyInfo, 0, undefined, + let ch = httpHandler.newProxiedChannel(uri, proxyInfo, 0, undefined, loadInfo).QueryInterface(Ci.nsIHttpChannel); // Remove unwanted HTTP headers and set request parameters. @@ -616,13 +616,13 @@ _MoatResponseListener.prototype = mResponseLength: 0, mResponseBody: undefined, - onStartRequest: function(aRequest, aContext) + onStartRequest: function(aRequest) { this.mResponseLength = 0; this.mResponseBody = ""; }, - onStopRequest: function(aRequest, aContext, aStatus) + onStopRequest: function(aRequest, aStatus) { this.mChannel = undefined; @@ -636,9 +636,9 @@ _MoatResponseListener.prototype = let statusCode, msg; try { - statusCode = aContext.responseStatus; - if (aContext.responseStatusText) - msg = statusCode + " " + aContext.responseStatusText; + statusCode = aRequest.responseStatus; + if (aRequest.responseStatusText) + msg = statusCode + " " + aRequest.responseStatusText; } catch (e) {} @@ -693,7 +693,7 @@ _MoatResponseListener.prototype = } }, // onStopRequest - onDataAvailable: function(aRequest, aContext, aStream, aSrcOffset, aLength) + onDataAvailable: function(aRequest, aStream, aSrcOffset, aLength) { TorLauncherLogger.log(2, "Moat onDataAvailable: " + aLength + " bytes"); if ((this.mResponseLength + aLength) > this.mRequestor.kMaxResponseLength)

1 0

[tor-browser-build/master] Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 4c6a14cd4d4cbd539302264d9cc9228a0f2b6074 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:37:38 2019 +0000 Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent --- projects/libevent/build | 3 +++ projects/tor/build | 2 ++ 2 files changed, 5 insertions(+) diff --git a/projects/libevent/build b/projects/libevent/build index 00ee78c..0ec76b6 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -7,6 +7,9 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] patch -p1 < $rootdir/autotools-openssl-mac.patch + # Setting this after `configure` but before `make` might be enough, but let's + # not bet on that and just set it here. + export MACOSX_DEPLOYMENT_TARGET=10.9 [% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir diff --git a/projects/tor/build b/projects/tor/build index 8c8ed45..8737716 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -72,6 +72,8 @@ openssldir=/var/tmp/dist/openssl [% IF c("var/osx") %] cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ + # The target version needs to be set before the configure step. + export MACOSX_DEPLOYMENT_TARGET=10.9 [% END %] cd /var/tmp/build/[% project %]-[% c('version') %]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_31465'
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 039f83d716b5050d6faeda8e1bbce3a674a9f2d5 Merge: e9ff867 0be0e04 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 22 06:36:28 2019 +0000 Merge remote-tracking branch 'boklm/bug_31465' projects/go-webrtc/config | 6 +++--- projects/libevent/build | 3 +++ projects/rust/build | 6 +++--- projects/snowflake/build | 6 +++--- projects/snowflake/config | 1 + projects/tor/build | 2 ++ projects/webrtc/build | 4 ++-- rbm.conf | 1 + 8 files changed, 18 insertions(+), 11 deletions(-)

1 0

[tor-browser-build/master] fixup! Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 0be0e0461475a29b5c01ad3b841030633c345179 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 21 20:16:38 2019 +0200 fixup! Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent --- projects/libevent/build | 2 +- projects/tor/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/libevent/build b/projects/libevent/build index 0ec76b6..de9ba80 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/autotools-openssl-mac.patch # Setting this after `configure` but before `make` might be enough, but let's # not bet on that and just set it here. - export MACOSX_DEPLOYMENT_TARGET=10.9 + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir diff --git a/projects/tor/build b/projects/tor/build index 8737716..6b684a0 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -73,7 +73,7 @@ openssldir=/var/tmp/dist/openssl [% IF c("var/osx") %] cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ # The target version needs to be set before the configure step. - export MACOSX_DEPLOYMENT_TARGET=10.9 + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END %] cd /var/tmp/build/[% project %]-[% c('version') %]

1 0

[tor-browser-build/master] Bug 31465: Bump Go to 1.12.9
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 15d4645a678b12e093f5db89f60f726275f508f6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:17:15 2019 +0000 Bug 31465: Bump Go to 1.12.9 This is not only a fix for macOS notarization related issues but picks up security fixes as well (see: #31456). --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c2baeca..fd96bb6 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.5 +version: 1.12.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -91,7 +91,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8 + sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0