net/ooni-mini: update 0.18.0 to 0.23.0

  * https://github.com/ooni/probe-engine/releases/tag/v0.23.0

Sponsored by: TorBSD Diversity Project (TDP)
Sponsored by: The Tor Project

1 files changed, 28 insertions, 65 deletions

diff --git a/net/ooni-mini/Makefile b/net/ooni-mini/Makefile
index f403704dce40..e53764b1f608 100644
--- a/net/ooni-mini/Makefile
+++ b/net/ooni-mini/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		ooni-mini
 DISTVERSIONPREFIX=	v
-DISTVERSION=		0.18.0
+DISTVERSION=		0.23.0
 CATEGORIES=		net www benchmarks
 
 MAINTAINER=	egypcio@FreeBSD.org
@@ -22,83 +22,46 @@ GO_BUILDFLAGS=	-tags=ooni,nomk,DISABLE_QUIC -ldflags '-s -w -extldflags "-static
 GO_TARGET=	./cmd/miniooni
 GH_ACCOUNT=	ooni
 GH_PROJECT=	probe-engine
-GH_TUPLE=	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
-		Psiphon-Inc:rotate-safe-writer:b276127301a9:psiphon_inc_rotate_safe_writer/vendor/github.com/Psiphon-Inc/rotate-safe-writer \
-		Psiphon-Labs:bolt:23cedaef7ad7:psiphon_labs_bolt/vendor/github.com/Psiphon-Labs/bolt \
-		Psiphon-Labs:chacha20:899a4be52863:psiphon_labs_chacha20/vendor/github.com/Psiphon-Labs/chacha20 \
-		Psiphon-Labs:goarista:d002785f4c67:psiphon_labs_goarista/vendor/github.com/Psiphon-Labs/goarista \
-		Psiphon-Labs:goptlib:c0e32a7a3464:psiphon_labs_goptlib/vendor/github.com/Psiphon-Labs/goptlib \
-		Psiphon-Labs:net:f5d60dada742:psiphon_labs_net/vendor/github.com/Psiphon-Labs/net \
-		Psiphon-Labs:psiphon-tunnel-core:3a44f293ada3:psiphon_labs_psiphon_tunnel_core/vendor/github.com/Psiphon-Labs/psiphon-tunnel-core \
-		Psiphon-Labs:quic-go:474e74c89fab:psiphon_labs_quic_go/vendor/github.com/Psiphon-Labs/quic-go \
-		Psiphon-Labs:tls-tris:7d791789810f:psiphon_labs_tls_tris/vendor/github.com/Psiphon-Labs/tls-tris \
-		agl:ed25519:5312a6153412:agl_ed25519/vendor/github.com/agl/ed25519 \
-		apex:log:v1.9.0:apex_log/vendor/github.com/apex/log \
-		aristanetworks:goarista:4cb0e71f3c0e:aristanetworks_goarista/vendor/github.com/aristanetworks/goarista \
-		armon:go-proxyproto:5b7edb60ff5f:armon_go_proxyproto/vendor/github.com/armon/go-proxyproto \
-		armon:go-socks5:e75332964ef5:armon_go_socks5/vendor/github.com/armon/go-socks5 \
-		bifurcation:mint:198357931e61:bifurcation_mint/vendor/github.com/bifurcation/mint \
+GH_TUPLE=	apex:log:v1.9.0:apex_log/vendor/github.com/apex/log \
 		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
-		cognusion:go-cache-lru:f73e2280ecea:cognusion_go_cache_lru/vendor/github.com/cognusion/go-cache-lru \
 		creack:goselect:v0.1.1:creack_goselect/vendor/github.com/creack/goselect \
 		cretz:bine:v0.1.0:cretz_bine/vendor/github.com/cretz/bine \
-		dchest:siphash:v1.2.1:dchest_siphash/vendor/github.com/dchest/siphash \
-		deckarep:golang-set:1d4478f51bed:deckarep_golang_set/vendor/github.com/deckarep/golang-set \
-		dgraph-io:badger:3a87f6d9c273:dgraph_io_badger/vendor/github.com/dgraph-io/badger \
-		dgryski:go-farm:2de33835d102:dgryski_go_farm/vendor/github.com/dgryski/go-farm \
+		dchest:siphash:v1.2.2:dchest_siphash/vendor/github.com/dchest/siphash \
 		dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
-		elazarl:goproxy:0581fc3aee2d:elazarl_goproxy/vendor/github.com/elazarl/goproxy \
-		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
-		florianl:go-nfqueue:a2f196e98ab0:florianl_go_nfqueue/vendor/github.com/florianl/go-nfqueue \
-		gobwas:glob:f00a7392b439:gobwas_glob/vendor/github.com/gobwas/glob \
-		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:5d4f70055728:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.3.3:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:157a740278f4:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
+		golang:crypto:eec23a3978ad:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:5f4716e94777:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:22da62e12c0c:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
 		google:go-cmp:v0.5.2:google_go_cmp/vendor/github.com/google/go-cmp \
-		google:gopacket:df1bbd09a561:google_gopacket/vendor/github.com/google/gopacket \
-		google:gxui:f85e0a97b3a4:google_gxui/vendor/github.com/google/gxui \
-		google:martian:v3.0.0:google_martian_v3/vendor/github.com/google/martian/v3 \
+		google:martian:v3.1.0:google_martian_v3/vendor/github.com/google/martian/v3 \
 		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
