2 files changed, 16 insertions, 10 deletions

diff --git a/net-p2p/go-ethereum/Makefile b/net-p2p/go-ethereum/Makefile
index bf8eae83d080..c0391d0d7739 100644
--- a/net-p2p/go-ethereum/Makefile
+++ b/net-p2p/go-ethereum/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	go-ethereum
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.10.6
+DISTVERSION=	1.10.7
 CATEGORIES=	net-p2p
 
 MAINTAINER=	me@enriquefynn.com
@@ -58,7 +58,7 @@ GH_TUPLE=	\
 		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:ac73e9fd8988:golang_sys/vendor/golang.org/x/sys \
 		golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term \
-		golang:text:v0.3.4:golang_text/vendor/golang.org/x/text \
+		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
 		golang:time:7e3f01d25324:golang_time/vendor/golang.org/x/time \
 		google:gofuzz:c04b05f3adfa:google_gofuzz/vendor/github.com/google/gofuzz \
 		google:uuid:v1.1.5:google_uuid/vendor/github.com/google/uuid \
@@ -68,7 +68,7 @@ GH_TUPLE=	\
 		hashicorp:golang-lru:80c98217689d:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		holiman:bloomfilter:v2.0.3:holiman_bloomfilter_v2/vendor/github.com/holiman/bloomfilter \
 		holiman:uint256:v1.2.0:holiman_uint256/vendor/github.com/holiman/uint256 \
-		huin:goupnp:33cdcbb30dda:huin_goupnp/vendor/github.com/huin/goupnp \
+		huin:goupnp:v1.0.2:huin_goupnp/vendor/github.com/huin/goupnp \
 		influxdata:influxdb:v1.8.3:influxdata_influxdb/vendor/github.com/influxdata/influxdb \
 		jackpal:go-nat-pmp:1fa385a6f458:jackpal_go_nat_pmp/vendor/github.com/jackpal/go-nat-pmp \
 		jedisct1:go-minisign:45766022959e:jedisct1_go_minisign/vendor/github.com/jedisct1/go-minisign \
@@ -102,6 +102,12 @@ GH_TUPLE=	\
 		tyler-smith:go-bip39:dbb3b84ba2ef:tyler_smith_go_bip39/vendor/github.com/tyler-smith/go-bip39 \
 		urfave:cli:v1.20.0:urfave_cli/vendor/gopkg.in/urfave/cli.v1
 
+post-extract:
+	@${RM} -r ${WRKSRC}/vendor/github.com/aws/aws-sdk-go-v2/config
+	@${RLN} ${WRKSRC_aws_aws_sdk_go_v2_config}/config ${WRKSRC}/vendor/github.com/aws/aws-sdk-go-v2/config
+	@${RM} -r ${WRKSRC}/vendor/github.com/aws/aws-sdk-go-v2/credentials
+	@${RLN} ${WRKSRC_aws_aws_sdk_go_v2_credentials}/credentials ${WRKSRC}/vendor/github.com/aws/aws-sdk-go-v2/credentials
+
 TMPDIR=	${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/go-ethereum/distinfo b/net-p2p/go-ethereum/distinfo
index c54be43a6e0d..133f01a8aded 100644
--- a/net-p2p/go-ethereum/distinfo
+++ b/net-p2p/go-ethereum/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1628171556
-SHA256 (ethereum-go-ethereum-v1.10.6_GH0.tar.gz) = 3724f09a5c34ff5f71a37bac7b52faaa04457bab46a005f8f2fa6ce68ba5f632
-SIZE (ethereum-go-ethereum-v1.10.6_GH0.tar.gz) = 13234889
+TIMESTAMP = 1628936271
+SHA256 (ethereum-go-ethereum-v1.10.7_GH0.tar.gz) = 5bfe24930e2837106994d2fd9164cde8ab1ad9159a97bfcf0e466a963653e0b7
+SIZE (ethereum-go-ethereum-v1.10.7_GH0.tar.gz) = 13241412
 SHA256 (Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f
 SIZE (Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443
 SHA256 (Azure-azure-storage-blob-go-v0.7.0_GH0.tar.gz) = 9efe2f2a788d0d00318d7fa4138cd973ac4c72fece82656aa67cbb501288bd93
@@ -67,8 +67,8 @@ SHA256 (golang-sys-ac73e9fd8988_GH0.tar.gz) = 5566fd54f50981fc38d2bea63005ea73ef
 SIZE (golang-sys-ac73e9fd8988_GH0.tar.gz) = 1219356
 SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da
 SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239
-SHA256 (golang-text-v0.3.4_GH0.tar.gz) = 39eabfef83413361eafd4353ee9d9821707853235f2e55f3d5b1d38ce698fe89
-SIZE (golang-text-v0.3.4_GH0.tar.gz) = 8354508
+SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
+SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
 SHA256 (golang-time-7e3f01d25324_GH0.tar.gz) = fff412c562ecaba2b8e09922a6ca32f658fdd2242ae99c18bd75f9cb7427a206
 SIZE (golang-time-7e3f01d25324_GH0.tar.gz) = 9650
 SHA256 (google-gofuzz-c04b05f3adfa_GH0.tar.gz) = f4dde33996ab6e9b22a8b145a572996256e453483f5cb440c4309c1f2513f14a
@@ -87,8 +87,8 @@ SHA256 (holiman-bloomfilter-v2.0.3_GH0.tar.gz) = 9a7b272d46153501eedb7ab5f2744d1
 SIZE (holiman-bloomfilter-v2.0.3_GH0.tar.gz) = 11940
 SHA256 (holiman-uint256-v1.2.0_GH0.tar.gz) = ba1bcfd2bea36db4717de27f9d5e003dcbc211bc84b0515b1e1d58f2232b0a7c
 SIZE (holiman-uint256-v1.2.0_GH0.tar.gz) = 31048
-SHA256 (huin-goupnp-33cdcbb30dda_GH0.tar.gz) = e3787d4dcdc6a5095b8ad12b2fc46101b7e43e26a2f421bd4c66f055f11c0933
-SIZE (huin-goupnp-33cdcbb30dda_GH0.tar.gz) = 60113
+SHA256 (huin-goupnp-v1.0.2_GH0.tar.gz) = 606ab6c188a1c10609b41b72ee779cfeb2b92ea1dae856117e63d35dac4335bb
+SIZE (huin-goupnp-v1.0.2_GH0.tar.gz) = 72655
 SHA256 (influxdata-influxdb-v1.8.3_GH0.tar.gz) = d8b89e324ed7343c1397124ac3cc68c405406faf74e7369e733611cada54656d
 SIZE (influxdata-influxdb-v1.8.3_GH0.tar.gz) = 12071669
 SHA256 (jackpal-go-nat-pmp-1fa385a6f458_GH0.tar.gz) = da7bb9c6e5e54e6ded7ee4697719f9233657246a32fdacdcd89794f319256310