March 2017 - tor-commits - lists.torproject.org

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 31 Mar '17

31 Mar '17

commit 75871e35fbae10eb0a953e3184e0514718798bfb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 31 23:48:17 2017 +0000 Update translations for tor-browser-manual --- ar/ar.po | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index b5e1894..be67d0c 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -5,12 +5,13 @@ # Mohammed ALDOUB <voulnet(a)gmail.com>, 2016 # lamine Kacimi <k_lamine27(a)yahoo.fr>, 2016 # runasand <inactive+runasand(a)transifex.com>, 2016 +# ASSYASS Mahmoud <mahmoud.assyass(a)edu.uiz.ac.ma>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: runasand <inactive+runasand(a)transifex.com>, 2016\n" +"Last-Translator: ASSYASS Mahmoud <mahmoud.assyass(a)edu.uiz.ac.ma>, 2017\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,17 +26,19 @@ msgstr "المترجمون" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" -msgstr "" +msgstr "تعلم ما يمكن لمتصفح Tor أن يفعله ليحمي خصوصيتك و سرية هويتك" #: about-tor-browser.page:10 msgid "About Tor Browser" -msgstr "" +msgstr "حول متصفح Tor" #: about-tor-browser.page:12 msgid "" "Tor Browser uses the Tor network to protect your privacy and anonymity. " "Using the Tor network has two main properties:" msgstr "" +"متصفح Tor يستعمل شبكة Tor لحماية خصويتك و سرية هويتك. استخدام شبكة Tor له " +"خاصيتان رئيسيتان:" #: about-tor-browser.page:18 msgid "" @@ -43,6 +46,8 @@ msgid "" " will not be able to track your internet activity, including the names and " "addresses of the websites you visit." msgstr "" +"لن يتمكن مزود خدمة الإنترنت وأي شخص يشاهد اتصالك محليا من تتبع نشاطك على " +"الإنترنت، بما في ذلك أسماء وعناوين مواقع الويب التي تزورها." #: about-tor-browser.page:25 msgid "" @@ -51,6 +56,9 @@ msgid "" "real Internet (IP) address, and will not know who you are unless you " "explicitly identify yourself." msgstr "" +"سيشاهد مشغلو المواقع الإلكترونية والخدمات التي تستخدمها وأي شخص يشاهدهم " +"اتصالا قادما من شبكة Torبدلا من عنوان الإنترنت الحقيقي (IP) ولن يتعرفو عليك " +"مالم تصرح بهويتك." #: about-tor-browser.page:34 msgid "" @@ -124,13 +132,14 @@ msgstr "" #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "" +msgstr "الحصول على عناوين الجسر" #: bridges.page:29 msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" msgstr "" +"نظرا لأن عناوين الجسر ليست عامة، فستحتاج إلى طلبها بنفسك. لديك خياران:" #: bridges.page:36 msgid "" @@ -147,7 +156,7 @@ msgstr "" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "" +msgstr "إدخال عناوين الجسر" #: bridges.page:52 msgid ""

1 0

[tor-messenger-build/master] Ignore release dir
by arlo＠torproject.org 31 Mar '17

31 Mar '17

commit f179404fdba756b0791151dd02de995c67364da8 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 31 16:05:48 2017 -0400 Ignore release dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9ba4e91..a320f8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ git_clones hg_clones out +release

1 0

[tor-messenger-build/master] Bump version after release
by arlo＠torproject.org 31 Mar '17

31 Mar '17

commit b9a4f93a54212fb694369a565f66458efb20a1ec Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 31 15:34:06 2017 -0400 Bump version after release --- ChangeLog | 3 +++ rbm.conf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 83bcfcf..8f644e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Tor Messenger 0.4.0b3 -- + * All Platforms + Tor Messenger 0.4.0b2 -- March 31, 2017 * All Platforms * Use the tor-browser-45.8.0esr-6.5-2-build1 tag on tor-browser diff --git a/rbm.conf b/rbm.conf index 7d1a504..7c06f60 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,7 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: - tormessenger_version: '0.4.0b2' + tormessenger_version: '0.4.0b3' copyright_year: '2017' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: |

1 0

[tor-messenger-build/master] Add some missing localization for Twitter's actions (like, unlike)
by arlo＠torproject.org 31 Mar '17

31 Mar '17