-		google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \
+		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
 		gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \
-		grafov:m3u8:6ab8f28ed427:grafov_m3u8/vendor/github.com/grafov/m3u8 \
-		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
-		iancoleman:strcase:v0.1.2:iancoleman_strcase/vendor/github.com/iancoleman/strcase \
-		juju:ratelimit:f60b32039441:juju_ratelimit/vendor/github.com/juju/ratelimit \
-		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
-		marten-seemann:qpack:v0.1.0:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \
-		marten-seemann:qtls:v0.4.1:marten_seemann_qtls/vendor/github.com/marten-seemann/qtls \
-		marusama:semaphore:565ffd8e868a:marusama_semaphore/vendor/github.com/marusama/semaphore \
-		mattn:go-colorable:v0.1.2:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		miekg:dns:v1.1.31:miekg_dns/vendor/github.com/miekg/dns \
-		montanaflynn:stats:v0.6.3:montanaflynn_stats/vendor/github.com/montanaflynn/stats \
+		iancoleman:strcase:v0.1.3:iancoleman_strcase/vendor/github.com/iancoleman/strcase \
+		lucas-clemente:quic-go:v0.19.3:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
+		marten-seemann:qpack:v0.2.1:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \
+		marten-seemann:qtls-go1-15:v0.1.1:marten_seemann_qtls_go1_15/vendor/github.com/marten-seemann/qtls-go1-15 \
+		marten-seemann:qtls:v0.10.0:marten_seemann_qtls/vendor/github.com/marten-seemann/qtls \
+		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		miekg:dns:v1.1.35:miekg_dns/vendor/github.com/miekg/dns \
+		montanaflynn:stats:v0.6.4:montanaflynn_stats/vendor/github.com/montanaflynn/stats \
+		ooni:psiphon:v0.4.0:ooni_psiphon/vendor/github.com/ooni/psiphon \
 		oschwald:geoip2-golang:v1.4.0:oschwald_geoip2_golang/vendor/github.com/oschwald/geoip2-golang \
-		oschwald:maxminddb-golang:v1.6.0:oschwald_maxminddb_golang/vendor/github.com/oschwald/maxminddb-golang \
-		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
+		oschwald:maxminddb-golang:v1.8.0:oschwald_maxminddb_golang/vendor/github.com/oschwald/maxminddb-golang \
 		pborman:getopt:v2.1.0:pborman_getopt_v2/vendor/github.com/pborman/getopt \
 		pion:stun:v0.3.5:pion_stun/vendor/github.com/pion/stun \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
-		redjack:marionette:360dd8f58226:redjack_marionette/vendor/github.com/redjack/marionette \
-		refraction-networking:gotapdance:3a6e1938ad70:refraction_networking_gotapdance/vendor/github.com/refraction-networking/gotapdance \
-		refraction-networking:utls:186025ac7b77:refraction_networking_utls/vendor/github.com/refraction-networking/utls \
-		rogpeppe:go-internal:v1.6.2:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
-		ryanuber:go-glob:256dc444b735:ryanuber_go_glob/vendor/github.com/ryanuber/go-glob \
-		sergeyfrolov:bsbuffer:94e85abb8507:sergeyfrolov_bsbuffer/vendor/github.com/sergeyfrolov/bsbuffer \
-		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		smartystreets:goconvey:v1.6.4:smartystreets_goconvey/vendor/github.com/smartystreets/goconvey \
-		syndtr:gocapability:db04d3cc01c8:syndtr_gocapability/vendor/github.com/syndtr/gocapability \
-		torbsd:goptlib:v1.1.0:torbsd_goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git \
-		uber-go:atomic:ca680462431f:uber_go_atomic/vendor/go.uber.org/atomic \
-		uber-go:multierr:ddea229ff1df:uber_go_multierr/vendor/go.uber.org/multierr \
-		uber-go:zap:67bc79d13d15:uber_go_zap/vendor/go.uber.org/zap \
-		wader:filtertransport:bdd9e61eee78:wader_filtertransport/vendor/github.com/wader/filtertransport \
-		zach-klippenstein:goregen:795b5e3961ea:zach_klippenstein_goregen/vendor/github.com/zach-klippenstein/goregen
+		protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		rogpeppe:go-internal:v1.7.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal
+
+GH_TUPLE+=	marten-seemann:qtls-go1-16:v0.1.3:marten_seemann_qtls_go1_16/vendor/github.com/marten-seemann/qtls-go1-16 \
+		torbsd:goptlib:v1.1.0:torbsd_goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git
 
 GL_TUPLE=	yawning:bsaes:26d1add596b6d800bdeeb3bc3b2c7b316c056b6d:yawning_bsaes/vendor/git.schwanenlied.me/yawning/bsaes.git \
-		yawning:obfs4:2d8f3c8bbfd7a7ca931738a64c2f6e97b7332d9e:yawning_obfs4/vendor/gitlab.com/yawning/obfs4.git \
+		yawning:obfs4:f638c33f6c6f697498150d5f0dfbf26453759262:yawning_obfs4/vendor/gitlab.com/yawning/obfs4.git \
 		yawning:utls:ad258eb64575fd468dbd2f93ef229df5f7fe72b4:yawning_utls/vendor/gitlab.com/yawning/utls.git
 
 PLIST_FILES=	bin/miniooni