Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

9 changed files:

Changes:

  • projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
    ... ... @@ -3,3 +3,6 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser
    3 3
    4 4 
     ## snowflake configuration
    5 5 
     ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client
    6 
    +
    7 
    +## webtunnel configuration
    8 
    +ClientTransportPlugin webtunnel exec ./TorBrowser/Tor/PluggableTransports/webtunnel-client

  • projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
    ... ... @@ -3,3 +3,6 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTra
    3 3
    4 4 
     ## snowflake configuration
    5 5 
     ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client
    6 
    +
    7 
    +## webtunnel configuration
    8 
    +ClientTransportPlugin webtunnel exec PluggableTransports/webtunnel-client

  • projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
    ... ... @@ -3,3 +3,6 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\T
    3 3
    4 4 
     ## snowflake configuration
    5 5 
     ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe
    6 
    +
    7 
    +## webtunnel configuration
    8 
    +ClientTransportPlugin webtunnel exec TorBrowser\Tor\PluggableTransports\webtunnel-client.exe

  • projects/browser/build
    ... ... @@ -88,9 +88,13 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
    88 88 
         rm -f aarch64/tor/pluggable_transports/bridges_list.*.txt
    89 89 
       [% END -%]
    90 90
    91 
    -  # Snowflake's README is the only documentation shipped in tor-expert-bundle
    91 
    +  # Snowflake's README is a documentation shipped in tor-expert-bundle
    92 92 
       mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
    93 93 
       mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
    94 
    +
    95 
    +  # WebTunnel's README is a documentation shipped in tor-expert-bundle
    96 
    +  mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]
    97 
    +  mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md"
    94 98
    95 99 
       # Move the PTs to where TB expects them
    96 100 
       mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %]

  • projects/go/config
    ... ... @@ -26,7 +26,7 @@ var:
    26 26 
           export CGO_LDFLAGS_ALLOW="-z|noexecstack"
    27 27 
           export CGO_LDFLAGS="-z noexecstack"
    28 28 
         [% END -%]
    29 
    -    [% IF c("var/linux-i686") -%]
    29 
    +    [% IF c("var/cgo") -%]
    30 30 
           export CGO_ENABLED=1
    31 31 
         [% END -%]
    32 32 
         export GOTMPDIR=/var/tmp/build/go-tmp

  • projects/tor-expert-bundle/build
    ... ... @@ -11,6 +11,7 @@ mkdir pluggable_transports && cd pluggable_transports
    11 11
    12 12 
     tar -xkf $rootdir/[% c('input_files_by_name/obfs4') %]
    13 13 
     tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
    14 
    +tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]
    14 15
    15 16 
     # copy in bridge lines for each pluggable transport
    16 17 
     mv $rootdir/bridges_list.obfs4.txt .

  • projects/tor-expert-bundle/config
    ... ... @@ -13,6 +13,8 @@ input_files:
    13 13 
         project: obfs4
    14 14 
       - name: snowflake
    15 15 
         project: snowflake
    16 
    +  - project: webtunnel
    17 
    +    name: webtunnel
    16 18 
       - filename: bridges_list.obfs4.txt
    17 19 
       - filename: bridges_list.meek-azure.txt
    18 
    -  - filename: bridges_list.snowflake.txt
    20 
    +  - filename: bridges_list.snowflake.txt
    \ No newline at end of file

  • projects/webtunnel/build
    1 
    +#!/bin/bash
    2 
    +[% c("var/set_default_env") -%]
    3 
    +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]
    4 
    +distdir=/var/tmp/dist/[% project %]
    5 
    +mkdir -p $distdir
    6 
    +
    7 
    +[% IF c("var/android") -%]
    8 
    +  [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
    9 
    +  # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build
    10 
    +  # breaks otherwise.
    11 
    +  export CGO_ENABLED=1
    12 
    +[% END -%]
    13 
    +
    14 
    +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %]
    15 
    +
    16 
    +mkdir -p /var/tmp/build
    17 
    +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
    18 
    +cd /var/tmp/build/[% project %]-[% c('version') %]
    19 
    +
    20 
    +mkdir -p "$GOPATH/src/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel.git"
    21 
    +ln -sf "$PWD" "$GOPATH/src/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel"
    22 
    +
    23 
    +cd main/client
    24 
    +go build -ldflags '-s'
    25 
    +cp -a client[% IF c("var/windows") %].exe[% END %] $distdir/webtunnel-client[% IF c("var/windows") %].exe[% END %]
    26 
    +
    27 
    +cd /var/tmp/build/[% project %]-[% c('version') %]
    28 
    +cp -a README.md $distdir/README.WEBTUNNEL.md
    29 
    +
    30 
    +cd $distdir
    31 
    +[% c('tar', {
    32 
    +        tar_src => [ '.' ],
    33 
    +        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
    34 
    +    }) %]

  • projects/webtunnel/config
    1 
    +# vim: filetype=yaml sw=2
    2 
    +version: '[% c("abbrev") %]'
    3 
    +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel.git
    4 
    +git_hash: 2ecf64381bad8a5db45c5871dcad7d12831dca69
    5 
    +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
    6 
    +container:
    7 
    +  use_container: 1
    8 
    +
    9 
    +input_files:
    10 
    +  - project: container-image
    11 
    +  - name: go
    12 
    +    project: go
    13 
    +  - name: goptlib
    14 
    +    project: goptlib
    15 
    +  - name: '[% c("var/compiler") %]'
    16 
    +    project: '[% c("var/compiler") %]'
    17 
    +    enable: '[% c("var/android") %]'

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