commit 2678bea56045250a47387a41def178b9fc35db8d Author: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Fri Mar 31 15:39:59 2017 -0400 Add some missing localization for Twitter's actions (like, unlike) --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 2 +- ...c-21634-Autologin-default-should-be-false.patch | 2 +- ...Support-Special-Characters-input-prompt-o.patch | 2 +- ...Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 29 +++++++++++++++++++--- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 4 +-- ...-XMPP-createConversation-should-handle-in.patch | 4 +-- .../0008-XMPP-in-band-registration.patch | 4 +-- .../instantbird/0009-Remove-search-from-UI.patch | 4 +-- .../0010-Add-Tor-Messenger-branding.patch | 4 +-- projects/instantbird/0011-Account-picture.patch | 4 +-- .../0012-Modify-protocol-defaults.patch | 4 +-- .../instantbird/0013-Modify-IRC-defaults.patch | 4 +-- projects/instantbird/0014-Modify-themes.patch | 4 +-- .../instantbird/0015-Modify-XMPP-defaults.patch | 4 +-- projects/instantbird/0016-Remove-logging-UI.patch | 4 +-- projects/instantbird/0017-Cert-override.patch | 4 +-- .../0018-Display-all-traffic-over-Tor.patch | 4 +-- .../instantbird/0019-Trac-17480-Content-sink.patch | 4 +-- .../0020-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 +-- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 4 +-- ...Contact-list-entries-should-adapt-their-h.patch | 4 +-- ...1187281-Only-show-close-button-on-Windows.patch | 4 +-- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 4 +-- ...-Use-built-in-functions-instead-of-an-svg.patch | 4 +-- ...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 +-- ...517-Use-different-color-for-Add-Exception.patch | 4 +-- 28 files changed, 75 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f644e8..56768c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Tor Messenger 0.4.0b3 -- * All Platforms + * Add some missing localization for Twitter's actions Tor Messenger 0.4.0b2 -- March 31, 2017 * All Platforms diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 74746cc..fc8da85 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -521,5 +521,5 @@ index b7a397017..7b91410f9 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index e57d822..c090c07 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -35,5 +35,5 @@ index 5fa5b8293..f0933af7f 100644 </wizard> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 03ea2b6..f1f9468 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -74,5 +74,5 @@ index 30aeb1fc5..14fc9e8f6 100644 <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 7360fa9..487755b 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -63,5 +63,5 @@ index 7c3fcd7e6..282575938 100644 else if (this._isMucParticipant && muc && !muc.left && error.condition == "item-not-found") { -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index bd453e5..4c877dd 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,13 +1,14 @@ -From 8021b15b4da53e14b9b595d370dd0a2b24306d31 Mon Sep 17 00:00:00 2001 +From c683744608becc6e1cb8086f64f878db4b03b293 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 Subject: [PATCH 05/27] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 3 +- + chat/locales/en-US/twitter.properties | 4 + chat/modules/imContentSink.jsm | 10 +- chat/protocols/twitter/twitter.js | 484 +++++++++++++++++++-------------- - 3 files changed, 289 insertions(+), 208 deletions(-) + 4 files changed, 293 insertions(+), 208 deletions(-) diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js index 6fc5d0d24..2a53a2c86 100644 @@ -23,6 +24,28 @@ index 6fc5d0d24..2a53a2c86 100644 this._messages.push(aSubject); ++this._unreadMessageCount; +diff --git a/chat/locales/en-US/twitter.properties b/chat/locales/en-US/twitter.properties +index 759eaa79c..8f0701aa7 100644 +--- a/chat/locales/en-US/twitter.properties ++++ b/chat/locales/en-US/twitter.properties +@@ -17,6 +17,8 @@ error.tooLong=Status is over 140 characters. + error.general=An error %1$S occurred while sending: %2$S + error.retweet=An error %1$S occurred while retweeting: %2$S + error.delete=An error %1$S occurred while deleting: %2$S ++error.like=An error %1$S occured while liking: %2$S ++error.unlike=An error %1$S occured while unliking: %2$S + # LOCALIZATION NOTE (error.descriptionTooLong) + # %S is the truncated string that was sent to the server. + error.descriptionTooLong=Description is over the maximum length (160 characters), it was automatically truncated to: %S. +@@ -36,6 +38,8 @@ action.delete=Delete + # %S will be replaced by the screen name of a twitter user. + action.follow=Follow %S + action.stopFollowing=Stop following %S ++action.like=Like ++action.unlike=Remove Like + + # LOCALIZATION NOTE (event.follow, event.unfollow, event.followed): + # This will be displayed in system messages inside the timeline conversation. diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm index ee067afdf..abd95fc71 100644 --- a/chat/modules/imContentSink.jsm @@ -739,5 +762,5 @@ index 59f60cc22..4d8e04c02 100644 }; -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index 11b1c1d..94c296b 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,4 +1,4 @@ -From dcc285760341f0e9584866addbb0152c97e5321e Mon Sep 17 00:00:00 2001 +From d704d7f249b75e419b967087364ff360fd634762 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 Subject: [PATCH 06/27] Bug 1218193 - Fix tab strip background colour on OS X. @@ -22,5 +22,5 @@ index 76c5094e3..291545039 100644 background-repeat: repeat-x; } -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 804e7ec..7a141df 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,4 +1,4 @@ -From 5955ea03c2000d832b2939fdcf148b08f702380c Mon Sep 17 00:00:00 2001 +From 53631ac27f28be5098056a37adb490471dc1140c Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 Subject: [PATCH 07/27] Bug 1246431 - XMPP createConversation should handle @@ -22,5 +22,5 @@ index 282575938..71f777009 100644 throw "Invalid JID"; } -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0008-XMPP-in-band-registration.patch b/projects/instantbird/0008-XMPP-in-band-registration.patch index c673902..3927919 100644 --- a/projects/instantbird/0008-XMPP-in-band-registration.patch +++ b/projects/instantbird/0008-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 3c4237848553f5915a821cab2dc86ac75d7bf826 Mon Sep 17 00:00:00 2001 +From 75174e806cd046a2c975ecbae8ad6f7fdae8fba9 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 Subject: [PATCH 08/27] XMPP in-band registration @@ -392,5 +392,5 @@ index 43d0f19e3..c46fb2f95 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0009-Remove-search-from-UI.patch b/projects/instantbird/0009-Remove-search-from-UI.patch index 27b1527..2e20a8e 100644 --- a/projects/instantbird/0009-Remove-search-from-UI.patch +++ b/projects/instantbird/0009-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From e217dc3951c7a1a2559bf04866e0e5c186631d03 Mon Sep 17 00:00:00 2001 +From 8a3f6e91fac7248282712ed1f33bacfa93b9c7b1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 09/27] Remove search from UI @@ -60,5 +60,5 @@ index fad67c190..cfe2405ea 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch index 110504b..399d409 100644 --- a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 958bf64a3a272cf190a08fe1e2a3ead98b05c0c3 Mon Sep 17 00:00:00 2001 +From 420c326c8c91fd204cbd530c522a94b8849cdc30 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 Subject: [PATCH 10/27] Add Tor Messenger branding @@ -5130,5 +5130,5 @@ index 15ec569c1..4a2d35d8a 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0011-Account-picture.patch b/projects/instantbird/0011-Account-picture.patch index e63dfed..5853b64 100644 --- a/projects/instantbird/0011-Account-picture.patch +++ b/projects/instantbird/0011-Account-picture.patch @@ -1,4 +1,4 @@ -From c11815bef7688c982eba290aeb4243cd90157bf1 Mon Sep 17 00:00:00 2001 +From 479dd68a7f055242dd6aa3a16d800b4700bd8bc3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 11/27] Account picture @@ -22,5 +22,5 @@ index b90fddadb..f29a48b99 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0012-Modify-protocol-defaults.patch b/projects/instantbird/0012-Modify-protocol-defaults.patch index f678291..7cc9fda 100644 --- a/projects/instantbird/0012-Modify-protocol-defaults.patch +++ b/projects/instantbird/0012-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 945f99a48e5b6c2cd3ae47c166ee81fcb80ad9b6 Mon Sep 17 00:00:00 2001 +From a79fddb0057e69473da02837b057f4ae57aba915 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 Subject: [PATCH 12/27] Modify protocol defaults @@ -44,5 +44,5 @@ index d552a232b..7d371bd21 100644 topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0013-Modify-IRC-defaults.patch b/projects/instantbird/0013-Modify-IRC-defaults.patch index 64687f5..dd4c4f4 100644 --- a/projects/instantbird/0013-Modify-IRC-defaults.patch +++ b/projects/instantbird/0013-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 50e63aa0881f5c7b53d4df031c1634d78d5a52b8 Mon Sep 17 00:00:00 2001 +From 0c3d7d55604044a29f03084b70b20945ae116c0f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 13/27] Modify IRC defaults @@ -61,5 +61,5 @@ index 28eb374f4..120be10ee 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0014-Modify-themes.patch b/projects/instantbird/0014-Modify-themes.patch index d2d071a..3aa77b8 100644 --- a/projects/instantbird/0014-Modify-themes.patch +++ b/projects/instantbird/0014-Modify-themes.patch @@ -1,4 +1,4 @@ -From 5dbad67d76f4aa17773d84ebb4d9b275ecde5696 Mon Sep 17 00:00:00 2001 +From 9901bceb26952e7680ae3c43561e69e08bbe0791 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 14/27] Modify themes @@ -74,5 +74,5 @@ index 454e36696..18ba1f95c 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0015-Modify-XMPP-defaults.patch b/projects/instantbird/0015-Modify-XMPP-defaults.patch index 7818d09..d08cf65 100644 --- a/projects/instantbird/0015-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0015-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From 615a33df16f01fb31edda347f0da1189c6ab2275 Mon Sep 17 00:00:00 2001 +From 95f97927c7c987e597aaaf7896b372672a7d635d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 Subject: [PATCH 15/27] Modify XMPP defaults @@ -44,5 +44,5 @@ index 265445a18..a5635cae3 100644 connection_security: { get label() { return _("options.connectionSecurity"); }, -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0016-Remove-logging-UI.patch b/projects/instantbird/0016-Remove-logging-UI.patch index 5df159f..7188405 100644 --- a/projects/instantbird/0016-Remove-logging-UI.patch +++ b/projects/instantbird/0016-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From addbd96ff280d076cc33cd2684351e3953261ac8 Mon Sep 17 00:00:00 2001 +From cecec905070c50b4a1a659154e5e241e47081734 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 16/27] Remove logging UI @@ -39,5 +39,5 @@ index 7c9db1cdd..2d7b2701e 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0017-Cert-override.patch b/projects/instantbird/0017-Cert-override.patch index 65fe8a8..ec14ea7 100644 --- a/projects/instantbird/0017-Cert-override.patch +++ b/projects/instantbird/0017-Cert-override.patch @@ -1,4 +1,4 @@ -From 0663d5a36f26573f57492f59212dd3838eeb202d Mon Sep 17 00:00:00 2001 +From d58eea036a12d99f43f0c1f27482a6da93853d72 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 17/27] Cert override @@ -60,5 +60,5 @@ index 1174b3dfd..3e35a2e1b 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch index a8584d9..2ea21b5 100644 --- a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 6783f32dd427882b0d4208ddbfe7726d1df691ca Mon Sep 17 00:00:00 2001 +From bbb7c86f99460d9205cd215959f0dee1d1b439a7 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 18/27] Display all traffic over Tor @@ -34,5 +34,5 @@ index c46fb2f95..6b49c84fa 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0019-Trac-17480-Content-sink.patch b/projects/instantbird/0019-Trac-17480-Content-sink.patch index 31e0233..020ae83 100644 --- a/projects/instantbird/0019-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0019-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 12cc9af695761d8ec46c74f75f7ed556f7511b58 Mon Sep 17 00:00:00 2001 +From ee33181a286627076114668d5173a170d0e46066 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 19/27] Trac 17480: Content sink @@ -107,5 +107,5 @@ index 3b8ccfa2b..ba41da76a 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch index c5b0f02..9f35cf8 100644 --- a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From df852a62c5a50a1277f8ccfa7791081ccb89b8a3 Mon Sep 17 00:00:00 2001 +From 95c1c1ae542c19accfcfb8e00a4053d427e7116a Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 20/27] SASL ECDSA-NIST256P-CHALLENGE @@ -8915,5 +8915,5 @@ index bc2539687..e46815dfe 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 845ad79..46b45e5 100644 --- a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,4 +1,4 @@ -From 83615f349e491a0aad08fb944c7167bbdd300bfc Mon Sep 17 00:00:00 2001 +From a4506bc5184ef5b27fc0fe6cf563cf4ae4e60d76 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 Subject: [PATCH 21/27] Bug 1313137 - "msg is not defined" error in @@ -25,5 +25,5 @@ index c2167a5ec..b58c2c2eb 100644 }, -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index 1bdb683..e4580b1 100644 --- a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,4 +1,4 @@ -From 76c8fe4359c6195611de41816a9f5c10ecbbcef9 Mon Sep 17 00:00:00 2001 +From fb88d4775ad60abac118db70b550329e5a50aaf6 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 Subject: [PATCH 22/27] Bug 954368 - Contact list entries should adapt their @@ -318,5 +318,5 @@ index 992267405..c033b51bc 100644 min-width: 16px; } -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch index ed8dab9..dfe5c7b 100644 --- a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,4 +1,4 @@ -From 3202882e5ae047c5492f45d3d2ec40e965e21bf2 Mon Sep 17 00:00:00 2001 +From c841f414adabbe759f9aa2b3c99c306480958cc2 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 5 Nov 2016 14:55:20 -0700 Subject: [PATCH 23/27] Bug 1187281 - Only show "close" button on Windows @@ -21,5 +21,5 @@ index f3f1c6bbb..d683562cb 100644 </windowdragbox> </window> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index 7c39d58..4ae030a 100644 --- a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,4 +1,4 @@ -From a1ddac93a12d3ec0943828944389a09e112929eb Mon Sep 17 00:00:00 2001 +From 88cf8f20c8e2fc88c1ccad38ce0d829f2b32bf96 Mon Sep 17 00:00:00 2001 From: Patrick Cloke <clokep(a)gmail.com> Date: Wed, 9 Nov 2016 09:03:49 -0800 Subject: [PATCH 24/27] Bug 1316000 - Remove old Yahoo! Messenger support. @@ -2394,5 +2394,5 @@ index 16c665ab4..a4b9fc638 100644 if ("color" in style) styleAttributes += " color=\"" + style.color + "\""; -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index faa2677..730442f 100644 --- a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From 88d7f895904bac92b6e110816baeb41e4cf93a56 Mon Sep 17 00:00:00 2001 +From 64be3bc7ee42bf7579da76f42b5f4d3c069e77bf Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 1 Dec 2016 13:25:42 -0800 Subject: [PATCH 25/27] Bug 1321641 - Use built-in functions instead of an svg @@ -53,5 +53,5 @@ index 15ba97346..4488c30bb 100644 .indicator { -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 3c2382d..00db633 100644 --- a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From 0aedf14b3813f345814eba086b7b4732081d45c5 Mon Sep 17 00:00:00 2001 +From 1535a81698fffa329e15c285c4feb433c134434b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 1 Dec 2016 14:34:51 -0800 Subject: [PATCH 26/27] Bug 1321420 - Add a pref to disable JavaScript in @@ -48,5 +48,5 @@ index c52c8c637..0069219fa 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch index 306c45d..84f166a 100644 --- a/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From 366268d208bacf04880fce5c01d4edaa611c1694 Mon Sep 17 00:00:00 2001 +From 87fd1c478b2bd75333c68a3082d02fd2ac8ef03f Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Tue, 27 Dec 2016 08:31:36 +0700 Subject: [PATCH 27/27] Trac 17517 - Use different color for Add Exception @@ -21,5 +21,5 @@ index 7820b5aaf..bc555acce 100644 +} \ No newline at end of file -- -2.12.0 +2.12.2

1 0

[tor-browser-bundle/hardened-builds] Build webrtc-linux with GN instead of GYP.
by gk＠torproject.org 31 Mar '17

31 Mar '17

commit 58801dcbb5d927d6eb35a328cb63d1912434a397 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 20 16:20:37 2017 -0400 Build webrtc-linux with GN instead of GYP. * Bump webrtc to branch-heads/58 * Also, bumps go-webrtc and snowflake to the latest. * Removes the need to re-run ninja for FakeAudioCaptureModule since "pc_test_utils" includes it. * Update to the new default bridge --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- .../linux/gitian-pluggable-transports.yml | 5 +- gitian/descriptors/linux/gitian-webrtc.yml | 54 +++++++++++----------- gitian/fetch-inputs.sh | 3 -- gitian/patches/webrtc-linux.patch | 25 ++++++++++ gitian/versions | 6 +-- gitian/versions.alpha | 6 +-- gitian/versions.beta | 6 +-- gitian/versions.nightly | 2 +- 9 files changed, 68 insertions(+), 41 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 61e2a9e..64b7f23 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,4 +37,4 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); -pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3"); +pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72"); diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 9b4a278..65b9e33 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -105,6 +105,8 @@ script: | ln -sf hardened-cc c++ cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + # GN needs libatomic.so.1 here. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib ARCH="" if [ $GBUILD_BITS == "64" ]; then @@ -321,7 +323,8 @@ script: | # the prebuilt libwebrtc-magic.a libraries. Since we build our own # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, # using CGO_CXXFLAGS. - CGO_CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=1 go install github.com/keroserene/go-webrtc + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" CGO_LDFLAGS=-latomic go install github.com/keroserene/go-webrtc cd .. # Building snowflake diff --git a/gitian/descriptors/linux/gitian-webrtc.yml b/gitian/descriptors/linux/gitian-webrtc.yml index 85da679..b5226e3 100644 --- a/gitian/descriptors/linux/gitian-webrtc.yml +++ b/gitian/descriptors/linux/gitian-webrtc.yml @@ -11,12 +11,13 @@ packages: - "hardening-wrapper" - "libasound2-dev" - "libexpat1-dev" +- "libglib2.0-dev" +- "libgtk2.0-dev" - "libudev-dev" - "libx11-dev" - "libxext-dev" - "libxrandr-dev" -- "default-jre-headless" -- "default-jdk" +- "pkg-config" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" @@ -26,6 +27,7 @@ files: - "binutils-linux64-utils.zip" - "gcc-linux64-utils.zip" - "webrtc.tar.gz" +- "webrtc-linux.patch" script: | INSTDIR="$HOME/install" export REFERENCE_DATETIME @@ -82,6 +84,7 @@ script: | # Building webrtc tar xaf webrtc.tar.gz cd webrtc/src + patch -p1 < ../../webrtc-linux.patch # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. cd tools/gn @@ -91,32 +94,31 @@ script: | # This is where bootstrap.py stashes the built gn. GN="$PWD/out_bootstrap/gn" - export GYP_CROSSCOMPILE=1 - export GYP_DEFINES="OS=linux target_arch=$(if [ $GBUILD_BITS = 32 ]; then echo ia32; else echo x64; fi)" + export GN_ARGS="" + # For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… + GN_ARGS+=" target_os=\"linux\" target_cpu=\"$(if [ $GBUILD_BITS = 32 ]; then echo x86; else echo x64; fi)\"" + # Not debug. + GN_ARGS+=" is_debug=false" + # There are warnings from unused returns. + GN_ARGS+=" treat_warnings_as_errors=false" + # Build static libraries. + GN_ARGS+=" is_component_build=false" # Do not use bundled utilities. - GYP_DEFINES+=" clang=0 host_clang=0 use_sysroot=0" - GYP_DEFINES+=" linux_use_bundled_gold=0 linux_use_gold_flags=0 linux_use_bundled_binutils=0" - # Avoid some dependencies. Some of these don't seem to work fully; for - # example even with use_alsa=0 we need libasound2-dev. - GYP_DEFINES+=" use_x11=0 use_gtk=0 use_gconf=0 use_alsa=0 use_pulseaudio=0 use_libpci=0 include_internal_audio_device=0 enabled_libjingle_device_manager=0" - # examples and tests also bring in dependencies. - GYP_DEFINES+=" include_examples=0 include_tests=0" - # embedded=1 is supposed to turn of various features; see - # https://bugs.chromium.org/p/chromium/issues/detail?id=318413. - GYP_DEFINES+=" embedded=1" - GYP_DEFINES+=" werror=" - JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py - ninja -C out/Release - # Run ninja once more, without include_tests=0, in order to build just the - # FakeAudioCaptureModule that go-webrtc uses. - GYP_DEFINES="$(echo "$GYP_DEFINES" | sed -e 's/include_tests=0//g')" - JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py - ninja -C out/Release obj/webrtc/api/test/peerconnection_unittests.fakeaudiocapturemodule.o + GN_ARGS+=" is_clang=false use_sysroot=false" + GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" + # Make extra sure we don't use bundled binutils. + rm -rf third_party/binutils/Linux_* + # Avoid some dependencies. + GN_ARGS+=" use_ozone=true use_gconf=false" + GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" + # Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? + #GN_ARGS+=" rtc_include_tests=false" + rm -rf out/Release + "$GN" gen out/Release --args="$GN_ARGS" + ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # https://github.com/keroserene/go-webrtc/issues/23#issuecomment-175312648 - # dump_syms_regtest.o is actually an executable, not an object file. If not - # excluded, it results in the error: - # libwebrtc-linux-386-magic.a(dump_syms_regtest.o): unsupported ELF file type 2 - ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' -not -name 'dump_syms_regtest.o' | sort) + ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' | sort) cd ../.. # Grabbing the result diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9059336..e70eb4c 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -309,10 +309,7 @@ cd .. # depot_tools must have been downloaded before running this code. dir=webrtc PATH="$PATH:$PWD/depot_tools" -# GYP_CROSSCOMPILE=1 and GYP_DEFINES="use_x11=0" prevent probing for certain dependencies. # Use --no-history because the whole checkout with history is about 12 GB. -export GYP_CROSSCOMPILE=1 -export GYP_DEFINES="use_x11=0" # JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. # default-java comes from the package default-jdk-headless. export JAVA_HOME=/usr/lib/jvm/default-java diff --git a/gitian/patches/webrtc-linux.patch b/gitian/patches/webrtc-linux.patch new file mode 100644 index 0000000..b1efb7a --- /dev/null +++ b/gitian/patches/webrtc-linux.patch @@ -0,0 +1,25 @@ +From ebc1773a92884bec7d93274b2d729ccf76050197 Mon Sep 17 00:00:00 2001 +From: David Fifield <fifield(a)eecs.berkeley.edu> +Date: Wed, 22 Mar 2017 09:53:07 -0400 +Subject: [PATCH] Disable some settings in build_overrides. + +--- + build_overrides/build.gni | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index af4924d4c..ffaafdebc 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -14,7 +14,7 @@ mac_sdk_min_build_override = "10.11" + enable_java_templates = true + + # Some non-Chromium builds don't use Chromium's third_party/binutils. +-linux_use_bundled_binutils_override = true ++linux_use_bundled_binutils_override = false + + # Variable that can be used to support multiple build scenarios, like having + # Chromium specific targets in a client project's GN file etc. +-- +2.12.1 + diff --git a/gitian/versions b/gitian/versions index 1b88910..a1f8bff 100755 --- a/gitian/versions +++ b/gitian/versions @@ -42,9 +42,9 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 -GO_WEBRTC_TAG=69c5ca70533142494d145b43ef2f46ca94715557 -SNOWFLAKE_TAG=6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 +GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 +SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a GITIAN_TAG=tor-browser-builder-3.x-8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e3352c4..145c9f9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -48,9 +48,9 @@ OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 -GO_WEBRTC_TAG=69c5ca70533142494d145b43ef2f46ca94715557 -SNOWFLAKE_TAG=6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 +GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 +SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a GITIAN_TAG=tor-browser-builder-4-1 diff --git a/gitian/versions.beta b/gitian/versions.beta index a9c988e..65b6546 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -31,9 +31,9 @@ GOPTLIB_TAG=0.2 MEEK_TAG=0.25 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 -GO_WEBRTC_TAG=69c5ca70533142494d145b43ef2f46ca94715557 -SNOWFLAKE_TAG=6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 +GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 +SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 042095a..5fde922 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -51,7 +51,7 @@ OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 DEPOT_TOOLS_TAG=master -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 GO_WEBRTC_TAG=master SNOWFLAKE_TAG=master UNIURI_TAG=master

