[tor-commits] [tor-browser-build/master] Bug 29143: fix build of obfs4 in nightly builds

[gk at torproject.org]

commit f27f11201d86b8bb909bad8b4c04f841b5487ddb
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Jan 22 13:31:23 2019 +0100

    Bug 29143: fix build of obfs4 in nightly builds
---
 projects/goptlib/config   |  5 +++++
 projects/goutls/config    | 21 +++++++++++++++++++++
 projects/goxcrypto/config |  8 +++++++-
 projects/goxsys/config    | 19 +++++++++++++++++++
 projects/goxtext/config   | 18 ++++++++++++++++++
 projects/obfs4/build      |  4 ++++
 projects/obfs4/config     |  6 ++++++
 projects/siphash/config   |  2 +-
 8 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/projects/goptlib/config b/projects/goptlib/config
index c083763..2fd51f8 100644
--- a/projects/goptlib/config
+++ b/projects/goptlib/config
@@ -13,6 +13,11 @@ var:
     use_container: 1
   go_lib: git.torproject.org/pluggable-transports/goptlib.git
 
+targets:
+  nightly:
+    version: master
+    tag_gpg_id: 0
+
 input_files:
   - project: container-image
   - name: go
diff --git a/projects/goutls/config b/projects/goutls/config
new file mode 100644
index 0000000..bdd5273
--- /dev/null
+++ b/projects/goutls/config
@@ -0,0 +1,21 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+git_url: https://github.com/refraction-networking/utls
+git_hash: a89e7e6da482a5a0db02578fc606ace9ccfbea62
+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/refraction-networking/utls
+  go_lib_deps:
+    - goxcrypto
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
+  - name: goxcrypto
+    project: goxcrypto
diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config
index b51b578..fe73f93 100644
--- a/projects/goxcrypto/config
+++ b/projects/goxcrypto/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://go.googlesource.com/crypto
-git_hash: 4ed45ec682102c643324fae5dff8dab085b6c300
+git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
@@ -11,9 +11,13 @@ var:
     use_container: 1
   go_lib: golang.org/x/crypto
   go_lib_install:
+    - golang.org/x/crypto/chacha20poly1305
+    - golang.org/x/crypto/cryptobyte
     - golang.org/x/crypto/curve25519
     - golang.org/x/crypto/hkdf
     - golang.org/x/crypto/nacl/secretbox
+  go_lib_deps:
+    - goxsys
 
 targets:
   nightly:
@@ -23,3 +27,5 @@ input_files:
   - project: container-image
   - name: go
     project: go
+  - name: goxsys
+    project: goxsys
diff --git a/projects/goxsys/config b/projects/goxsys/config
new file mode 100644
index 0000000..64a7213
--- /dev/null
+++ b/projects/goxsys/config
@@ -0,0 +1,19 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+git_url: https://github.com/golang/sys
+git_hash: 11f53e03133963fb11ae0588e08b5e0b85be8be5
+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: golang.org/x/sys
+  go_lib_install:
+    - golang.org/x/sys/cpu
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
diff --git a/projects/goxtext/config b/projects/goxtext/config
new file mode 100644
index 0000000..fba619f
--- /dev/null
+++ b/projects/goxtext/config
@@ -0,0 +1,18 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+git_url: https://github.com/golang/text
+# v0.3.0
+git_hash: f21a4dfb5e38f5895301dc265a8def02365cc3d0
+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: golang.org/x/text
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
diff --git a/projects/obfs4/build b/projects/obfs4/build
index 4e42b23..dedd1ef 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -11,6 +11,10 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %]
+[% IF c("var/nightly") -%]
+  tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %]
+  tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %]
+[% END -%]
 
 mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
diff --git a/projects/obfs4/config b/projects/obfs4/config
index 2bae851..2c94f10 100644
--- a/projects/obfs4/config
+++ b/projects/obfs4/config
@@ -32,3 +32,9 @@ input_files:
     project: goxcrypto
   - name: goxnet
     project: goxnet
+  - name: goutls
+    project: goutls
+    enable: '[% c("var/nightly") %]'
+  - name: goxtext
+    project: goxtext
+    enable: '[% c("var/nightly") %]'
diff --git a/projects/siphash/config b/projects/siphash/config
index b2cb2a9..7e40bc7 100644
--- a/projects/siphash/config
+++ b/projects/siphash/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/dchest/siphash.git
-git_hash: 42ba037e748c9062a75e0924705c43b893edefcd
+git_hash: 34f201214d993633bb24f418ba11736ab8b55aa7
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'