[tbb-commits] [tor-browser-build/master] Bug 40394: Bump version of Snowflake to 221f1c41

[gk at torproject.org]

commit 3762b410afc30c2e21169a18f8f081c783086ad5
Author: Cecylia Bocovich <cohosh at torproject.org>
Date:   Thu Dec 9 09:34:57 2021 -0500

    Bug 40394: Bump version of Snowflake to 221f1c41
    
    This version bump includes the following features/fixes in the Snowflake
    client:
    - move client messages to the broker into the HTTP body
    - fix some race condition bugs
    - AMP cache rendezvous
    - add the ability to specify Snowflake command-line arguments through SOCKS
    - performance tuning for KCP/smux
---
 projects/goxtext/config   | 4 ++--
 projects/snowflake/build  | 5 +++--
 projects/snowflake/config | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/projects/goxtext/config b/projects/goxtext/config
index fba619f..ddd333c 100644
--- a/projects/goxtext/config
+++ b/projects/goxtext/config
@@ -1,8 +1,8 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/golang/text
-# v0.3.0
-git_hash: f21a4dfb5e38f5895301dc265a8def02365cc3d0
+# v0.3.3
+git_hash: 23ae387dee1f90d29a23c0e87ee0b46038fbed0e
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/snowflake/build b/projects/snowflake/build
index 4c99675..a7eae3f 100644
--- a/projects/snowflake/build
+++ b/projects/snowflake/build
@@ -12,6 +12,7 @@ mkdir -p $PTDIR $DOCSDIR
   export CGO_ENABLED=1
 [% END -%]
 
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %]
 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') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %]
@@ -21,8 +22,8 @@ mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 
-mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
-ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git"
+mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git"
+ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git/v2"
 # Fix gopath location of versioned dependencies
 ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2"
 ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2"
diff --git a/projects/snowflake/config b/projects/snowflake/config
index 27c43d9..0ca299c 100644
--- a/projects/snowflake/config
+++ b/projects/snowflake/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://git.torproject.org/pluggable-transports/snowflake.git
-git_hash: ae7cc478fd345a1e588f8315ec980809c6806372
+git_hash: 221f1c41c9618907a022655d1df4eb6eef02ab0a
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -12,6 +12,8 @@ input_files:
   - project: container-image
   - name: go
     project: go
+  - name: goxtext
+    project: goxtext
   - name: goptlib
     project: goptlib
   - name: pion-webrtc