1 0

[tor-browser-bundle/hardened-builds] Build gn in linux-webrtc.
by gk＠torproject.org 31 Mar '17

31 Mar '17

commit 45f6ab2698d447441095e8d388fba3a3aa855f57 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 23 13:14:07 2016 -0700 Build gn in linux-webrtc. There is a prebuilt gn binary for linux64, but none for linux32, and anyway we prefer to build from source for reproducibility reasons. --- gitian/descriptors/linux/gitian-webrtc.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gitian/descriptors/linux/gitian-webrtc.yml b/gitian/descriptors/linux/gitian-webrtc.yml index f18da52..85da679 100644 --- a/gitian/descriptors/linux/gitian-webrtc.yml +++ b/gitian/descriptors/linux/gitian-webrtc.yml @@ -63,6 +63,8 @@ script: | ln -sf hardened-cc c++ cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + # GN needs libatomic.so.1 here. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib ARCH="" if [ $GBUILD_BITS == "64" ]; then @@ -80,6 +82,15 @@ script: | # Building webrtc tar xaf webrtc.tar.gz cd webrtc/src + + # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. + cd tools/gn + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean + cd ../.. + # This is where bootstrap.py stashes the built gn. + GN="$PWD/out_bootstrap/gn" + export GYP_CROSSCOMPILE=1 export GYP_DEFINES="OS=linux target_arch=$(if [ $GBUILD_BITS = 32 ]; then echo ia32; else echo x64; fi)" # Do not use bundled utilities.

