[tbb-commits] [tor-browser-build/master] fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.

[gk at torproject.org]

commit 8cb36805e3f408b9958d3bf75811d87cb54453e2
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Sep 2 21:11:30 2019 +0000

    fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.
---
 projects/goutls/config |  1 -
 projects/goxnet/config |  8 +-------
 projects/obfs4/build   | 25 +++++++------------------
 projects/obfs4/config  |  2 --
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/projects/goutls/config b/projects/goutls/config
index d738305..fa4b5d8 100644
--- a/projects/goutls/config
+++ b/projects/goutls/config
@@ -28,4 +28,3 @@ input_files:
   - name: gobsaes
     project: gobsaes
   - filename: sessionid.patch
-    enable: '[% c("var/nightly") || c("var/alpha") %]'
diff --git a/projects/goxnet/config b/projects/goxnet/config
index 6aa5a0e..ae574c6 100644
--- a/projects/goxnet/config
+++ b/projects/goxnet/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://go.googlesource.com/net
-git_hash: 7dbad50ab5b31073856416cdcfeb2796d682f844
+git_hash: ed066c81e75eba56dd9bd2139ade88125b855585
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
@@ -13,12 +13,6 @@ var:
   go_lib_install:
     - golang.org/x/net/proxy
 
-targets:
-  nightly:
-    # Nightly version of obfs4 requires a more recent version of goxnet
-    # See bug 29193
-    git_hash: ed066c81e75eba56dd9bd2139ade88125b855585
-
 input_files:
   - project: container-image
   - name: go
diff --git a/projects/obfs4/build b/projects/obfs4/build
index 3f650c4..33b0add 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -11,29 +11,18 @@ 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") || c("var/alpha") -%]
-  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 -%]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %]
 
 mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 
-[% IF c("var/nightly") || c("var/alpha") -%]
-  # Remove go.mod and go.sum files until we can build using Go module
-  # versioning (see bug 28325).
-  rm -f go.mod go.sum
-[% END -%]
-# Commit 70d0e90c861be34ce3c5425ef1366a0b2ceb3026 changed the canonical obfs4
-# upstream repo to gitlab.com/yawning/obfs4.git.
-[% IF c("var/nightly") || c("var/alpha") %]
-  mkdir -p "$GOPATH/src/gitlab.com/yawning"
-  ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git"
-[% ELSE %]
-  mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
-  ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git"
-[% END %]
+# Remove go.mod and go.sum files until we can build using Go module
+# versioning (see bug 28325).
+rm -f go.mod go.sum
+mkdir -p "$GOPATH/src/gitlab.com/yawning"
+ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git"
 cd obfs4proxy
 go build -ldflags '-s'
 cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR
diff --git a/projects/obfs4/config b/projects/obfs4/config
index ce57cdc..d9357bb 100644
--- a/projects/obfs4/config
+++ b/projects/obfs4/config
@@ -34,7 +34,5 @@ input_files:
     project: goxnet
   - name: goutls
     project: goutls
-    enable: '[% c("var/nightly") || c("var/alpha") %]'
   - name: goxtext
     project: goxtext
-    enable: '[% c("var/nightly") || c("var/alpha") %]'