- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 31499: Update libevent to 2.1.11-stable
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit bb2d411f379c7b866dadc3d0ef18ce827c8d5260 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Mar 1 15:58:00 2020 -0800 Bug 31499: Update libevent to 2.1.11-stable --- projects/libevent/autotools-openssl-mac.patch | 26 -------------------------- projects/libevent/build | 1 - projects/libevent/config | 4 +--- projects/tor/build | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/projects/libevent/autotools-openssl-mac.patch b/projects/libevent/autotools-openssl-mac.patch deleted file mode 100644 index 1ee2964..0000000 --- a/projects/libevent/autotools-openssl-mac.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas(a)gmail.com> -Date: Tue, 29 Aug 2017 00:44:57 -0700 -Subject: [PATCH] autotools: confirm openssl is working before using - -latest versions of macOS provide pkg-config and libraries for an ancient -version of openssl as part of the system, but no headers - -diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4 -index c2040595..7b458134 100644 ---- a/m4/libevent_openssl.m4 -+++ b/m4/libevent_openssl.m4 -@@ -39,6 +39,10 @@ case "$enable_openssl" in - done - ;; - esac -+ CPPFLAGS_SAVE=$CPPFLAGS -+ CPPFLAGS+=$OPENSSL_INCS -+ AC_CHECK_HEADERS([openssl/ssl.h], [], [have_openssl=no]) -+ CPPFLAGS=$CPPFLAGS_SAVE - AC_SUBST(OPENSSL_INCS) - AC_SUBST(OPENSSL_LIBS) - case "$have_openssl" in --- -2.17.0 - diff --git a/projects/libevent/build b/projects/libevent/build index de9ba80..1d620d9 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -6,7 +6,6 @@ mkdir -p /var/tmp/build 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=[% c("var/macosx_deployment_target") %] diff --git a/projects/libevent/config b/projects/libevent/config index 386f746..fa01c1c 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.8 +version: 2.1.11 git_url: https://github.com/libevent/libevent.git git_hash: 'release-[% c("version") %]-stable' tag_gpg_id: 1 @@ -20,5 +20,3 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - filename: autotools-openssl-mac.patch - enable: '[% c("var/osx") %]' diff --git a/projects/tor/build b/projects/tor/build index 2d10fb3..0235da7 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -54,7 +54,7 @@ openssldir=/var/tmp/dist/openssl/openssl mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/" cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/" - cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.1.so.7 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old

1 0

[tor-browser-build/master] Add 9.5a10 ChangeLog
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 3296c9e14bb7551f4f12763f8992e632f80b0887 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 15:52:26 2020 +0200 Add 9.5a10 ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 93999a3..9026f19 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,11 @@ Tor Browser 9.5a11 -- April 8 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.5a10 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.5a9 -- March 25 2020 * All Platforms * Translations update

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.8 and 9.0.9
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 155751006dfe77e0215ad016ed41a3231e96175a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 15:53:44 2020 +0200 Fold in stable changelog for 9.0.8 and 9.0.9 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9026f19..1b34667 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,11 +21,27 @@ Tor Browser 9.5a11 -- April 8 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.0.9 -- April 7 2020 + * All Platforms + * Update Firefox to 68.7.0esr + * Bump NoScript to 11.0.23 + * Bug 33630: Remove noisebridge01 default bridge + * Windows + OS X + Linux + * Bug 33771: Update some existing licenses and add Libevent license + * Bug 33723: Bump openssl version to 1.1.1f + * Windows + * Bug 33805: Remove escape-openssldir.patch + Tor Browser 9.5a10 -- April 5 2020 * All Platforms * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly * Mozilla Bug 1626728 - Normalize shutdown +Tor Browser 9.0.8 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.5a9 -- March 25 2020 * All Platforms * Translations update

1 0

[tor-browser-build/maint-9.0] Add 9.0.8 ChangeLog
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 36d601c965a000a15c13ee40573cca9e754de69a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 14:44:24 2020 +0200 Add 9.0.8 ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 00e36da..7e24574 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,6 +9,11 @@ Tor Browser 9.0.9 -- April 7 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.0.8 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.0.7 -- March 20 2020 * All Platforms * Bump NoScript to 11.0.19

1 0