1 0

[tor-browser-bundle/master] Build gn in linux-webrtc.
by gk＠torproject.org 31 Mar '17

31 Mar '17

commit 38689af2a845dfa85765bf52e535c89476863378 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 23 13:14:07 2016 -0700 Build gn in linux-webrtc. There is a prebuilt gn binary for linux64, but none for linux32, and anyway we prefer to build from source for reproducibility reasons. --- gitian/descriptors/linux/gitian-webrtc.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gitian/descriptors/linux/gitian-webrtc.yml b/gitian/descriptors/linux/gitian-webrtc.yml index ba654c5..cab2430 100644 --- a/gitian/descriptors/linux/gitian-webrtc.yml +++ b/gitian/descriptors/linux/gitian-webrtc.yml @@ -66,6 +66,8 @@ script: | ln -sf hardened-cc c++ cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + # GN needs libatomic.so.1 here. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib ARCH="" if [ $GBUILD_BITS == "64" ]; then @@ -83,6 +85,15 @@ script: | # Building webrtc tar xaf webrtc.tar.gz cd webrtc/src + + # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. + cd tools/gn + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean + cd ../.. + # This is where bootstrap.py stashes the built gn. + GN="$PWD/out_bootstrap/gn" + export GYP_CROSSCOMPILE=1 export GYP_DEFINES="OS=linux target_arch=$(if [ $GBUILD_BITS = 32 ]; then echo ia32; else echo x64; fi)" # Do not use bundled utilities.

