[tor-commits] [builders/tor-browser-build] 01/03: Bug 40629: Bump snowflake version to 9ce1de4eee4e

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch maint-11.5
in repository builders/tor-browser-build.

commit 4b13dbb6a4e195af11a286ae3011bcb1a0ec3844
Author: Cecylia Bocovich <cohosh@xxxxxxxxxxxxxx>
AuthorDate: Fri Sep 30 10:40:53 2022 -0400

    Bug 40629: Bump snowflake version to 9ce1de4eee4e
    
    Requires a new project for the refraction-networking branch of utls.
---
 projects/goxtext/config                      |  3 +++
 projects/{goxtext => refraction-utls}/config | 15 +++++++++------
 projects/snowflake/build                     |  1 +
 projects/snowflake/config                    |  6 ++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/projects/goxtext/config b/projects/goxtext/config
index 9563c87..900f999 100644
--- a/projects/goxtext/config
+++ b/projects/goxtext/config
@@ -11,6 +11,9 @@ build: '[% c("projects/go/var/build_go_lib") %]'
 
 var:
   go_lib: golang.org/x/text
+  go_lib_install:
+    - golang.org/x/text
+    - golang.org/x/text/secure/bidirule
 
 input_files:
   - project: container-image
diff --git a/projects/goxtext/config b/projects/refraction-utls/config
similarity index 50%
copy from projects/goxtext/config
copy to projects/refraction-utls/config
index 9563c87..e6974b4 100644
--- a/projects/goxtext/config
+++ b/projects/refraction-utls/config
@@ -1,18 +1,21 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url: https://github.com/golang/text
-# v0.3.3
-git_hash: 23ae387dee1f90d29a23c0e87ee0b46038fbed0e
+git_url: https://github.com/refraction-networking/utls
+git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-container:
-  use_container: 1
 
 build: '[% c("projects/go/var/build_go_lib") %]'
 
 var:
-  go_lib: golang.org/x/text
+  container:
+    use_container: 1
+  go_lib: github.com/refraction-networking/utls
+  go_lib_deps:
+    - goxcrypto
 
 input_files:
   - project: container-image
   - name: go
     project: go
+  - name: goxcrypto
+    project: goxcrypto
diff --git a/projects/snowflake/build b/projects/snowflake/build
index a7eae3f..1250555 100644
--- a/projects/snowflake/build
+++ b/projects/snowflake/build
@@ -17,6 +17,7 @@ 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') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/smux') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/refraction-utls') %]
 
 mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
diff --git a/projects/snowflake/config b/projects/snowflake/config
index 2a0cf3c..ee73aa7 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: 01ae5b56e8399d29aa18605dc9add913d84dc553
+git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
+git_hash: 9ce1de4eee4e23c918c7c5e96666ff5c6ddc654e
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 container:
@@ -21,6 +21,8 @@ input_files:
     project: kcp-go
   - name: smux
     project: smux
+  - name: refraction-utls
+    project: refraction-utls
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
     enable: '[% c("var/android") %]'

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits