Commit 991ebf57 authored by Richard Pospesel's avatar Richard Pospesel Committed by richard
Browse files

Bug 41111: Use Lyrebird to provide WebTunnel PT Client

parent fd4f3d0b

Makefile

+0 −3
Changes for Makefile: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -643,9 +643,6 @@ go_vendor-snowflake: submodule-update 
go_vendor-conjure: submodule-update

	$(rbm) build conjure --step go_vendor --target alpha --target torbrowser-linux-x86_64



go_vendor-webtunnel: submodule-update

	$(rbm) build webtunnel --step go_vendor --target alpha --target torbrowser-linux-x86_64



go_vendor-lyrebird: submodule-update

	$(rbm) build lyrebird --step go_vendor --target alpha --target torbrowser-linux-x86_64

projects/browser/build

+0 −3
Changes for projects/browser/build: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -109,11 +109,8 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b 


  # Move READMEs from tor-expert-bundle to the doc dir

  mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]



  mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]

  mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %]

  mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"

  mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md"

  mv_tbdir tor/pluggable_transports/README.CONJURE.md "$DOCSPATH/conjure/README.md"



  # Move the PTs to where TB expects them

projects/lyrebird/config

+2 −2
Changes for projects/lyrebird/config: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: 0.1.0

version: 0.2.0

git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird.git

git_hash: 'lyrebird-[% c("version") %]'

tag_gpg_id: 1
@@ -9,7 +9,7 @@ container: 
  use_container: 1



var:

  go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d

  go_vendor_sha256sum: dc6b2671250f4ffd0caff3ef020bd60f99207f519f6f5f1be47243677a13c695



targets:

  nightly:

projects/tor-android-service/config

+1 −1
Changes for projects/tor-android-service/config: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]'

git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22

git_hash: 27924bc748044e987c188be854ff1471397cdb6a

git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git

git_submodule: 1

container:

projects/tor-expert-bundle/build

+0 −2
Changes for projects/tor-expert-bundle/build: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ mkdir pluggable_transports && cd pluggable_transports 


tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]

tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]

tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]

tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]



# add per-platform pt extension
@@ -35,7 +34,6 @@ cd $distdir 
  cp -a tor/pluggable_transports/conjure-client aar/jni/[% c('arch') %]/libConjure.so

  cp -a tor/pluggable_transports/lyrebird aar/jni/[% c('arch') %]/Lyrebird.so

  cp -a tor/pluggable_transports/snowflake-client aar/jni/[% c('arch') %]/libSnowflake.so

  cp -a tor/pluggable_transports/webtunnel-client aar/jni/[% c('arch') %]/libWebtunnel.so



  cp -a data/* aar/assets/common/