1 0

[tor-browser-bundle/master] Build webrtc-linux with GN instead of GYP.
by gk＠torproject.org 31 Mar '17

31 Mar '17

commit 121de1ca7cbee29f34f99753a7948c7447e38965 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 20 16:20:37 2017 -0400 Build webrtc-linux with GN instead of GYP. * Bump webrtc to branch-heads/58 * Also, bumps go-webrtc and snowflake to the latest. * Removes the need to re-run ninja for FakeAudioCaptureModule since "pc_test_utils" includes it. * Update to the new default bridge --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- .../linux/gitian-pluggable-transports.yml | 5 +- gitian/descriptors/linux/gitian-webrtc.yml | 54 +++++++++++----------- gitian/fetch-inputs.sh | 3 -- gitian/patches/webrtc-linux.patch | 25 ++++++++++ gitian/versions | 6 +-- gitian/versions.alpha | 6 +-- gitian/versions.beta | 6 +-- gitian/versions.nightly | 2 +- 9 files changed, 68 insertions(+), 41 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 61e2a9e..64b7f23 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,4 +37,4 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); -pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3"); +pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72"); diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index ecf49de..cd936d5 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -113,6 +113,8 @@ script: | ln -sf hardened-cc c++ cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + # GN needs libatomic.so.1 here. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib ARCH="" if [ $GBUILD_BITS == "64" ]; then @@ -309,7 +311,8 @@ script: | # the prebuilt libwebrtc-magic.a libraries. Since we build our own # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, # using CGO_CXXFLAGS. - CGO_CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=1 go install github.com/keroserene/go-webrtc + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" CGO_LDFLAGS=-latomic go install github.com/keroserene/go-webrtc cd .. # Building snowflake diff --git a/gitian/descriptors/linux/gitian-webrtc.yml b/gitian/descriptors/linux/gitian-webrtc.yml index cab2430..0622fee 100644 --- a/gitian/descriptors/linux/gitian-webrtc.yml +++ b/gitian/descriptors/linux/gitian-webrtc.yml @@ -12,12 +12,13 @@ packages: - "hardening-wrapper" - "libasound2-dev" - "libexpat1-dev" +- "libglib2.0-dev" +- "libgtk2.0-dev" - "libudev-dev" - "libx11-dev" - "libxext-dev" - "libxrandr-dev" -- "default-jre-headless" -- "default-jdk" +- "pkg-config" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" @@ -29,6 +30,7 @@ files: - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" - "webrtc.tar.gz" +- "webrtc-linux.patch" script: | INSTDIR="$HOME/install" export REFERENCE_DATETIME @@ -85,6 +87,7 @@ script: | # Building webrtc tar xaf webrtc.tar.gz cd webrtc/src + patch -p1 < ../../webrtc-linux.patch # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. cd tools/gn @@ -94,32 +97,31 @@ script: | # This is where bootstrap.py stashes the built gn. GN="$PWD/out_bootstrap/gn" - export GYP_CROSSCOMPILE=1 - export GYP_DEFINES="OS=linux target_arch=$(if [ $GBUILD_BITS = 32 ]; then echo ia32; else echo x64; fi)" + export GN_ARGS="" + # For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… + GN_ARGS+=" target_os=\"linux\" target_cpu=\"$(if [ $GBUILD_BITS = 32 ]; then echo x86; else echo x64; fi)\"" + # Not debug. + GN_ARGS+=" is_debug=false" + # There are warnings from unused returns. + GN_ARGS+=" treat_warnings_as_errors=false" + # Build static libraries. + GN_ARGS+=" is_component_build=false" # Do not use bundled utilities. - GYP_DEFINES+=" clang=0 host_clang=0 use_sysroot=0" - GYP_DEFINES+=" linux_use_bundled_gold=0 linux_use_gold_flags=0 linux_use_bundled_binutils=0" - # Avoid some dependencies. Some of these don't seem to work fully; for - # example even with use_alsa=0 we need libasound2-dev. - GYP_DEFINES+=" use_x11=0 use_gtk=0 use_gconf=0 use_alsa=0 use_pulseaudio=0 use_libpci=0 include_internal_audio_device=0 enabled_libjingle_device_manager=0" - # examples and tests also bring in dependencies. - GYP_DEFINES+=" include_examples=0 include_tests=0" - # embedded=1 is supposed to turn of various features; see - # https://bugs.chromium.org/p/chromium/issues/detail?id=318413. - GYP_DEFINES+=" embedded=1" - GYP_DEFINES+=" werror=" - JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py - ninja -C out/Release - # Run ninja once more, without include_tests=0, in order to build just the - # FakeAudioCaptureModule that go-webrtc uses. - GYP_DEFINES="$(echo "$GYP_DEFINES" | sed -e 's/include_tests=0//g')" - JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py - ninja -C out/Release obj/webrtc/api/test/peerconnection_unittests.fakeaudiocapturemodule.o + GN_ARGS+=" is_clang=false use_sysroot=false" + GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" + # Make extra sure we don't use bundled binutils. + rm -rf third_party/binutils/Linux_* + # Avoid some dependencies. + GN_ARGS+=" use_ozone=true use_gconf=false" + GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" + # Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? + #GN_ARGS+=" rtc_include_tests=false" + rm -rf out/Release + "$GN" gen out/Release --args="$GN_ARGS" + ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # https://github.com/keroserene/go-webrtc/issues/23#issuecomment-175312648 - # dump_syms_regtest.o is actually an executable, not an object file. If not - # excluded, it results in the error: - # libwebrtc-linux-386-magic.a(dump_syms_regtest.o): unsupported ELF file type 2 - ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' -not -name 'dump_syms_regtest.o' | sort) + ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' | sort) cd ../.. # Grabbing the result diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b97a577..f141381 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -314,10 +314,7 @@ cd .. # depot_tools must have been downloaded before running this code. dir=webrtc PATH="$PATH:$PWD/depot_tools" -# GYP_CROSSCOMPILE=1 and GYP_DEFINES="use_x11=0" prevent probing for certain dependencies. # Use --no-history because the whole checkout with history is about 12 GB. -export GYP_CROSSCOMPILE=1 -export GYP_DEFINES="use_x11=0" # JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. # default-java comes from the package default-jdk-headless. export JAVA_HOME=/usr/lib/jvm/default-java diff --git a/gitian/patches/webrtc-linux.patch b/gitian/patches/webrtc-linux.patch new file mode 100644 index 0000000..b1efb7a --- /dev/null +++ b/gitian/patches/webrtc-linux.patch @@ -0,0 +1,25 @@ +From ebc1773a92884bec7d93274b2d729ccf76050197 Mon Sep 17 00:00:00 2001 +From: David Fifield <fifield(a)eecs.berkeley.edu> +Date: Wed, 22 Mar 2017 09:53:07 -0400 +Subject: [PATCH] Disable some settings in build_overrides. + +--- + build_overrides/build.gni | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index af4924d4c..ffaafdebc 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -14,7 +14,7 @@ mac_sdk_min_build_override = "10.11" + enable_java_templates = true + + # Some non-Chromium builds don't use Chromium's third_party/binutils. +-linux_use_bundled_binutils_override = true ++linux_use_bundled_binutils_override = false + + # Variable that can be used to support multiple build scenarios, like having + # Chromium specific targets in a client project's GN file etc. +-- +2.12.1 + diff --git a/gitian/versions b/gitian/versions index 91bea14..69abeb3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -42,9 +42,9 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 -GO_WEBRTC_TAG=69c5ca70533142494d145b43ef2f46ca94715557 -SNOWFLAKE_TAG=6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 +GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 +SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a GITIAN_TAG=tor-browser-builder-4-1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6c06648..3539d59 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -45,9 +45,9 @@ ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e SANDBOX_TAG=sandboxed-tor-browser-0.0.3 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 -GO_WEBRTC_TAG=69c5ca70533142494d145b43ef2f46ca94715557 -SNOWFLAKE_TAG=6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 +GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 +SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a GITIAN_TAG=tor-browser-builder-4-2 diff --git a/gitian/versions.beta b/gitian/versions.beta index b1342b9..d7db1fd 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -30,9 +30,9 @@ GOPTLIB_TAG=0.2 MEEK_TAG=0.25 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 -GO_WEBRTC_TAG=69c5ca70533142494d145b43ef2f46ca94715557 -SNOWFLAKE_TAG=6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 +GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 +SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b9779e2..2045034 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -52,7 +52,7 @@ ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e SANDBOX_TAG=master DEPOT_TOOLS_TAG=master -WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 +WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 GO_WEBRTC_TAG=master SNOWFLAKE_TAG=master UNIURI_TAG=master

