boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits: 94050678 by Nicolas Vigier at 2023-06-05T10:29:21+02:00 Revert "Bug 40869: Temporarily set obfs4 to a fixed commit"
This reverts commit 40298e792e7cd498e8534d65cb1220ff4e43e325.
- - - - - 723c63a0 by Nicolas Vigier at 2023-06-05T17:24:57+02:00 Bug 40869: obfs4 is renamed to lyrebird
- - - - -
11 changed files:
- Makefile - projects/browser/Bundle-Data/Docs-TBB/Licenses/PluggableTransports/LICENSE - projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix - projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix - projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix - projects/obfs4/build → projects/lyrebird/build - projects/obfs4/config → projects/lyrebird/config - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - projects/tor-expert-bundle/pt_config.json - projects/tor-onion-proxy-library/build
Changes:
===================================== Makefile ===================================== @@ -601,11 +601,11 @@ go_vendor-conjure-alpha: submodule-update go_vendor-webtunnel-alpha: submodule-update $(rbm) build webtunnel --step go_vendor --target alpha --target torbrowser-linux-x86_64
-go_vendor-obfs4-alpha: submodule-update - $(rbm) build obfs4 --step go_vendor --target alpha --target torbrowser-linux-x86_64 +go_vendor-lyrebird-alpha: submodule-update + $(rbm) build lyrebird --step go_vendor --target alpha --target torbrowser-linux-x86_64
-go_vendor-obfs4-nightly: submodule-update - $(rbm) build obfs4 --step go_vendor --target nightly --target torbrowser-linux-x86_64 +go_vendor-lyrebird-nightly: submodule-update + $(rbm) build lyrebird --step go_vendor --target nightly --target torbrowser-linux-x86_64
##################
===================================== projects/browser/Bundle-Data/Docs-TBB/Licenses/PluggableTransports/LICENSE ===================================== @@ -145,10 +145,10 @@ warranty. See LICENSE.CC0.
===============================================================================
-obfs4 +lyrebird
-Copyright (c) 2014, Yawning Angel <yawning at torproject dot org> -All rights reserved. +Copyright (c) 2023, The Tor Project +Copyright (c) 2014-2023, Yawning Angel <yawning at schwanenlied dot me>
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
===================================== projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix ===================================== @@ -1,5 +1,5 @@ -## obfs4proxy configuration -ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy +## lyrebird configuration +ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/lyrebird
## snowflake configuration ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client
===================================== projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix ===================================== @@ -1,5 +1,5 @@ -## obfs4proxy configuration -ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy +## lyrebird configuration +ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/lyrebird
## snowflake configuration ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client
===================================== projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix ===================================== @@ -1,5 +1,5 @@ -## obfs4proxy configuration -ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe +## lyrebird configuration +ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\lyrebird.exe
## snowflake configuration ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe
===================================== projects/obfs4/build → projects/lyrebird/build ===================================== @@ -17,9 +17,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %]
-cd obfs4proxy -go build -mod=vendor -ldflags '-s' -cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $distdir +go build -mod=vendor -ldflags '-s' ./cmd/lyrebird +cp -a lyrebird[% IF c("var/windows") %].exe[% END %] $distdir
cd $distdir [% c('tar', {
===================================== projects/obfs4/config → projects/lyrebird/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 -version: 0.0.14-tor2 -git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4... -git_hash: 'obfs4proxy-[% c("version") %]' +version: 0.1.0 +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyreb... +git_hash: 'lyrebird-[% c("version") %]' tag_gpg_id: 1 gpg_keyring: anti-censorship.gpg
@@ -9,16 +9,15 @@ container: use_container: 1
var: - go_vendor_sha256sum: 5d2d82d00afc5fe044ee6df718ffe066b7d9e5446944c0ee0870e060e4e6bcc8 + go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d
targets: nightly: - # Set fixed commit until tor-browser-build#40869 is done - git_hash: a34b4cad6d3c20f4abdec357e01101751a583f88 + git_hash: main version: '[% c("abbrev") %]' tag_gpg_id: 0 var: - go_vendor_sha256sum: 8b7e04a43bfbcdc829ea5093d8ee0a50eddefad543acd201b25424b33a7f882b + go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d
steps: build: @@ -32,7 +31,7 @@ steps: enable: '[% c("var/android") %]' - name: go_vendor pkg_type: go_vendor - project: obfs4 + project: lyrebird norec: sha256sum: '[% c("var/go_vendor_sha256sum") %]' target_replace:
===================================== projects/tor-expert-bundle/build ===================================== @@ -9,7 +9,7 @@ tar -xkf $rootdir/[% c('input_files_by_name/tor') %] cd tor mkdir pluggable_transports && cd pluggable_transports
-tar -xkf $rootdir/[% c('input_files_by_name/obfs4') %] +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') %]
===================================== projects/tor-expert-bundle/config ===================================== @@ -14,8 +14,8 @@ input_files: - project: container-image - name: tor project: tor - - name: obfs4 - project: obfs4 + - name: lyrebird + project: lyrebird - name: snowflake project: snowflake - project: webtunnel
===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -1,7 +1,7 @@ { "recommendedDefault" : "obfs4", "pluggableTransports" : { - "obfs4proxy" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${pt_extension}", + "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}lyrebird${pt_extension}", "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}", "webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}", "conjure" : "ClientTransportPlugin conjure exec ${pt_path}conjure-client${pt_extension} -registerURL https://registration.refraction.network/api"
===================================== projects/tor-onion-proxy-library/build ===================================== @@ -36,8 +36,8 @@ patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch
# Overwrite the obfs4proxy binary provided by Pluto and add Snowflake [% IF arch == "armv7" -%] - cp $ptdir/obfs4proxy external/pluto/bin/armeabi-v7a/ - cp $ptdir/obfs4proxy external/pluto/bin/armeabi/ + cp $ptdir/lyrebird external/pluto/bin/armeabi-v7a/obfs4proxy + cp $ptdir/lyrebird external/pluto/bin/armeabi/obfs4proxy cp $ptdir/snowflake-client external/pluto/bin/armeabi-v7a/ cp $ptdir/snowflake-client external/pluto/bin/armeabi/ cp $ptdir/conjure-client external/pluto/bin/armeabi-v7a/ @@ -45,12 +45,12 @@ patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/ cp $ptdir/webtunnel-client external/pluto/bin/armeabi/ [% ELSIF arch == "aarch64" -%] - cp $ptdir/obfs4proxy external/pluto/bin/arm64-v8a/ + cp $ptdir/lyrebird external/pluto/bin/arm64-v8a/obfs4proxy cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/ cp $ptdir/conjure-client external/pluto/bin/arm64-v8a/ cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/ [% ELSE -%] - cp $ptdir/obfs4proxy external/pluto/bin/[% arch %]/ + cp $ptdir/lyrebird external/pluto/bin/[% arch %]/obfs4proxy cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/ cp $ptdir/conjure-client external/pluto/bin/[% arch %]/ cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/6...