[tor-browser-build/master] Bug 33749: stemns: Bump stem to 1.8.0
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit d84dcbad93df0427467fb3c63bfef09d1e30eee6 Author: JeremyRand <jeremyrand(a)airmail.cc> Date: Fri Mar 27 09:33:03 2020 +0000 Bug 33749: stemns: Bump stem to 1.8.0 This pulls in the fix for Bug 30882 --- projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/stemns/config b/projects/stemns/config index 6c83335..df2ac5c 100644 --- a/projects/stemns/config +++ b/projects/stemns/config @@ -6,12 +6,12 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: use_container: 1 - stem-version: 1.7.1 + stem-version: 1.8.0 input_files: - project: container-image - URL: 'https://files.pythonhosted.org/packages/source/s/stem/stem-[% c("var/stem-version") %].tar.gz' - sha256sum: c9eaf3116cb60c15995cbd3dec3a5cbc50e9bb6e062c4d6d42201e566f498ca2 + sha256sum: a0b48ea6224e95f22aa34c0bc3415f0eb4667ddeae3dfb5e32a6920c185568c2 # TODO: This sha256sum was grabbed from PyPI and hasn't been verified. We should probably switch to using an OpenPGP sig. - filename: settings_port.py - filename: settings_services.py

1 0

[tor-browser-build/master] Merge remote-tracking branch 'JeremyRand/stem-1.8.0'
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit 026dd67289580ff00b31f6c7c26328a9d2ecefed Merge: 44a18de d84dcba Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:48:52 2020 +0200 Merge remote-tracking branch 'JeremyRand/stem-1.8.0' projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'acat/33845_fix_patch'
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit ba31ac419a33126882c45c94923614a555e80284 Merge: 4b9ad6d d3a7505 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:42:25 2020 +0200 Merge remote-tracking branch 'acat/33845_fix_patch' projects/firefox/namecoin-torbutton.patch | 75 ++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 33845: Rebase namecoin torbutton patch
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit d3a750533fbc28e9e80cce5311bbf79a3f58db21 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 8 21:33:14 2020 +0200 Bug 33845: Rebase namecoin torbutton patch --- projects/firefox/namecoin-torbutton.patch | 75 ++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/projects/firefox/namecoin-torbutton.patch b/projects/firefox/namecoin-torbutton.patch index 11cf7a1..5649ee6 100644 --- a/projects/firefox/namecoin-torbutton.patch +++ b/projects/firefox/namecoin-torbutton.patch @@ -1,8 +1,8 @@ diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js -index 5ecbe7d..f771150 100644 +index 119f6fca..477b0302 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js -@@ -49,7 +49,11 @@ let credentialsToNodeDataMap = new Map(), +@@ -48,7 +48,11 @@ let credentialsToNodeDataMap = new Map(), knownCircuitIDs = new Map(), // A mutable map that records the SOCKS credentials for the // latest channels for each browser + domain. @@ -15,7 +15,7 @@ index 5ecbe7d..f771150 100644 // __trimQuotes(s)__. // Removes quotation marks around a quoted string. -@@ -126,6 +130,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { +@@ -132,6 +136,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { return null; }; @@ -44,7 +44,7 @@ index 5ecbe7d..f771150 100644 // __collectIsolationData(aController, updateUI)__. // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then // we assume isolation settings (SOCKS username+password) are now fixed for the -@@ -139,6 +165,15 @@ let collectIsolationData = function (aController, updateUI) { +@@ -145,6 +171,15 @@ let collectIsolationData = function (aController, updateUI) { "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", async (streamEvent) => { @@ -52,7 +52,7 @@ index 5ecbe7d..f771150 100644 + // Collect any stream target that might be an onion. + if (streamEvent && streamEvent.StreamID && streamEvent.Target) { + let targetDomain = streamEvent.Target.split(":")[0]; -+ if (targetDomain.endsWith(".onion")) { ++ if (targetDomain.endsWith(".onion")) { + bitToOnionMap[bitTargets[streamEvent.StreamID]] = targetDomain; + logger.eclog(3, "mapped " + bitTargets[streamEvent.StreamID] + " to " + targetDomain); + } @@ -60,10 +60,10 @@ index 5ecbe7d..f771150 100644 if (!knownCircuitIDs.get(streamEvent.CircuitID)) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs.set(streamEvent.CircuitID, true); -@@ -306,12 +341,14 @@ let updateCircuitDisplay = function () { - (i === 0 && nodeData[0].type !== "bridge") ? - ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); +@@ -312,7 +347,9 @@ let updateCircuitDisplay = function () { } + + let domainParts = []; - if (domain.endsWith(".onion")) { + logger.eclog(3, "bit to onion map:" + JSON.stringify(bitToOnionMap) + ", domain: " + domain); + let mappedOnion = bitToOnionMap[domain]; @@ -71,13 +71,54 @@ index 5ecbe7d..f771150 100644 for (let i = 0; i < 3; ++i) { li(uiString("relay")); } +@@ -325,24 +362,28 @@ let updateCircuitDisplay = function () { + domainParts.push(domain); } -- li(domain); -+ li(domain, " ", mappedOnion ? ["span", { class: "circuit-ip-address" }, mappedOnion] : null); + +- // We use a XUL html:span element so that the tooltiptext is displayed. +- li([ +- "html:span", +- { +- class: "circuit-onion", +- onclick: ` +- this.classList.add("circuit-onion-copied"); +- Cc[ +- "@mozilla.org/widget/clipboardhelper;1" +- ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) +- `, +- "data-onion": domain, +- "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), +- "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), +- tooltiptext: domain, +- }, +- ...domainParts, +- ]); ++ if (mappedOnion) { ++ li(domain, " ", ["span", { class: "circuit-ip-address" }, mappedOnion]); ++ } else { ++ // We use a XUL html:span element so that the tooltiptext is displayed. ++ li([ ++ "html:span", ++ { ++ class: "circuit-onion", ++ onclick: ` ++ this.classList.add("circuit-onion-copied"); ++ Cc[ ++ "@mozilla.org/widget/clipboardhelper;1" ++ ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) ++ `, ++ "data-onion": domain, ++ "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), ++ "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), ++ tooltiptext: domain, ++ }, ++ ...domainParts, ++ ]); ++ } + // Hide the note about guards if we are using a bridge. document.getElementById("circuit-guard-note-container").style.display = - (nodeData[0].type === "bridge") ? "none" : "block"; -@@ -418,6 +455,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -450,6 +491,7 @@ let setupDisplay = function (enablePrefName) { stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, stopEnsuringCorrectPopupDimensions = null, @@ -85,17 +126,17 @@ index 5ecbe7d..f771150 100644 stop = function() { syncDisplayWithSelectedTab(false); if (myController) { -@@ -430,6 +468,9 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -462,6 +504,9 @@ let setupDisplay = function (enablePrefName) { if (stopEnsuringCorrectPopupDimensions) { stopEnsuringCorrectPopupDimensions(); } -+ if (stopCollectingBitTargets) { -+ stopCollectingBitTargets(); -+ } ++ if (stopCollectingBitTargets) { ++ stopCollectingBitTargets(); ++ } myController = null; } }, -@@ -444,6 +485,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -475,6 +520,7 @@ let setupDisplay = function (enablePrefName) { stop(); }); syncDisplayWithSelectedTab(true);