1 0

[stem/master] Fix: Don't overwrite type in ConnectionBandwidthEvent. Otherwise listeners for the event don't work. Add new conn_type attribute.
by atagar＠torproject.org 31 Mar '17

31 Mar '17

commit 8851a5a5c73d5f4998faf1d2fde617d3f61530cf Author: Timon Hackenjos <timon.hackenjos(a)student.kit.edu> Date: Sun Mar 19 17:10:07 2017 +0100 Fix: Don't overwrite type in ConnectionBandwidthEvent. Otherwise listeners for the event don't work. Add new conn_type attribute. --- stem/response/events.py | 10 +++++----- test/unit/response/events.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 320e6e9..1691ebf 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1113,14 +1113,14 @@ class ConnectionBandwidthEvent(Event): .. versionadded:: 1.2.0 :var str id: connection identifier - :var stem.ConnectionType type: connection type + :var stem.ConnectionType conn_type: connection type :var long read: bytes received by tor that second :var long written: bytes sent by tor that second """ _KEYWORD_ARGS = { 'ID': 'id', - 'TYPE': 'type', + 'TYPE': 'conn_type', 'READ': 'read', 'WRITTEN': 'written', } @@ -1130,8 +1130,8 @@ class ConnectionBandwidthEvent(Event): def _parse(self): if not self.id: raise stem.ProtocolError('CONN_BW event is missing its id') - elif not self.type: - raise stem.ProtocolError('CONN_BW event is missing its type') + elif not self.conn_type: + raise stem.ProtocolError('CONN_BW event is missing its connection type') elif not self.read: raise stem.ProtocolError('CONN_BW event is missing its read value') elif not self.written: @@ -1144,7 +1144,7 @@ class ConnectionBandwidthEvent(Event): self.read = int_type(self.read) self.written = int_type(self.written) - self._log_if_unrecognized('type', stem.ConnectionType) + self._log_if_unrecognized('conn_type', stem.ConnectionType) class CircuitBandwidthEvent(Event): diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 908ec57..8a95156 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -1416,7 +1416,7 @@ class TestEvents(unittest.TestCase): self.assertTrue(isinstance(event, stem.response.events.ConnectionBandwidthEvent)) self.assertEqual(CONN_BW.lstrip('650 '), str(event)) self.assertEqual('11', event.id) - self.assertEqual(stem.ConnectionType.DIR, event.type) + self.assertEqual(stem.ConnectionType.DIR, event.conn_type) self.assertEqual(272, event.read) self.assertEqual(817, event.written)

1 0

[stem/master] Document conn_type rename
by atagar＠torproject.org 31 Mar '17

31 Mar '17

commit fea9015248c3ebefacfa6b958e946ac7eb38c81c Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Mar 31 10:05:01 2017 -0700 Document conn_type rename Very minor tweak for... https://trac.torproject.org/projects/tor/ticket/21774 --- docs/change_log.rst | 1 + stem/response/events.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index bad162b..2c18560 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -45,6 +45,7 @@ The following are only available within Stem's `git repository * **Controller** + * Renamed :class:`~stem.response.events.ConnectionBandwidthEvent` type attribute to conn_type to avoid conflict with parent class (:trac:`21774`) * Added the GUARD_WAIT :data:`~stem.CircStatus` (:spec:`6446210`) * Unable to use cookie auth when path includes wide characters (chinese, japanese, etc) * Tor change caused :func:`~stem.control.Controller.list_ephemeral_hidden_services` to provide empty strings if unset (:trac:`21329`) diff --git a/stem/response/events.py b/stem/response/events.py index 1691ebf..3aa5673 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1112,6 +1112,10 @@ class ConnectionBandwidthEvent(Event): .. versionadded:: 1.2.0 + .. versionchanged:: 1.6.0 + Renamed 'type' attribute to 'conn_type' so it wouldn't be override parent + class attribute with the same name. + :var str id: connection identifier :var stem.ConnectionType conn_type: connection type :var long read: bytes received by tor that second

1 0