[tor-commits] [tor-browser-build/master] Bug 29325: Use Yawning's utls fork

[gk at torproject.org]

commit 50193b4aff592e79b5a45fccb2a1547cef8e2691
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Feb 5 19:54:13 2019 +0100

    Bug 29325: Use Yawning's utls fork
    
    The nightly version of obfs4 now requires Yawning's utls fork, so we
    change projects/goutls to use Yawning's fork.
    
    While doing that we rename keyring/obfs4.gpg to keyring/yawning.gpg, to
    use the same keyring in obfs4 and goutls. And we refresh it to get the
    new subkeys.
---
 keyring/{obfs4.gpg => yawning.gpg} | Bin 41312 -> 58959 bytes
 projects/gocompress/config         |  17 +++++++++++++++++
 projects/goutls/config             |  13 +++++++++----
 projects/obfs4/config              |   2 +-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/keyring/obfs4.gpg b/keyring/yawning.gpg
similarity index 65%
rename from keyring/obfs4.gpg
rename to keyring/yawning.gpg
index f26a4cd..e3384c5 100644
Binary files a/keyring/obfs4.gpg and b/keyring/yawning.gpg differ
diff --git a/projects/gocompress/config b/projects/gocompress/config
new file mode 100644
index 0000000..c675362
--- /dev/null
+++ b/projects/gocompress/config
@@ -0,0 +1,17 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+git_url: https://github.com/dsnet/compress
+git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+
+build: '[% c("projects/go/var/build_go_lib") %]'
+
+var:
+  container:
+    use_container: 1
+  go_lib: github.com/dsnet/compress
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
diff --git a/projects/goutls/config b/projects/goutls/config
index bdd5273..b21dea9 100644
--- a/projects/goutls/config
+++ b/projects/goutls/config
@@ -1,7 +1,9 @@
 # vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/refraction-networking/utls
-git_hash: a89e7e6da482a5a0db02578fc606ace9ccfbea62
+git_url: https://gitlab.com/yawning/utls.git
+version: 0.0.9-2
+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'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
@@ -9,9 +11,10 @@ build: '[% c("projects/go/var/build_go_lib") %]'
 var:
   container:
     use_container: 1
-  go_lib: github.com/refraction-networking/utls
+  go_lib: gitlab.com/yawning/utls.git
   go_lib_deps:
     - goxcrypto
+    - gocompress
 
 input_files:
   - project: container-image
@@ -19,3 +22,5 @@ input_files:
     project: go
   - name: goxcrypto
     project: goxcrypto
+  - name: gocompress
+    project: gocompress
diff --git a/projects/obfs4/config b/projects/obfs4/config
index 2c94f10..32d3435 100644
--- a/projects/obfs4/config
+++ b/projects/obfs4/config
@@ -3,7 +3,7 @@ version: 0.0.7
 git_url: https://git.torproject.org/pluggable-transports/obfs4.git
 git_hash: 'obfs4proxy-[% c("version") %]'
 tag_gpg_id: 1
-gpg_keyring: obfs4.gpg
+gpg_keyring: yawning.gpg
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var: