[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Revert "Bug 40869: Temporarily set obfs4 to a fixed commit"

Title: GitLab

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:

Changes:

  • Makefile
    ... ... @@ -601,11 +601,11 @@ go_vendor-conjure-alpha: submodule-update
    601 601 
     go_vendor-webtunnel-alpha: submodule-update
    602 602 
     	$(rbm) build webtunnel --step go_vendor --target alpha --target torbrowser-linux-x86_64
    603 603
    604 
    -go_vendor-obfs4-alpha: submodule-update
    605 
    -	$(rbm) build obfs4 --step go_vendor --target alpha --target torbrowser-linux-x86_64
    604 
    +go_vendor-lyrebird-alpha: submodule-update
    605 
    +	$(rbm) build lyrebird --step go_vendor --target alpha --target torbrowser-linux-x86_64
    606 606
    607 
    -go_vendor-obfs4-nightly: submodule-update
    608 
    -	$(rbm) build obfs4 --step go_vendor --target nightly --target torbrowser-linux-x86_64
    607 
    +go_vendor-lyrebird-nightly: submodule-update
    608 
    +	$(rbm) build lyrebird --step go_vendor --target nightly --target torbrowser-linux-x86_64
    609 609
    610 610
    611 611 
     ##################

  • projects/browser/Bundle-Data/Docs-TBB/Licenses/PluggableTransports/LICENSE
    ... ... @@ -145,10 +145,10 @@ warranty. See LICENSE.CC0.
    145 145
    146 146 
     ===============================================================================
    147 147
    148 
    -obfs4
    148 
    +lyrebird
    149 149
    150 
    -Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
    151 
    -All rights reserved.
    150 
    +Copyright (c) 2023, The Tor Project
    151 
    +Copyright (c) 2014-2023, Yawning Angel <yawning at schwanenlied dot me>
    152 152
    153 153 
     Redistribution and use in source and binary forms, with or without
    154 154 
     modification, are permitted provided that the following conditions are met:

  • projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
    1 
    -## obfs4proxy configuration
    2 
    -ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy
    1 
    +## lyrebird configuration
    2 
    +ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/lyrebird
    3 3
    4 4 
     ## snowflake configuration
    5 5 
     ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client

  • projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
    1 
    -## obfs4proxy configuration
    2 
    -ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy
    1 
    +## lyrebird configuration
    2 
    +ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/lyrebird
    3 3
    4 4 
     ## snowflake configuration
    5 5 
     ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client

  • projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
    1 
    -## obfs4proxy configuration
    2 
    -ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe
    1 
    +## lyrebird configuration
    2 
    +ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\lyrebird.exe
    3 3
    4 4 
     ## snowflake configuration
    5 5 
     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') %]
    17 17
    18 18 
     tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %]
    19 19
    20 
    -cd obfs4proxy
    21 
    -go build -mod=vendor -ldflags '-s'
    22 
    -cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $distdir
    20 
    +go build -mod=vendor -ldflags '-s' ./cmd/lyrebird
    21 
    +cp -a lyrebird[% IF c("var/windows") %].exe[% END %] $distdir
    23 22
    24 23 
     cd $distdir
    25 24 
     [% c('tar', {

  • projects/obfs4/config → projects/lyrebird/config
    1 1 
     # vim: filetype=yaml sw=2
    2 
    -version: 0.0.14-tor2
    3 
    -git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4.git
    4 
    -git_hash: 'obfs4proxy-[% c("version") %]'
    2 
    +version: 0.1.0
    3 
    +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird.git
    4 
    +git_hash: 'lyrebird-[% c("version") %]'
    5 5 
     tag_gpg_id: 1
    6 6 
     gpg_keyring: anti-censorship.gpg
    7 7
    ... ... @@ -9,16 +9,15 @@ container:
    9 9 
       use_container: 1
    10 10
    11 11 
     var:
    12 
    -  go_vendor_sha256sum: 5d2d82d00afc5fe044ee6df718ffe066b7d9e5446944c0ee0870e060e4e6bcc8
    12 
    +  go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d
    13 13
    14 14 
     targets:
    15 15 
       nightly:
    16 
    -    # Set fixed commit until tor-browser-build#40869 is done
    17 
    -    git_hash: a34b4cad6d3c20f4abdec357e01101751a583f88
    16 
    +    git_hash: main
    18 17 
         version: '[% c("abbrev") %]'
    19 18 
         tag_gpg_id: 0
    20 19 
         var:
    21 
    -      go_vendor_sha256sum: 8b7e04a43bfbcdc829ea5093d8ee0a50eddefad543acd201b25424b33a7f882b
    20 
    +      go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d
    22 21
    23 22 
     steps:
    24 23 
       build:
    ... ... @@ -32,7 +31,7 @@ steps:
    32 31 
             enable: '[% c("var/android") %]'
    33 32 
           - name: go_vendor
    34 33 
             pkg_type: go_vendor
    35 
    -        project: obfs4
    34 
    +        project: lyrebird
    36 35 
             norec:
    37 36 
               sha256sum: '[% c("var/go_vendor_sha256sum") %]'
    38 37 
             target_replace:

  • projects/tor-expert-bundle/build
    ... ... @@ -9,7 +9,7 @@ tar -xkf $rootdir/[% c('input_files_by_name/tor') %]
    9 9 
     cd tor
    10 10 
     mkdir pluggable_transports && cd pluggable_transports
    11 11
    12 
    -tar -xkf $rootdir/[% c('input_files_by_name/obfs4') %]
    12 
    +tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]
    13 13 
     tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
    14 14 
     tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]
    15 15 
     tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]

  • projects/tor-expert-bundle/config
    ... ... @@ -14,8 +14,8 @@ input_files:
    14 14 
       - project: container-image
    15 15 
       - name: tor
    16 16 
         project: tor
    17 
    -  - name: obfs4
    18 
    -    project: obfs4
    17 
    +  - name: lyrebird
    18 
    +    project: lyrebird
    19 19 
       - name: snowflake
    20 20 
         project: snowflake
    21 21 
       - project: webtunnel

  • projects/tor-expert-bundle/pt_config.json
    1 1 
     {
    2 2 
       "recommendedDefault" : "obfs4",
    3 3 
       "pluggableTransports" : {
    4 
    -    "obfs4proxy" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${pt_extension}",
    4 
    +    "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}lyrebird${pt_extension}",
    5 5 
         "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}",
    6 6 
         "webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}",
    7 7 
         "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
    36 36
    37 37 
       # Overwrite the obfs4proxy binary provided by Pluto and add Snowflake
    38 38 
       [% IF arch == "armv7" -%]
    39 
    -    cp $ptdir/obfs4proxy external/pluto/bin/armeabi-v7a/
    40 
    -    cp $ptdir/obfs4proxy external/pluto/bin/armeabi/
    39 
    +    cp $ptdir/lyrebird external/pluto/bin/armeabi-v7a/obfs4proxy
    40 
    +    cp $ptdir/lyrebird external/pluto/bin/armeabi/obfs4proxy
    41 41 
         cp $ptdir/snowflake-client external/pluto/bin/armeabi-v7a/
    42 42 
         cp $ptdir/snowflake-client external/pluto/bin/armeabi/
    43 43 
         cp $ptdir/conjure-client external/pluto/bin/armeabi-v7a/
    ... ... @@ -45,12 +45,12 @@ patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch
    45 45 
         cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/
    46 46 
         cp $ptdir/webtunnel-client external/pluto/bin/armeabi/
    47 47 
       [% ELSIF arch == "aarch64" -%]
    48 
    -    cp $ptdir/obfs4proxy external/pluto/bin/arm64-v8a/
    48 
    +    cp $ptdir/lyrebird external/pluto/bin/arm64-v8a/obfs4proxy
    49 49 
         cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/
    50 50 
         cp $ptdir/conjure-client external/pluto/bin/arm64-v8a/
    51 51 
         cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/
    52 52 
       [% ELSE -%]
    53 
    -    cp $ptdir/obfs4proxy external/pluto/bin/[% arch %]/
    53 
    +    cp $ptdir/lyrebird external/pluto/bin/[% arch %]/obfs4proxy
    54 54 
         cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/
    55 55 
         cp $ptdir/conjure-client external/pluto/bin/[% arch %]/
    56 56 
         cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits