security/obfs4proxy-tor: update deps and upstream tags

  - move commit hashes to proper git tags;
  - sync changes removing '.git' suffix from pkg directories;
  - goptlib now follows v1.6.0 release;

2 files changed, 27 insertions, 30 deletions

diff --git a/security/obfs4proxy-tor/Makefile b/security/obfs4proxy-tor/Makefile
index 7b06c7b72d4e..bba2b0d4188b 100644
--- a/security/obfs4proxy-tor/Makefile
+++ b/security/obfs4proxy-tor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	obfs4proxy
 DISTVERSION=	0.0.14
-PORTREVISION=	31
+PORTREVISION=	32
 CATEGORIES=	security net
 PKGNAMESUFFIX=	-tor
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -17,21 +17,20 @@ USES=		cpe go:modules tar:xz
 CPE_VENDOR=	torproject
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	FiloSottile:edwards25519:v1.0.0:filosottile_edwards25519/vendor/filippo.io/edwards25519 \
-		dchest:siphash:v1.2.3:siphash/vendor/github.com/dchest/siphash \
-		dsnet:compress:f66993602bf5:dsnet_compress/vendor/github.com/dsnet/compress \
-		golang:crypto:56aed061732a:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:f15817d10f9b:golang_net/vendor/golang.org/x/net \
-		golang:sys:95e765b1cc43:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.8:golang_text/vendor/golang.org/x/text \
-		torbsd:goptlib:v1.2.0:goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git
+GH_TUPLE=	FiloSottile:edwards25519:v1.2.0:filosottile_edwards25519/vendor/filippo.io/edwards25519 \
+		dchest:siphash:v1.2.3:dchest_siphash/vendor/github.com/dchest/siphash \
+		golang:crypto:v0.14.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:v0.17.0:golang_net/vendor/golang.org/x/net \
+		golang:sys:v0.13.0:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.34.0:golang_text/vendor/golang.org/x/text \
+		torbsd:goptlib:f4bb5dd5725833bd880347b8fbaf60522ed0a710:goptlib/vendor/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	yawning
 GL_PROJECT=	obfs4
-GL_TAGNAME=	336a71d6e4cfd2d33e9c57797828007ad74975e9
+GL_TAGNAME=	c3e2d44b1033e03645cc971565175e56d86a8200
 GL_TUPLE=	yawning:bsaes:0a714cd429ec754482b4001e918db30cd2094405:yawning_bsaes/vendor/gitlab.com/yawning/bsaes.git \
-		yawning:edwards25519-extra:def713fd18e464864613d2b55ef41a21df2c9493:yawning_edwards25519extra/vendor/gitlab.com/yawning/edwards25519-extra.git \
+		yawning:edwards25519-extra:2149dcafc266f66d2487f45b156f6397f9c4760b:yawning_edwards25519extra/vendor/gitlab.com/yawning/edwards25519-extra \
 		yawning:utls:f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca:yawning_utls/vendor/gitlab.com/yawning/utls.git
 
 GO_PKGNAME=	gitlab.com/yawning/obfs4
diff --git a/security/obfs4proxy-tor/distinfo b/security/obfs4proxy-tor/distinfo
index 3cf24013e079..74bf6cacfe15 100644
--- a/security/obfs4proxy-tor/distinfo
+++ b/security/obfs4proxy-tor/distinfo
@@ -1,27 +1,25 @@
-TIMESTAMP = 1665782817
+TIMESTAMP = 1772526725
 SHA256 (obfs4proxy-0.0.14.tar.xz) = 67bfde5097852b9c2cef9cf96a457db3f71adf97aa07b19b4ae5db039415b2f5
 SIZE (obfs4proxy-0.0.14.tar.xz) = 88662
-SHA256 (FiloSottile-edwards25519-v1.0.0_GH0.tar.gz) = 05d9c82855140397e949e13aac20194c5dd17d2c9a3e6887765bf4e7c46e1c39
-SIZE (FiloSottile-edwards25519-v1.0.0_GH0.tar.gz) = 39883
+SHA256 (FiloSottile-edwards25519-v1.2.0_GH0.tar.gz) = f77655cabfb1b5e599f32fc81459540c20743613c687961a173efe4e9f6c917f
+SIZE (FiloSottile-edwards25519-v1.2.0_GH0.tar.gz) = 46969
 SHA256 (dchest-siphash-v1.2.3_GH0.tar.gz) = abc354944874dd761abe22058e792fa6d454fad66bf6aaad84ddd892ababf5af
 SIZE (dchest-siphash-v1.2.3_GH0.tar.gz) = 13579
-SHA256 (dsnet-compress-f66993602bf5_GH0.tar.gz) = 88bb28bce2fba7889ad67f2847cab5fefa52c3a63cb54eed209916ff57bb950a
-SIZE (dsnet-compress-f66993602bf5_GH0.tar.gz) = 9963315
-SHA256 (golang-crypto-56aed061732a_GH0.tar.gz) = ecb9f20a7451ed525c2176c13925f9b148c0729a7ed983dbec734d82a03f5b64
-SIZE (golang-crypto-56aed061732a_GH0.tar.gz) = 1631954
-SHA256 (golang-net-f15817d10f9b_GH0.tar.gz) = 5dfb2ea429802b822d0eab4f1ae0e53ce91eece5c92aab1c91567caff9417657
-SIZE (golang-net-f15817d10f9b_GH0.tar.gz) = 1239755
-SHA256 (golang-sys-95e765b1cc43_GH0.tar.gz) = 0d3bf54690b5a5f9525c6026d773cf81a2c17895d0608e182f4cafa57340e678
-SIZE (golang-sys-95e765b1cc43_GH0.tar.gz) = 1410180
-SHA256 (golang-text-v0.3.8_GH0.tar.gz) = f4f6c558d3b5530adbfc1e6787f82867801f86d9c7afc37f2ca03d630465a388
-SIZE (golang-text-v0.3.8_GH0.tar.gz) = 8358801
-SHA256 (torbsd-goptlib-v1.2.0_GH0.tar.gz) = ddb7add33157fdd60e3358c9a53f0e0db446fc320b4e4ecbbf36af0d96b2deeb
-SIZE (torbsd-goptlib-v1.2.0_GH0.tar.gz) = 29678
-SHA256 (yawning-obfs4-336a71d6e4cfd2d33e9c57797828007ad74975e9_GL0.tar.gz) = 67bfde5097852b9c2cef9cf96a457db3f71adf97aa07b19b4ae5db039415b2f5
-SIZE (yawning-obfs4-336a71d6e4cfd2d33e9c57797828007ad74975e9_GL0.tar.gz) = 88662
+SHA256 (golang-crypto-v0.14.0_GH0.tar.gz) = 0c4a544080fe2e26e8cee929a123a9663cee81db155d1d66ccb0b38b395614b8
+SIZE (golang-crypto-v0.14.0_GH0.tar.gz) = 1797313
+SHA256 (golang-net-v0.17.0_GH0.tar.gz) = 8cbbc0df17599834c9f547d802045b279724a3931f3cdb92c02d141214fd80c4
+SIZE (golang-net-v0.17.0_GH0.tar.gz) = 1456230
+SHA256 (golang-sys-v0.13.0_GH0.tar.gz) = 8877d20a8f1b2533ddef00e65b6b3b9cebbcbffa319ed525df0bc229f583e2b6
+SIZE (golang-sys-v0.13.0_GH0.tar.gz) = 1442250
+SHA256 (golang-text-v0.34.0_GH0.tar.gz) = e80f73101db5eead129a96e99b90163c883ca1317a827c1f15c5da7e099b1df4
+SIZE (golang-text-v0.34.0_GH0.tar.gz) = 6772603
+SHA256 (torbsd-goptlib-f4bb5dd5725833bd880347b8fbaf60522ed0a710_GH0.tar.gz) = d7d149c5661494f4d4533c5a23ecb4a9987b82df7e9073a21c5f8c85fc6b578c
+SIZE (torbsd-goptlib-f4bb5dd5725833bd880347b8fbaf60522ed0a710_GH0.tar.gz) = 30239
+SHA256 (yawning-obfs4-c3e2d44b1033e03645cc971565175e56d86a8200_GL0.tar.gz) = 6a7d9976815f6e27d72b1d6e01083892551849c7c59479c5c586c7b18236c798
+SIZE (yawning-obfs4-c3e2d44b1033e03645cc971565175e56d86a8200_GL0.tar.gz) = 90800
 SHA256 (yawning-bsaes-0a714cd429ec754482b4001e918db30cd2094405_GL0.tar.gz) = 6cf841b466d554afa7a0f8cea516ac0e2c017c045af5315c0fe0331395f49631
 SIZE (yawning-bsaes-0a714cd429ec754482b4001e918db30cd2094405_GL0.tar.gz) = 18759
-SHA256 (yawning-edwards25519-extra-def713fd18e464864613d2b55ef41a21df2c9493_GL0.tar.gz) = 558604384901dd4b306f84974115d0dc1fa3d735bbfa0c98a0c85e5407758a82
-SIZE (yawning-edwards25519-extra-def713fd18e464864613d2b55ef41a21df2c9493_GL0.tar.gz) = 38049
+SHA256 (yawning-edwards25519-extra-2149dcafc266f66d2487f45b156f6397f9c4760b_GL0.tar.gz) = 483e7e4de2c3bab28e4b8a0fc982e7d6de0b21db546c594100a9067c8ba952da
+SIZE (yawning-edwards25519-extra-2149dcafc266f66d2487f45b156f6397f9c4760b_GL0.tar.gz) = 39070
 SHA256 (yawning-utls-f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca_GL0.tar.gz) = 73e937e4f256f6ba730b1d3771e377fbe0761c481e1429fda645f5174dad0d14
 SIZE (yawning-utls-f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca_GL0.tar.gz) = 562805