- tbb-commits - lists.torproject.org

[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] 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] Add three new default obfs4 bridges.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 12e86d1fbb3e024a04f93cb370b265f5f81fc56e Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 23 08:35:20 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> --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index de9f98b..aa464d6 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -12,6 +12,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 01 pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "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

[tor-browser-build/master] Update OpenSSL to 1.1.1d
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 4739eb773e74edf1f0df7d7ed9ac79b6a0ddf92c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 19:02:50 2019 +0000 Update OpenSSL to 1.1.1d --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 1a3da33..27b9526 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1c +version: 1.1.1d filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90 + sha256sum: 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2

1 0

[tor-browser-build/master] Bug 31584: Clean up mingw-w64 project
by boklm＠torproject.org 23 Sep '19

23 Sep '19

commit 67a38dec8014e4ba33dc062527e74df2aca1f3db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 16 06:41:49 2019 +0000 Bug 31584: Clean up mingw-w64 project We bump the GCC version to a supported one (9.2.0). The obvious choice would have been 8.3.0 as we use for our Linux bundles. But, alas, that one is crashing when cross-compiling Rust for 64bit Windows. --- projects/mingw-w64/build | 11 ++---- projects/mingw-w64/config | 5 ++- projects/mingw-w64/libtool-sort.patch | 67 ----------------------------------- projects/tor/build | 3 ++ 4 files changed, 7 insertions(+), 79 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 4be660d..111205c 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -22,17 +22,10 @@ cd /var/tmp/build mkdir gcc cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz -# https://gcc.gnu.org/ml/gcc-patches/2018-06/msg01115.html -# From gcc commit 494c17dc2bf45b8155fb9a14178ab48f01bc12a8 -# libtool: Sort output of 'find' to enable deterministic builds. -patch -p1 -d gcc-[% c("var/gcc_version") %] < $rootdir/libtool-sort.patch -# We don't want to link against msvcrt.dll due to bug 9084 and want to use -# pthreads, too, as this is needed for ESR60, at least due to bug 1406542. -[% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100 -lpthread/' -i $distdir/msvcr100.spec # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +# Rust requires enabling pthreads gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index b088c8e..1ccbcdf 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -6,7 +6,7 @@ version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 6.4.0 + gcc_version: 9.2.0 deps: - automake - build-essential @@ -30,7 +30,6 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' - sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 + sha256sum: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 - name: binutils project: binutils - - filename: libtool-sort.patch diff --git a/projects/mingw-w64/libtool-sort.patch b/projects/mingw-w64/libtool-sort.patch deleted file mode 100644 index 7c7fa85..0000000 --- a/projects/mingw-w64/libtool-sort.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 494c17dc2bf45b8155fb9a14178ab48f01bc12a8 Mon Sep 17 00:00:00 2001 -From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Thu, 5 Jul 2018 19:13:45 +0000 -Subject: [PATCH 1/1] * libtool.m4: Sort output of 'find' to enable - deterministic builds. * ltmain.sh: Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@262451 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - ChangeLog | 5 +++++ - libtool.m4 | 8 ++++---- - ltmain.sh | 4 ++-- - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/libtool.m4 b/libtool.m4 -index 24d13f3..940faaa 100644 ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -6005,20 +6005,20 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -diff --git a/ltmain.sh b/ltmain.sh -index 9503ec8..79f9ba8 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -2917,7 +2917,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +2932,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" --- -2.9.3 - diff --git a/projects/tor/build b/projects/tor/build index 6b684a0..0705626 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -39,6 +39,9 @@ openssldir=/var/tmp/dist/openssl [% END %] tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] zlibdir=/var/tmp/build/zlib + # XXX: It's a bit unfortunate but we need the pthread dll here as libevent + # gets compiled with pthread support once it is enabled in GCC, which we need + # to do as otherwise the Rust compilaton breaks. mingwlibs=/var/tmp/dist/mingw-w64/[% c("arch") %]-w64-mingw32/bin/ cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ $gcclibs/*.dll $mingwlibs/libwinpthread-1.dll $distdir/Tor/

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31584_v4'
by boklm＠torproject.org 23 Sep '19

23 Sep '19

commit 17c61f4b647f0e0bf759d78ad49520770914524e Merge: b16662a 67a38de Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 23 19:24:47 2019 +0200 Merge remote-tracking branch 'gk/bug_31584_v4' projects/mingw-w64/build | 11 ++---- projects/mingw-w64/config | 5 ++- projects/mingw-w64/libtool-sort.patch | 67 ----------------------------------- projects/tor/build | 3 ++ 4 files changed, 7 insertions(+), 79 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "libssp test"
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 672bd49039cafa175f37b5bb3eaf850271e8a3a0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 16:00:33 2019 +0000 Revert "libssp test" This reverts commit c153996e3cbc072eb2ae68ae5c532848b1ac9c3b. --- build/moz.configure/toolchain.configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 3bcf403bceec..68364075f006 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1676,10 +1676,12 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target # Enable only if hardening is not disabled and ASAN is # not on as ASAN will catch the crashes for us if compiler_is_gccish and not asan: - flags.append("-fstack-protector-strong") - ldflags.append("-fstack-protector-strong") - js_flags.append("-fstack-protector-strong") - js_ldflags.append("-fstack-protector-strong") + # mingw-clang cross-compile toolchain has bugs with stack protector + if target.os != 'WINNT' or c_compiler == 'gcc': + flags.append("-fstack-protector-strong") + ldflags.append("-fstack-protector-strong") + js_flags.append("-fstack-protector-strong") + js_ldflags.append("-fstack-protector-strong") # ASLR ------------------------------------------------ # ASLR (dynamicbase) is enabled by default in clang-cl; but the

1 0