commit edeef6515aadcae310b61c218ea2c9851cbaef67 Author: David Fifield david@bamsoftware.com Date: Tue Jul 27 20:06:46 2021 +0000

Remove uniuri project.

This is not used by snowflake since https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowf...

It was also a dependency in the obfs4 project, but obfs4 doesn't use it. --- projects/obfs4/build | 1 - projects/obfs4/config | 2 -- projects/snowflake/build | 1 - projects/snowflake/config | 2 -- projects/uniuri/config | 17 ----------------- 5 files changed, 23 deletions(-)

diff --git a/projects/obfs4/build b/projects/obfs4/build index 47c7228..b57b0c5 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -15,7 +15,6 @@ mkdir -p $PTDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %] 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') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] diff --git a/projects/obfs4/config b/projects/obfs4/config index 8273bd5..eec61bb 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -26,8 +26,6 @@ input_files: project: ed25519 - name: siphash project: siphash - - name: uniuri - project: uniuri - name: goxcrypto project: goxcrypto - name: goxnet diff --git a/projects/snowflake/build b/projects/snowflake/build index a72caba..4c99675 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -12,7 +12,6 @@ mkdir -p $PTDIR $DOCSDIR export CGO_ENABLED=1 [% END -%]

-tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %] diff --git a/projects/snowflake/config b/projects/snowflake/config index 6022b2c..27c43d9 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -12,8 +12,6 @@ input_files: - project: container-image - name: go project: go - - name: uniuri - project: uniuri - name: goptlib project: goptlib - name: pion-webrtc diff --git a/projects/uniuri/config b/projects/uniuri/config deleted file mode 100644 index 5eea6e2..0000000 --- a/projects/uniuri/config +++ /dev/null @@ -1,17 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dchest/uniuri -git_hash: 8902c56451e9b58ff940bbe5fec35d5f9c04584a -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/dchest/uniuri - -input_files: - - project: container-image - - name: go - project: go