Unverified Commit 50193b4a authored by boklm's avatar boklm
Browse files

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.
parent 66a0ab02

keyring/obfs4.gpg→keyring/yawning.gpg

+17.2 KiB (57.6 KiB)

File changed and moved.

No diff preview for this file type.

View original file
View changed file

projects/gocompress/config

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# 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

projects/goutls/config

+9 −4
Original line number Diff line number Diff line 
# 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

projects/obfs4/config

+1 −1
Original line number Diff line number Diff line
@@ -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: