- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit a07356ac7693bec4ed1b206bdbeb64287cb2a7f6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 19 02:13:08 2019 +0000 fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true --- mobile/android/chrome/content/browser.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index dbecd308a3dc..fc66e8b4f23e 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -4413,9 +4413,14 @@ Tab.prototype = { // Must be called after appendChild so the docShell has been created. this.setActive(false); + // Create a Private tab if it was explicitly requested or if the pref + // |browser.privatebrowsing.autostart| is true. If the pref is true, then all tabs are created + // as private tabs. The first clause covers new tabs requested by a user. The preference check + // is important because extensions directly open tabs (usually not private tabs) and bypass the + // private tab checks. let isPrivate = (("isPrivate" in aParams) && aParams.isPrivate) || Services.prefs.getBoolPref("browser.privatebrowsing.autostart"); if (isPrivate) { - attrs['privateBrowsingId'] = 1; + attrs.privateBrowsingId = 1; } this.browser.docShell.setOriginAttributes(attrs);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31720: Enable website suggestions in address bar
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 683863bc344137462c60c6ae001d1333df41297d Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 18 18:32:24 2019 +0000 Bug 31720: Enable website suggestions in address bar --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index f03548e30ced..5d6f725dc1c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -1452,7 +1452,9 @@ public class BrowserApp extends GeckoApp // Website suggestions for address bar inputs should not be enabled when running in automation. // After the upgrade to support library v.26 it could fail otherwise unrelated Robocop tests // See https://bugzilla.mozilla.org/show_bug.cgi?id=1385464#c3 - if (!isInAutomation) { + // But only disable it when this isn't Tor Browser, because isInAutomation is overloaded such + // that it is |true| in Tor Browser. + if (!isInAutomation || AppConstants.isTorBrowser()) { mBrowserToolbar.setOnFilterListener(new BrowserToolbar.OnFilterListener() { @Override public void onFilter(String searchText, AutocompleteHandler handler) {

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit fa3095e61aacd345601435a0e91ee2b44e1a9b07 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 12:56:39 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31575: Disable newtabpage --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 10c31084adcc..09386d32a12c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -106,6 +106,7 @@ pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. +pref("browser.newtabpage.enabled", false); pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) pref("browser.search.region", "US"); pref("browser.search.geoip.url", "");

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31575: Replace Firefox Home (newtab) with about:tor
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit e11a1889ae871a9ced871346f5f9eb3e0a9ab6d3 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 13:04:34 2019 +0200 Bug 31575: Replace Firefox Home (newtab) with about:tor Patching AboutNewTabService so that AboutNewTab is not loaded to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. --- browser/components/newtab/AboutNewTabService.jsm | 29 +--------------------- browser/components/preferences/in-content/home.xul | 4 +-- .../preferences/in-content/preferences.xul | 5 +++- browser/modules/HomePage.jsm | 2 +- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/browser/components/newtab/AboutNewTabService.jsm b/browser/components/newtab/AboutNewTabService.jsm index 8995d82d543b..117b9d6347cd 100644 --- a/browser/components/newtab/AboutNewTabService.jsm +++ b/browser/components/newtab/AboutNewTabService.jsm @@ -10,9 +10,6 @@ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "AboutNewTab", - "resource:///modules/AboutNewTab.jsm"); - const TOPIC_APP_QUIT = "quit-application-granted"; const TOPIC_LOCALES_CHANGE = "intl:app-locales-changed"; const TOPIC_CONTENT_DOCUMENT_INTERACTIVE = "content-document-interactive"; @@ -47,12 +44,6 @@ function AboutNewTabService() { this.toggleActivityStream(true); this.initialized = true; this.alreadyRecordedTopsitesPainted = false; - - if (IS_MAIN_PROCESS) { - AboutNewTab.init(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.addObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } } /* @@ -179,11 +170,6 @@ AboutNewTabService.prototype = { } case TOPIC_APP_QUIT: this.uninit(); - if (IS_MAIN_PROCESS) { - AboutNewTab.uninit(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.removeObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } break; case TOPIC_LOCALES_CHANGE: this.updatePrerenderedPath(); @@ -243,20 +229,7 @@ AboutNewTabService.prototype = { * the newtab page has no effect on the result of this function. */ get defaultURL() { - // Generate the desired activity stream resource depending on state, e.g., - // resource://activity-stream/prerendered/ar/activity-stream.html - // resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html - // resource://activity-stream/prerendered/static/activity-stream-debug.html - return [ - "resource://activity-stream/prerendered/", - this._activityStreamPath, - "activity-stream", - this._activityStreamPrerender ? "-prerendered" : "", - // Debug version loads dev scripts but noscripts separately loads scripts - this._activityStreamDebug && !this._privilegedContentProcess ? "-debug" : "", - this._privilegedContentProcess ? "-noscripts" : "", - ".html", - ].join(""); + return "about:tor"; }, /* diff --git a/browser/components/preferences/in-content/home.xul b/browser/components/preferences/in-content/home.xul index 8c38ba68c2af..fc555a2f56af 100644 --- a/browser/components/preferences/in-content/home.xul +++ b/browser/components/preferences/in-content/home.xul @@ -37,7 +37,7 @@ class="check-home-page-controlled" data-preference-related="browser.startup.homepage"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="2" data-l10n-id="home-mode-choice-custom" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> @@ -79,7 +79,7 @@ onsyncfrompreference="return gHomePane.syncFromNewTabPref();" onsynctopreference="return gHomePane.syncToNewTabPref(this.value);"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> </menulist> diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 13c7bcc74ad8..3b07e4596907 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -17,7 +17,10 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> -<!DOCTYPE page> +<!DOCTYPE page [ +<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> + %aboutTorDTD; +]> <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm index f888f185c6a8..2519f3eaa754 100644 --- a/browser/modules/HomePage.jsm +++ b/browser/modules/HomePage.jsm @@ -17,7 +17,7 @@ ChromeUtils.defineModuleGetter( ); const kPrefName = "browser.startup.homepage"; -const kDefaultHomePage = "about:home"; +const kDefaultHomePage = "about:tor"; function getHomepagePref(useDefault) { let homePage;

1 0

[tor-browser-build/master] Bug 25483: Add pion-webrtc and dependencies.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 273e09799eb5b39f498de866a327c2c7b173b304 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 29 02:43:26 2019 +0000 Bug 25483: Add pion-webrtc and dependencies. This was partially automated and generated from the "go mod" graph of pion-webrtc. Upgrade goxnet to da137c7871d7 (which allows removing a formerly nightly-only case, because the new commit is even newer than that one). Upgrade goxsys to fae7ac547cb7. We're using an updated version v2.1.3 of webrtc to include our upstreamed fix. I didn't bump all the way up to v2.1.4 because they moved to requiring Go 1.13. --- projects/genny/config | 21 ++++++++++++++++ projects/ginkgo/config | 21 ++++++++++++++++ projects/go-difflib/config | 19 ++++++++++++++ projects/go-spew/config | 19 ++++++++++++++ projects/gocheck/config | 17 +++++++++++++ projects/goerrors/config | 17 +++++++++++++ projects/gofsnotify/config | 21 ++++++++++++++++ projects/gomega/config | 45 +++++++++++++++++++++++++++++++++ projects/gomock/config | 19 ++++++++++++++ projects/goprotobuf/config | 19 ++++++++++++++ projects/gotail/config | 17 +++++++++++++ projects/gotomb/config | 17 +++++++++++++ projects/goxnet/config | 7 +++++- projects/goxsys/config | 3 ++- projects/goxtools/config | 19 ++++++++++++++ projects/goyaml/config | 21 ++++++++++++++++ projects/objx/config | 17 +++++++++++++ projects/pion-datachannel/config | 36 +++++++++++++++++++++++++++ projects/pion-dtls/config | 27 ++++++++++++++++++++ projects/pion-ice/config | 42 +++++++++++++++++++++++++++++++ projects/pion-logging/config | 17 +++++++++++++ projects/pion-mdns/config | 24 ++++++++++++++++++ projects/pion-quic/config | 24 ++++++++++++++++++ projects/pion-rtcp/config | 21 ++++++++++++++++ projects/pion-rtp/config | 17 +++++++++++++ projects/pion-sctp/config | 30 ++++++++++++++++++++++ projects/pion-sdp/config | 21 ++++++++++++++++ projects/pion-srtp/config | 39 +++++++++++++++++++++++++++++ projects/pion-stun/config | 21 ++++++++++++++++ projects/pion-transport/config | 28 +++++++++++++++++++++ projects/pion-turn/config | 36 +++++++++++++++++++++++++++ projects/pion-webrtc/config | 54 ++++++++++++++++++++++++++++++++++++++++ projects/qtls/config | 24 ++++++++++++++++++ projects/quic-go/config | 39 +++++++++++++++++++++++++++++ projects/testify/config | 30 ++++++++++++++++++++++ 35 files changed, 847 insertions(+), 2 deletions(-) diff --git a/projects/genny/config b/projects/genny/config new file mode 100644 index 0000000..ecdf983 --- /dev/null +++ b/projects/genny/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/cheekybits/genny +git_hash: d2cf3cdd35ce0d789056c4bc02a4d6349c947caf # v1.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/cheekybits/genny + go_lib_deps: + - goxtools + +input_files: + - project: container-image + - name: go + project: go + - name: goxtools + project: goxtools diff --git a/projects/ginkgo/config b/projects/ginkgo/config new file mode 100644 index 0000000..c4ad9ec --- /dev/null +++ b/projects/ginkgo/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/onsi/ginkgo +git_hash: 2e1be8f7d90e9d3e3e58b0ce470f2f14d075406f # v1.7.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/onsi/ginkgo + go_lib_deps: + - gotail + +input_files: + - project: container-image + - name: go + project: go + - name: gotail + project: gotail diff --git a/projects/go-difflib/config b/projects/go-difflib/config new file mode 100644 index 0000000..e8d34df --- /dev/null +++ b/projects/go-difflib/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pmezard/go-difflib +git_hash: 792786c7400a136282c1664665ae0a8db921c6c2 # v1.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pmezard/go-difflib + go_lib_install: + - github.com/pmezard/go-difflib/difflib + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/go-spew/config b/projects/go-spew/config new file mode 100644 index 0000000..946fb96 --- /dev/null +++ b/projects/go-spew/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/davecgh/go-spew +git_hash: 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/davecgh/go-spew + go_lib_install: + - github.com/davecgh/go-spew/spew + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gocheck/config b/projects/gocheck/config new file mode 100644 index 0000000..a78af0f --- /dev/null +++ b/projects/gocheck/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/check.v1 +git_hash: 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/check.v1 + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goerrors/config b/projects/goerrors/config new file mode 100644 index 0000000..c9a34e8 --- /dev/null +++ b/projects/goerrors/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pkg/errors +git_hash: ba968bfe8b2f7e042a574c888954fccecfa385b4 # v0.8.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pkg/errors + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gofsnotify/config b/projects/gofsnotify/config new file mode 100644 index 0000000..1f47eaa --- /dev/null +++ b/projects/gofsnotify/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/fsnotify.v1 +git_hash: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9 # v1.4.7 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/fsnotify.v1 + go_lib_deps: + - goxsys + +input_files: + - project: container-image + - name: go + project: go + - name: goxsys + project: goxsys diff --git a/projects/gomega/config b/projects/gomega/config new file mode 100644 index 0000000..81cc986 --- /dev/null +++ b/projects/gomega/config @@ -0,0 +1,45 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/onsi/gomega +git_hash: 65fb64232476ad9046e57c26cd0bff3d3a8dc6cd # v1.4.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/onsi/gomega + go_lib_deps: + - ginkgo + - gofsnotify + - goprotobuf + - gotail + - gotomb + - goxnet + - goxsys + - goxtext + - goyaml + +input_files: + - project: container-image + - name: go + project: go + - name: ginkgo + project: ginkgo + - name: gofsnotify + project: gofsnotify + - name: goprotobuf + project: goprotobuf + - name: gotail + project: gotail + - name: gotomb + project: gotomb + - name: goxnet + project: goxnet + - name: goxsys + project: goxsys + - name: goxtext + project: goxtext + - name: goyaml + project: goyaml diff --git a/projects/gomock/config b/projects/gomock/config new file mode 100644 index 0000000..53229ac --- /dev/null +++ b/projects/gomock/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/mock +git_hash: 51421b967af1f557f93a59e0057aaf15ca02e29c # v1.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/golang/mock + go_lib_install: + - github.com/golang/mock/gomock + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goprotobuf/config b/projects/goprotobuf/config new file mode 100644 index 0000000..cd496f1 --- /dev/null +++ b/projects/goprotobuf/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/golang/protobuf +git_hash: aa810b61a9c79d51363740d207bb46cf8e620ed5 # v1.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/golang/protobuf + go_lib_install: + - github.com/golang/protobuf/proto + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gotail/config b/projects/gotail/config new file mode 100644 index 0000000..d83c668 --- /dev/null +++ b/projects/gotail/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/hpcloud/tail +git_hash: a30252cb686a21eb2d0b98132633053ec2f7f1e5 # v1.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/hpcloud/tail + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gotomb/config b/projects/gotomb/config new file mode 100644 index 0000000..3794d7e --- /dev/null +++ b/projects/gotomb/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/tomb.v1 +git_hash: dd632973f1e7218eb1089048e0798ec9ae7dceb8 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/tomb.v1 + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goxnet/config b/projects/goxnet/config index ae574c6..f6a2c29 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 +git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,8 +12,13 @@ var: go_lib: golang.org/x/net go_lib_install: - golang.org/x/net/proxy + - golang.org/x/net/dns/dnsmessage + go_lib_deps: + - goxsys input_files: - project: container-image - name: go project: go + - name: goxsys + project: goxsys diff --git a/projects/goxsys/config b/projects/goxsys/config index 64a7213..9f02aef 100644 --- a/projects/goxsys/config +++ b/projects/goxsys/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/golang/sys -git_hash: 11f53e03133963fb11ae0588e08b5e0b85be8be5 +git_hash: fae7ac547cb717d141c433a2a173315e216b64c4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,6 +12,7 @@ var: go_lib: golang.org/x/sys go_lib_install: - golang.org/x/sys/cpu + - golang.org/x/sys/unix input_files: - project: container-image diff --git a/projects/goxtools/config b/projects/goxtools/config new file mode 100644 index 0000000..474cf09 --- /dev/null +++ b/projects/goxtools/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://go.googlesource.com/tools +git_hash: aed303cbaa74a4d974e6e79dae05b2901ff009e8 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/tools + go_lib_install: + - golang.org/x/tools/imports + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goyaml/config b/projects/goyaml/config new file mode 100644 index 0000000..fd81e4c --- /dev/null +++ b/projects/goyaml/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gopkg.in/yaml.v2 +git_hash: 51d6538a90f86fe93ac480b35f37b2be17fef232 # v2.2.2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: gopkg.in/yaml.v2 + go_lib_deps: + - gocheck + +input_files: + - project: container-image + - name: go + project: go + - name: gocheck + project: gocheck diff --git a/projects/objx/config b/projects/objx/config new file mode 100644 index 0000000..80b1947 --- /dev/null +++ b/projects/objx/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/stretchr/objx +git_hash: facf9a85c22f48d2f52f2380e4efce1768749a89 # v0.1.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/stretchr/objx + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config new file mode 100644 index 0000000..50094d6 --- /dev/null +++ b/projects/pion-datachannel/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/datachannel +git_hash: 401bef0a9b89c2ca212c908999709ff1967c9617 # v1.4.5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/datachannel + go_lib_deps: + - go-spew + - goerrors + - pion-logging + - pion-sctp + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: go-spew + project: go-spew + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-sctp + project: pion-sctp + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config new file mode 100644 index 0000000..af2a17f --- /dev/null +++ b/projects/pion-dtls/config @@ -0,0 +1,27 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/dtls +git_hash: 91d652d3f91d6c08c193e4d297067f8f653775f9 # v1.5.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/dtls + go_lib_deps: + - goxcrypto + - pion-logging + - pion-transport + +input_files: + - project: container-image + - name: go + project: go + - name: goxcrypto + project: goxcrypto + - name: pion-logging + project: pion-logging + - name: pion-transport + project: pion-transport diff --git a/projects/pion-ice/config b/projects/pion-ice/config new file mode 100644 index 0000000..8946852 --- /dev/null +++ b/projects/pion-ice/config @@ -0,0 +1,42 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/ice +git_hash: 45cb33ebe6b557dbf50a7779cd713aeedbc84813 # v0.5.13 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/ice + go_lib_deps: + - goxnet + - goxsys + - pion-logging + - pion-mdns + - pion-stun + - pion-transport + - pion-turn + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: goxnet + project: goxnet + - name: goxsys + project: goxsys + - name: pion-logging + project: pion-logging + - name: pion-mdns + project: pion-mdns + - name: pion-stun + project: pion-stun + - name: pion-transport + project: pion-transport + - name: pion-turn + project: pion-turn + - name: testify + project: testify diff --git a/projects/pion-logging/config b/projects/pion-logging/config new file mode 100644 index 0000000..40e8619 --- /dev/null +++ b/projects/pion-logging/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/logging +git_hash: 0387f8acdeb20faf48e539e74906dd633851f3a8 # v0.2.2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/logging + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-mdns/config b/projects/pion-mdns/config new file mode 100644 index 0000000..05eb8c4 --- /dev/null +++ b/projects/pion-mdns/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/mdns +git_hash: c5bfa7641a9decf65f7597ba5299c3ee36feb28e # v0.0.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/mdns + go_lib_deps: + - goxnet + - pion-logging + +input_files: + - project: container-image + - name: go + project: go + - name: goxnet + project: goxnet + - name: pion-logging + project: pion-logging diff --git a/projects/pion-quic/config b/projects/pion-quic/config new file mode 100644 index 0000000..69b3c00 --- /dev/null +++ b/projects/pion-quic/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/quic +git_hash: 4c18aa106035bd68c2f9f054ae8b9a57850967c7 # v0.1.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/quic + go_lib_deps: + - pion-transport + - quic-go + +input_files: + - project: container-image + - name: go + project: go + - name: pion-transport + project: pion-transport + - name: quic-go + project: quic-go diff --git a/projects/pion-rtcp/config b/projects/pion-rtcp/config new file mode 100644 index 0000000..dd76451 --- /dev/null +++ b/projects/pion-rtcp/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/rtcp +git_hash: 02c67df9b6f60eafcbb9dfe0e46dbdc4a20fa74f # v1.2.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/rtcp + go_lib_deps: + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: testify + project: testify diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config new file mode 100644 index 0000000..0f586ec --- /dev/null +++ b/projects/pion-rtp/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/rtp +git_hash: 23312f4b270b6a469355099f9cfb96d871240098 # v1.1.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/rtp + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config new file mode 100644 index 0000000..8615bd4 --- /dev/null +++ b/projects/pion-sctp/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/sctp +git_hash: 321ee3612199dd7363fc63ec4e111db50c22faf1 # v1.6.9 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/sctp + go_lib_deps: + - goerrors + - pion-logging + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config new file mode 100644 index 0000000..7f95bc0 --- /dev/null +++ b/projects/pion-sdp/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/sdp +git_hash: 03441e3c706c7c3b719ee75194049a31cbb2eb7e # v2.3.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/sdp + go_lib_deps: + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: testify + project: testify diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config new file mode 100644 index 0000000..eac420c --- /dev/null +++ b/projects/pion-srtp/config @@ -0,0 +1,39 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/srtp +git_hash: 0741c018e441a3502045133280347b9deba1e9d8 # v1.2.6 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/srtp + go_lib_deps: + - go-spew + - goerrors + - pion-logging + - pion-rtcp + - pion-rtp + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: go-spew + project: go-spew + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-rtcp + project: pion-rtcp + - name: pion-rtp + project: pion-rtp + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-stun/config b/projects/pion-stun/config new file mode 100644 index 0000000..aeba0af --- /dev/null +++ b/projects/pion-stun/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/stun +git_hash: 8136435b6d3ad36535081253a032468235a43581 # v0.3.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/stun + go_lib_deps: + - goerrors + +input_files: + - project: container-image + - name: go + project: go + - name: goerrors + project: goerrors diff --git a/projects/pion-transport/config b/projects/pion-transport/config new file mode 100644 index 0000000..be3d385 --- /dev/null +++ b/projects/pion-transport/config @@ -0,0 +1,28 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/transport +git_hash: 6903e3cd05a899ca7284753a4b6cb265655c28ff # v0.8.6 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/transport + go_lib_deps: + - pion-logging + - testify + go_lib_install: + - github.com/pion/transport/packetio + - github.com/pion/transport/test + - github.com/pion/transport/vnet + +input_files: + - project: container-image + - name: go + project: go + - name: pion-logging + project: pion-logging + - name: testify + project: testify diff --git a/projects/pion-turn/config b/projects/pion-turn/config new file mode 100644 index 0000000..06a6f14 --- /dev/null +++ b/projects/pion-turn/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/turn +git_hash: cab8f88798429b68b7cfb4db7c12fc6d205e91e2 # v1.3.5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/turn + go_lib_deps: + - go-spew + - goerrors + - pion-logging + - pion-stun + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: go-spew + project: go-spew + - name: goerrors + project: goerrors + - name: pion-logging + project: pion-logging + - name: pion-stun + project: pion-stun + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config new file mode 100644 index 0000000..0f22dbb --- /dev/null +++ b/projects/pion-webrtc/config @@ -0,0 +1,54 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/webrtc +git_hash: 5bceb0126f92c42015a1e143e24ae84122b8f0b0 # v2.1.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/webrtc + go_lib_deps: + - pion-datachannel + - pion-dtls + - pion-ice + - pion-logging + - pion-quic + - pion-rtcp + - pion-rtp + - pion-sctp + - pion-sdp + - pion-srtp + - pion-transport + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: pion-datachannel + project: pion-datachannel + - name: pion-dtls + project: pion-dtls + - name: pion-ice + project: pion-ice + - name: pion-logging + project: pion-logging + - name: pion-quic + project: pion-quic + - name: pion-rtcp + project: pion-rtcp + - name: pion-rtp + project: pion-rtp + - name: pion-sctp + project: pion-sctp + - name: pion-sdp + project: pion-sdp + - name: pion-srtp + project: pion-srtp + - name: pion-transport + project: pion-transport + - name: testify + project: testify diff --git a/projects/qtls/config b/projects/qtls/config new file mode 100644 index 0000000..55f4444 --- /dev/null +++ b/projects/qtls/config @@ -0,0 +1,24 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/marten-seemann/qtls +git_hash: 65ca381cd298d7e0aef0de8ba523a870ec5a96fe # v0.2.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/marten-seemann/qtls + go_lib_deps: + - goxcrypto + - goxsys + +input_files: + - project: container-image + - name: go + project: go + - name: goxcrypto + project: goxcrypto + - name: goxsys + project: goxsys diff --git a/projects/quic-go/config b/projects/quic-go/config new file mode 100644 index 0000000..c2361a4 --- /dev/null +++ b/projects/quic-go/config @@ -0,0 +1,39 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/lucas-clemente/quic-go +git_hash: 907071221cf97f75398d9cf8b1174e94f56e8f96 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/lucas-clemente/quic-go + go_lib_deps: + - genny + - ginkgo + - gomega + - gomock + - goxcrypto + - goxnet + - qtls + +input_files: + - project: container-image + - name: go + project: go + - name: genny + project: genny + - name: ginkgo + project: ginkgo + - name: gomega + project: gomega + - name: gomock + project: gomock + - name: goxcrypto + project: goxcrypto + - name: goxnet + project: goxnet + - name: qtls + project: qtls diff --git a/projects/testify/config b/projects/testify/config new file mode 100644 index 0000000..9b20867 --- /dev/null +++ b/projects/testify/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/stretchr/testify +git_hash: 221dbe5ed46703ee255b1da0dec05086f5035f62 # v1.4.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/stretchr/testify + go_lib_deps: + - go-difflib + - go-spew + - goyaml + - objx + +input_files: + - project: container-image + - name: go + project: go + - name: go-difflib + project: go-difflib + - name: go-spew + project: go-spew + - name: goyaml + project: goyaml + - name: objx + project: objx

1 0

[tor-browser-build/master] Bug 25483: Use snowflake from the cohosh/pion branch.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 4ff2be0b02e322716f06829e49c50f39795bf43c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 29 03:05:45 2019 +0000 Bug 25483: Use snowflake from the cohosh/pion branch. Switched to using the pion/webrtc library and modified the targets to build snowflake on all platforms. --- projects/snowflake/build | 31 ++-------------------- projects/snowflake/config | 30 +++------------------ .../PTConfigs/windows/torrc-defaults-appendix | 3 +++ projects/tor-browser/build | 15 +++-------- rbm.conf | 7 +++-- 5 files changed, 18 insertions(+), 68 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 6534329..5309318 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -1,31 +1,13 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% IF c("var/linux") %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # 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. - export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" -[% END -%] distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR -[% IF c("var/osx") %] - export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CC="$clangdir/bin/clang" - export CXX="$clangdir/bin/clang++" -[% END %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/go-webrtc') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -35,16 +17,7 @@ mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" cd client -[% IF c("var/osx") -%] - # Without faketime, snowflake-client would contain the timestamp of the - # temporary client.a file created during "go build". - # The -tmpdir flag overrides what would otherwise be a randomly generated - # path, /tmp/go-link-RANDOMNUM/go.o. - mkdir -p /var/tmp/go-link.tmpdir - [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' -[% ELSE -%] - go build -ldflags '-s' -[% END -%] +go build -ldflags '-s' cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd .. diff --git a/projects/snowflake/config b/projects/snowflake/config index cef0930..1f74d48 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,42 +1,20 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: cd650fa0097f948b15dddd889ad2e6908b58bd66 +git_url: https://github.com/cohosh/snowflake +git_hash: 49a899be452a58db27ecc94223b0c527bf8d4927 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: use_container: 1 -targets: - linux-i686: - var: - arch_deps: - - pkg-config - - libx11-dev:i386 - linux-x86_64: - var: - arch_deps: - - pkg-config - - libx11-dev - osx-x86_64: - var: - arch_deps: - - pkg-config - - faketime - input_files: - project: container-image - name: go project: go - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - name: binutils - project: binutils - enable: '[% c("var/linux") %]' - - name: go-webrtc - project: go-webrtc - name: uniuri project: uniuri - name: goptlib project: goptlib + - name: pion-webrtc + project: pion-webrtc diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 18b8460..af16b3c 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,2 +1,5 @@ ## obfs4proxy configuration ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe + +## snowflake configuration +ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index ed69f19..67419a8 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -108,19 +108,12 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -[% IF c("var/linux") || c("var/osx") -%] - [% IF ! c("var/snowflake") %] - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$GENERATEDPREFSPATH" - [% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" - [% END %] -[% END -%] -[% IF c("var/windows") -%] - # We don't have snowflake available on Windows (yet). +[% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ >> "$GENERATEDPREFSPATH" -[% END -%] +[% ELSE %] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" +[% END %] [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" diff --git a/rbm.conf b/rbm.conf index 581bd0e..e6379f8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -247,7 +247,7 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake for linux and macOS on the alpha and nightly + # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' container: @@ -299,6 +299,9 @@ targets: flag_mwindows: '-mwindows' compiler: mingw-w64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 + # We only build snowflake on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python @@ -324,7 +327,7 @@ targets: LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" macosx_deployment_target: '10.9' locale_ja: ja-JP-mac - # We only build snowflake for linux and macOS on the alpha and nightly + # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps:

1 0

[tor-browser-build/master] Bug 25483: Remove depot_tools, go-webrtc, webrtc projects.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 52ebafd72bdbbd713d080a5a5828fefd2c6cf0d7 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 29 03:24:50 2019 +0000 Bug 25483: Remove depot_tools, go-webrtc, webrtc projects. Remove mentions of webrtc and gclient from README. --- README | 6 +- projects/depot_tools/build | 8 -- projects/depot_tools/config | 5 - projects/go-webrtc/config | 63 ----------- projects/webrtc/build | 163 --------------------------- projects/webrtc/config | 123 --------------------- projects/webrtc/webrtc-linux.patch | 25 ----- projects/webrtc/webrtc-mac.patch | 220 ------------------------------------- 8 files changed, 2 insertions(+), 611 deletions(-) diff --git a/README b/README index 6aa763e..2ea5630 100644 --- a/README +++ b/README @@ -15,9 +15,7 @@ from containers. The sources of most components are downloaded using git, which needs to be installed. Some components are downloaded using mercurial which also -needs to be installed. The sources of webrtc are downloaded using -gclient, which requires GTK+ 2.0 development files and curl to be -installed. +needs to be installed. You also need a few perl modules installed: - YAML::XS @@ -44,7 +42,7 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ + libfile-copy-recursive-perl git runc \ mercurial The build system is based on rbm, which is included as a git submodule diff --git a/projects/depot_tools/build b/projects/depot_tools/build deleted file mode 100644 index ac0f21b..0000000 --- a/projects/depot_tools/build +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/depot_tools/config b/projects/depot_tools/config deleted file mode 100644 index a1848dc..0000000 --- a/projects/depot_tools/config +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_hash: 7d9d9233cb657e968831238346917b0b64abb4c1 -git_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git -filename: '[% project %]-[% c("version") %].tar.gz' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config deleted file mode 100644 index fcf6e89..0000000 --- a/projects/go-webrtc/config +++ /dev/null @@ -1,63 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/keroserene/go-webrtc.git -git_hash: ed20e74ef428d6149a95bab8e63afb47af55c204 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/keroserene/go-webrtc - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - [% IF c("var/linux") %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" - [% END -%] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/webrtc') %] - # Replace the prebuilt webrtc library with our own one. - rm -rf include/ lib/ - cp -a /var/tmp/dist/webrtc/{include,lib} . - [% IF c("var/linux") -%] - # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - export CGO_CXXFLAGS="-D__STDC_FORMAT_MACROS=1" - export CGO_LDFLAGS=-latomic - [% END -%] - [% IF c("var/osx") -%] - export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" - export CC="$clangdir/bin/clang" - export CXX="$clangdir/bin/clang++" - [% END -%] - -targets: - linux-i686: - var: - arch_deps: - - pkg-config - - libx11-dev:i386 - linux-x86_64: - var: - arch_deps: - - pkg-config - - libx11-dev - osx-x86_64: - var: - arch_deps: - - pkg-config - -input_files: - - project: container-image - - name: go - project: go - - name: webrtc - project: webrtc - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - name: binutils - project: binutils - enable: '[% c("var/linux") %]' diff --git a/projects/webrtc/build b/projects/webrtc/build deleted file mode 100644 index 2ede64b..0000000 --- a/projects/webrtc/build +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash -set -e -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -mkdir -p /var/tmp/dist - -[% IF c("var/linux") %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" -[% END -%] -[% IF c("var/osx") -%] - # src/build/toolchain/mac/filter_libtool.py wants libtool to be called exactly "libtool". - ln -sf x86_64-apple-darwin11-libtool $cctoolsdir/libtool - export AR=x86_64-apple-darwin11-ar - # Certain cross-compiling flags are set in webrtc-mac.patch because the build - # system doesn't honor CFLAGS etc. environment variables. -[% ELSE -%] - AR=ar -[% END -%] - -# Setting up depot_tools -# https://dev.chromium.org/developers/how-tos/install-depot-tools -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/depot_tools') %] -export PATH="$PATH:/var/tmp/dist/depot_tools" -# Disable automatic updating. -export DEPOT_TOOLS_UPDATE=0 - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf webrtc-sources-[% c('version') %].tar.gz - -builddir=/var/tmp/build/[% project %]/src -cd $builddir - -[% IF c("var/linux") -%] - patch -p1 < $rootdir/webrtc-linux.patch -[% END -%] -[% IF c("var/osx") -%] - patch -p1 < $rootdir/webrtc-mac.patch -[% END -%] - -[% IF c("var/linux") -%] - # 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" -[% END -%] -[% IF c("var/osx") -%] - # The linux descriptor builds its own copy of gn, using tools/gn/bootstrap/bootstrap.py. - # I tried that here, but for some reason the gn so built doesn't work. On "gn gen", - # it crashes with this error: - # [0624/022439.767916:FATAL:command_gen.cc(59)] Check failed: !rule.empty(). - # Instead, use the gn packaged with depot_tools. - GN="/var/tmp/dist/depot_tools/gn" - - # Hardcode the output of some utility programs that otherwise require Xcode - # tools, like xcode-select, xcodebuild, sw_vers, and xcrun. This probably - # needs to be kept in sync with the SDK version. - cat <<EOF > build/mac/find_sdk.py -print("$sysrootdir") -print("10.11") -EOF - cat <<EOF > build/config/mac/sdk_info.py -print("machine_os_build=\"[% c("var/macosx_deployment_target") %]\"") -print("sdk_build=\"10.11\"") -print("sdk_path=\"$sysrootdir\"") -print("sdk_platform_path=\"$sysrootdir\"") -print("sdk_version=\"10.11\"") -print("xcode_build=\"7.3\"") -print("xcode_version=\"0730\"") -EOF -[% END -%] - - -[% IF c("var/linux") -%] - export CC=gcc - export CXX=g++ -[% END -%] -[% IF c("var/linux-i686") -%] - GYP_DEFINES+=" target_arch=ia32" - export CC='gcc -m32' - export CXX='g++ -m32' - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] - -export GN_ARGS="" -# For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". -# https://gn.googlesource.com/gn/+/master/docs/cross_compiles.md -# 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. -GN_ARGS+=" is_clang=false use_sysroot=false" -# Use libstdc++, not libc++. -GN_ARGS+=" use_custom_libcxx=false" -[% IF c("var/linux") -%] - GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" - 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" -[% END -%] -[% IF c("var/osx") -%] - GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"[% c("var/macosx_deployment_target") %]\"" - GN_ARGS+=" clang_use_chrome_plugins=false" - GN_ARGS+=" clang_base_path=\"$clangdir\"" - # No lld in our toolchain currently. - GN_ARGS+=" use_lld=false" - # Avoid some dependencies. - GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" - # Tests are needed for field_trial, metrics_default, and pc_test_utils targets - # (which include code needed by go-webrtc). - GN_ARGS+=" rtc_include_tests=true" - # Make sure not to use bundled clang and binutils. - rm -rf third_party/llvm-build - rm -rf third_party/binutils -[% END -%] -rm -rf out/Release -"$GN" gen out/Release --args="$GN_ARGS" -ninja -C out/Release webrtc field_trial metrics_default pc_test_utils -# The cctools ar doesn't have the 'D' deterministic option of GNU ar, but the -# ZERO_AR_DATE environment variable similarly sets timestamps within the -# archive to zero. -# https://opensource.apple.com/source/cctools/cctools-886/ar/archive.c.auto.h… -# https://codereview.chromium.org/699083004/ -# .o files under out/Release/obj/ are the build outputs. Don't include .o -# files from elsewhere under out/ because they are build helpers and things -# like that, not necessarily of the target architecture, and anyway are not -# needed. -# https://bugs.torproject.org/22832 -find out/Release/obj -name '*.o' -print0 | sort -z \ - | [% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %] xargs -0 -- "$AR" crs libwebrtc-magic.a - -mkdir -p $distdir -cd $distdir -mkdir -p include lib -cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] -INCLUDE_DIR="$PWD/include" -cd $builddir -find . -type f -name '*.h' -print0 | while IFS= read -r -d '' h; -do - mkdir -p "$INCLUDE_DIR/$(dirname "$h")" - cp -f "$h" "$INCLUDE_DIR/$h" -done - -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/webrtc/config b/projects/webrtc/config deleted file mode 100644 index ff2792e..0000000 --- a/projects/webrtc/config +++ /dev/null @@ -1,123 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("var/webrtc_tag") %]' -filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - webrtc_tag: 88f5d9180eae78a6162cccd78850ff416eb82483 - -input_files: - - project: container-image - - project: webrtc - pkg_type: fetch_sources - - project: depot_tools - name: depot_tools - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: binutils - name: binutils - enable: '[% c("var/linux") %]' - - filename: webrtc-linux.patch - enable: '[% c("var/linux") %]' - - filename: webrtc-mac.patch - enable: '[% c("var/osx") %]' - -targets: - linux: - var: - webrtc: - os: linux - linux-i686: - var: - webrtc: - lib_path: lib/libwebrtc-linux-386-magic.a - sort_deps: 0 - arch_deps: - - lib32asound2-dev - - lib64expat1 - - libexpat1-dev:i386 - - libglib2.0-dev:i386 - - libgtk-3-dev:i386 - - libudev-dev:i386 - - libx11-dev:i386 - - libxext-dev:i386 - - libxrandr-dev:i386 - - pkg-config - - hardening-wrapper - linux-x86_64: - var: - webrtc: - lib_path: lib/libwebrtc-linux-amd64-magic.a - arch_deps: - - libasound2-dev - - libexpat1-dev - - libglib2.0-dev - - libgtk-3-dev - - libudev-dev - - libx11-dev - - libxext-dev - - libxrandr-dev - - pkg-config - osx-x86_64: - var: - webrtc: - lib_path: lib/libwebrtc-darwin-amd64-magic.a - arch_deps: - - libglib2.0-dev - - pkg-config - - python-biplist - -steps: - fetch_sources: - var: - container: - use_container: 0 - filename: 'webrtc-sources-[% c("var/webrtc_tag") %].tar.gz' - fetch_sources: | - #!/bin/bash - [% c("var/set_default_env") -%] - # WebRTC is special, having its own build system that brings in lots of Chromium dependencies. - # https://webrtc.org/native-code/development/ - tar xf [% c('input_files_by_name/depot_tools') %] - export PATH="$rootdir/depot_tools:$PATH" - # Use --no-history because the whole checkout with history is about 12 GB. - # 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 - clone_dir='[% c("basedir") %]/gclient/webrtc' - mkdir -p "$clone_dir" - cd "$clone_dir" - if [ ! -d "src" ]; - then - # "fetch" is part of depot_tools. - #fetch --nohooks --no-history webrtc - # FIXME: To avoid the unconditional `gclient sync` in the call to fetch, - # we inline the result of a `fetch --dry-run` - gclient root - gclient config --spec 'solutions = [ - { - "managed": False, - "name": "src", - "url": "https://chromium.googlesource.com/external/webrtc.git", - "custom_deps": {}, - "deps_file": "DEPS", - "safesync_url": "", - }, - ] - ' - gclient sync --nohooks --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] - cd src - git submodule foreach 'git config -f $toplevel/.git/config submodule.$name.ignore all' - git config --add remote.origin.fetch '+refs/tags/*:refs/tags/*' - git config diff.ignoreSubmodules all - cd .. - fi - # "gclient" is part of depot_tools. This download takes a long time the first time. - gclient sync --force --delete_unversioned_trees --reset --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] - cd .. - tar --exclude .git -czf [% dest_dir _ '/' _ c('filename') %] webrtc - input_files: - - project: depot_tools - name: depot_tools - pkg_type: build diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch deleted file mode 100644 index efeebbb..0000000 --- a/projects/webrtc/webrtc-linux.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2d7897d479a13cbf68335140b61228cd5552dfd9 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:14:32 -0700 -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 81cb3e73ae..5304a64ce8 100644 ---- a/build_overrides/build.gni -+++ b/build_overrides/build.gni -@@ -10,7 +10,7 @@ - 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.11.0 - diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch deleted file mode 100644 index d1144af..0000000 --- a/projects/webrtc/webrtc-mac.patch +++ /dev/null @@ -1,220 +0,0 @@ -From df1a0923f1534a238e9773000dd03dd7b55e2c72 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:03:16 -0700 -Subject: [PATCH 1/6] Disable assertions that prevent cross-compiling for mac. - ---- - config/BUILDCONFIG.gn | 4 ++-- - toolchain/mac/BUILD.gn | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 48ed140c7..15e06808c 100644 ---- a/build/config/BUILDCONFIG.gn -+++ b/build/config/BUILDCONFIG.gn -@@ -238,8 +238,8 @@ if (target_os == "android") { - } else if (target_os == "ios") { - _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" - } else if (target_os == "mac") { -- assert(host_os == "mac", "Mac cross-compiles are unsupported.") -- _default_toolchain = host_toolchain -+ # assert(host_os == "mac", "Mac cross-compiles are unsupported.") -+ _default_toolchain = "//build/toolchain/mac:clang_$host_cpu" - } else if (target_os == "win") { - # On Windows we use the same toolchain for host and target by default. - # Beware, win cross builds mostly don't work yet, see docs/win_cross.md -diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn -index fc113d6a3..7a0171700 100644 ---- a/build/toolchain/mac/BUILD.gn -+++ b/build/toolchain/mac/BUILD.gn -@@ -14,7 +14,7 @@ if (is_ios) { - import("//build/config/mac/mac_sdk.gni") - import("//build/config/mac/symbols.gni") - --assert(host_os == "mac") -+# assert(host_os == "mac") - - import("//build/toolchain/cc_wrapper.gni") - import("//build/toolchain/clang_static_analyzer.gni") --- -2.11.0 - -From c9cdc59ebb986392367115105ecbc1f5b511130d Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:04:26 -0700 -Subject: [PATCH 2/6] Hardcode cross-compiling flags in config/mac/BUILD.gn. - -The build system doesn't provide a general way to set flags externally. -"No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS" -https://bugs.chromium.org/p/chromium/issues/detail?id=595653 ---- - config/mac/BUILD.gn | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn -index 4c681e88c..26fbcac2b 100644 ---- a/build/config/mac/BUILD.gn -+++ b/build/config/mac/BUILD.gn -@@ -57,6 +57,11 @@ config("runtime_library") { - "-isysroot", - rebase_path(sysroot, root_build_dir), - "-mmacosx-version-min=$mac_deployment_target", -+ "-target", -+ "x86_64-apple-darwin11", -+ "-Wno-unknown-warning-option", -+ "-B", -+ "/var/tmp/dist/macosx-toolchain/cctools/bin", - ] - - asmflags = common_flags --- -2.11.0 - -From 86d0882084c8b0595d693cce43e96b01182814b7 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Tue, 4 Dec 2018 07:37:42 +0000 -Subject: [PATCH 3/6] Remove -instcombine-lower-dbg-declare=0 from cflags. - -Not supported in our current version of llvm: -clang (LLVM option parsing): Unknown command line argument '-instcombine-lower-dbg-declare=0'. Try: 'clang (LLVM option parsing) -help' -clang (LLVM option parsing): Did you mean '-combiner-use-tbaa=0'? ---- - config/compiler/BUILD.gn | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn -index a6ba4ea6..e775f9f5 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -427,10 +427,10 @@ config("compiler") { - if (is_clang && !is_nacl && current_toolchain == host_toolchain && - target_os != "chromeos") { - cflags += [ -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -+ # "-Xclang", -+ # "-mllvm", -+ # "-Xclang", -+ # "-instcombine-lower-dbg-declare=0", - ] - } - --- -2.11.0 - -From 96d243466006263e99b08ebf8b6085c60b736ccc Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:06:06 -0700 -Subject: [PATCH 4/6] Port build/config/mac/plist_util.py to biplist. - -So as not to require the plutil command. plutil was only being used to -convert between XML and binary plist formats, because versions of the -plistlib module before Python 3.4 only support the XML format. The -biplist library handles both formats natively. - -FAILED: gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist -python ../../build/config/mac/plist_util.py merge -f=xml1 -o=gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist ../../build/config/mac/BuildInfo.plist ../../webrtc/examples/objc/AppRTCMobile/mac/Info.plist -Traceback (most recent call last): - File "../../build/config/mac/plist_util.py", line 254, in <module> - sys.exit(Main()) - File "../../build/config/mac/plist_util.py", line 250, in Main - args.func(args) - File "../../build/config/mac/plist_util.py", line 207, in _Execute - data = MergePList(data, LoadPList(filename)) - File "../../build/config/mac/plist_util.py", line 121, in LoadPList - subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) - File "/usr/lib/python2.7/subprocess.py", line 535, in check_call - retcode = call(*popenargs, **kwargs) - File "/usr/lib/python2.7/subprocess.py", line 522, in call - return Popen(*popenargs, **kwargs).wait() - File "/usr/lib/python2.7/subprocess.py", line 710, in __init__ - errread, errwrite) - File "/usr/lib/python2.7/subprocess.py", line 1335, in _execute_child - raise child_exception -OSError: [Errno 2] No such file or directory ---- - config/mac/plist_util.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py -index bba0208a5..019dcf918 100644 ---- a/build/config/mac/plist_util.py -+++ b/build/config/mac/plist_util.py -@@ -3,7 +3,7 @@ - # found in the LICENSE file. - - import argparse --import plistlib -+import biplist - import os - import re - import subprocess -@@ -89,6 +89,7 @@ def Interpolate(value, substitutions): - - def LoadPList(path): - """Loads Plist at |path| and returns it as a dictionary.""" -+ return biplist.readPlist(path) - fd, name = tempfile.mkstemp() - try: - subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) -@@ -100,6 +101,7 @@ def LoadPList(path): - - def SavePList(path, format, data): - """Saves |data| as a Plist to |path| in the specified |format|.""" -+ return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format - fd, name = tempfile.mkstemp() - try: - # "plutil" does not replace the destination file but update it in place, --- -2.11.0 - -From eb3787dd670900cc2c3020c9323a9d95983c8887 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Tue, 4 Dec 2018 05:16:04 +0000 -Subject: [PATCH 5/6] Override use_system_xcode=true. - ---- - build_overrides/build.gni | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/build_overrides/build.gni b/build_overrides/build.gni -index 81cb3e73ae..b683ea850c 100644 ---- a/build_overrides/build.gni -+++ b/build_overrides/build.gni -@@ -46,3 +46,5 @@ if (host_os == "mac") { - "hermetic toolchain if the minimum OS version is not met.") - use_system_xcode = _result == 0 - } -+ -+use_system_xcode = true --- -2.11.0 - -From 5df71ea8f31fd25a05c6b6b881c8126b25b5475c Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 3 Dec 2018 21:11:14 -0700 -Subject: [PATCH 6/6] Disable the desktop_capture module. - -It's causing an error related to CoreGraphics.h and hopefully we don't -need it. ---- - modules/BUILD.gn | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/modules/BUILD.gn b/modules/BUILD.gn -index 465f32d3c4..578cdbd57e 100644 ---- a/modules/BUILD.gn -+++ b/modules/BUILD.gn -@@ -17,7 +17,6 @@ group("modules") { - "audio_processing", - "bitrate_controller", - "congestion_controller", -- "desktop_capture", - "media_file", - "pacing", - "remote_bitrate_estimator", --- -2.11.0 -

1 0

[tor-browser-build/master] Pick up mobile bridge changes for #31664
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit f13ad8814b2024c2fe02c8a163534d99c545cf86 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 25 06:24:28 2019 +0000 Pick up mobile bridge changes for #31664 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index cc9eded..762a813 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: e7ca52e09c9bad0635ad1f2e77a23534f071b53c +git_hash: 8d307a63a95a31d3578715ca407066062f9d7f5e git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-android-service/master] Add three new default obfs4 bridges.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 8d307a63a95a31d3578715ca407066062f9d7f5e Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 23 08:38:29 2019 -0700 Add three new default obfs4 bridges. These bridges are run by Karlstad University in Sweden. See the following ticket for more details: <https://bugs.torproject.org/31164> --- service/src/main/assets/common/bridges.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index c1c00a6..89b6404 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -7,4 +7,7 @@ obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpd obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0 obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0 obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0 +obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0 +obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0 +obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-browser-build/master] Merge remote-tracking branch 'phw/project/31164'
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit e5922c8fc4c518112f2b32f57319306770071c3e Merge: 4739eb7 12e86d1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 25 06:17:28 2019 +0000 Merge remote-tracking branch 'phw/project/31164' projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+)

1 0