Bug 40622: Update obfs4proxy 0.0.14

Use our own copy of the repo that includes uTLS support.

projects/gocompress/config → projects/andybalholm-brotli/config

 # vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/dsnet/compress
-git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f
+version: 1.0.4
+git_url:  https://github.com/andybalholm/brotli.git
+git_hash: '1d750214c25205863625bb3eb8190a51b2cef26d'
 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: github.com/dsnet/compress
+  go_lib: github.com/andybalholm/brotli
 
 input_files:
   - project: container-image

projects/goutls/config

-# vim: filetype=yaml sw=2
-git_url: https://gitlab.com/yawning/utls.git
-version: 0.0.12-1
-git_hash: 'v[% c("version") %]'
-tag_gpg_id: 1
-gpg_keyring: yawning.gpg
-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: gitlab.com/yawning/utls.git
-  go_lib_deps:
-    - goxcrypto
-    - gocompress
-    - gobsaes
-
-targets:
-  android:
-    var:
-      build_go_lib_pre: |
-        [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-
-input_files:
-  - project: container-image
-  - name: go
-    project: go
-  - name: goxcrypto
-    project: goxcrypto
-  - name: gocompress
-    project: gocompress
-  - name: gobsaes
-    project: gobsaes
-  - name: '[% c("var/compiler") %]'
-    project: '[% c("var/compiler") %]'
-    enable: '[% c("var/android") %]'

projects/goxcrypto/config

 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://go.googlesource.com/crypto
-git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
+git_hash: c86fa9a7ed909e2f2a8ab8298254fca727aba16a
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1

projects/goxnet/config

 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://go.googlesource.com/net
-git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b
+git_hash: bea034e7d591acfddd606603cf48fae48bbdd340
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1

projects/gobsaes/config → projects/klauspost-compress/config

 # vim: filetype=yaml sw=2
-git_url: https://gitlab.com/yawning/bsaes.git
-version: '[% c("abbrev") %]'
-git_hash: 0a714cd429ec754482b4001e918db30cd2094405
+version: 1.15.9
+git_url:  https://github.com/klauspost/compress.git
+git_hash: '9559b037e79ad673c71f6ef7c732c00949014cd2'
 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: gitlab.com/yawning/bsaes.git
-  go_lib_deps:
-    - goxsys
-
-targets:
-  android:
-    var:
-      build_go_lib_pre: |
-        [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
+  go_lib: github.com/klauspost/compress
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: goxsys
-    project: goxsys
-  - name: '[% c("var/compiler") %]'
-    project: '[% c("var/compiler") %]'
-    enable: '[% c("var/android") %]'

projects/obfs4/build

@@ -17,7 +17,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519-extra') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %]
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/refraction-utls') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %]
 
 mkdir -p /var/tmp/build

projects/obfs4/config

 # vim: filetype=yaml sw=2
-version: 0.0.12
-git_url: https://gitlab.com/yawning/obfs4.git
+version: 0.0.14-tor2
+git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4.git
 git_hash: 'obfs4proxy-[% c("version") %]'
 tag_gpg_id: 1
-gpg_keyring: yawning.gpg
+gpg_keyring: anti-censorship.gpg
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 container:
@@ -11,7 +11,7 @@ container:
 
 targets:
   nightly:
-    git_hash: master
+    git_hash: main
     version: '[% c("abbrev") %]'
     tag_gpg_id: 0
 
@@ -31,8 +31,8 @@ input_files:
     project: goxcrypto
   - name: goxnet
     project: goxnet
-  - name: goutls
-    project: goutls
+  - name: refraction-utls
+    project: refraction-utls
   - name: goxtext
     project: goxtext
   - name: '[% c("var/compiler") %]'

projects/refraction-utls/config

 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/refraction-networking/utls
-git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0
+git_hash: 862fe372d939c53bb10cb4fd11263f3766589892 #v1.1.5
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1
@@ -12,6 +12,9 @@ var:
   go_lib: github.com/refraction-networking/utls
   go_lib_deps:
     - goxcrypto
+    - goxnet
+    - klauspost-compress
+    - andybalholm-brotli
 
 input_files:
   - project: container-image
@@ -19,3 +22,9 @@ input_files:
     project: go
   - name: goxcrypto
     project: goxcrypto
+  - name: goxnet
+    project: goxnet
+  - name: klauspost-compress
+    project: klauspost-compress
+  - name: andybalholm-brotli
+    project: andybalholm-brotli