1 0

[tor-browser-build/master] Revert "Bug 33845: Disable Namecoin on nightly temporarily"
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit 44a18de3b88d80f6841e21903896a5f957ca8e63 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:42:48 2020 +0200 Revert "Bug 33845: Disable Namecoin on nightly temporarily" This reverts commit 4b9ad6d76f322fc83b9e8fb5751b95662a0b85ce. --- rbm.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index a59aacb..a988c89 100644 --- a/rbm.conf +++ b/rbm.conf @@ -299,8 +299,7 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' # Only build Namecoin for linux on nightly - # Namecoin is temporarily disabled on nightly until #33845 is fixed. - namecoin: 0 + namecoin: '[% c("var/nightly") %]' container: suite: wheezy arch: amd64

1 0

[tor-browser-build/master] Bug 33845: Disable Namecoin on nightly temporarily
by boklm＠torproject.org 08 Apr '20

08 Apr '20

commit 4b9ad6d76f322fc83b9e8fb5751b95662a0b85ce Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 8 17:22:20 2020 +0200 Bug 33845: Disable Namecoin on nightly temporarily Namecoin support is temporarily disabled, until projects/firefox/namecoin-torbutton.patch is rebased. --- rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index a988c89..a59aacb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -299,7 +299,8 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' # Only build Namecoin for linux on nightly - namecoin: '[% c("var/nightly") %]' + # Namecoin is temporarily disabled on nightly until #33845 is fixed. + namecoin: 0 container: suite: wheezy arch: amd64

1 0