net/storj: update Storj programs to version 1.31.2.

Reported by:	portscout

4 files changed, 37 insertions, 27 deletions

diff --git a/net/storj/Makefile b/net/storj/Makefile
index 9e8cad4358e8..93b28c3c63f1 100644
--- a/net/storj/Makefile
+++ b/net/storj/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	storj
-PORTVERSION=	1.30.2
+PORTVERSION=	1.31.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
@@ -16,10 +16,9 @@ USE_GITHUB=	yes
 .include "${.CURDIR}/Makefile.deps"
 
 STORJ_CMDS=	certificates connect-test crashcollect identity inspector \
-		metabase-createdat-migration metabase-verify \
-		metainfo-loop-benchmark metric-receiver \
+		metabase-verify metainfo-loop-benchmark metric-receiver \
 		multinode satellite storagenode storagenode-updater \
-		storj-admin storj-sim uplink versioncontrol
+		storj-admin storj-sim uplink uplinkng versioncontrol
 
 GO_TARGET=	${STORJ_CMDS:S,^,./cmd/,}
 
diff --git a/net/storj/Makefile.deps b/net/storj/Makefile.deps
index ee2dc304c98e..829b90c2f3cc 100644
--- a/net/storj/Makefile.deps
+++ b/net/storj/Makefile.deps
@@ -20,7 +20,7 @@ GH_TUPLE=	\
 		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-ini:ini:v1.62.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-redis:redis:v8.7.1:go_redis_redis/vendor/github.com/go-redis/redis/v8 \
-		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
+		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_0/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
@@ -72,13 +72,13 @@ GH_TUPLE=	\
 		nsf:termbox-go:38ba6e5628f1:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
 		open-telemetry:opentelemetry-go:v0.18.0:open_telemetry_opentelemetry_go/vendor/go.opentelemetry.io/otel \
 		pelletier:go-toml:v1.9.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		segmentio:analytics-go:v3.1.0:segmentio_analytics_go/vendor/gopkg.in/segmentio/analytics-go.v3 \
 		segmentio:backo-go:23eae7c10bd3:segmentio_backo_go/vendor/github.com/segmentio/backo-go \
 		shopspring:decimal:v1.2.0:shopspring_decimal/vendor/github.com/shopspring/decimal \
-		spacemonkeygo:monkit:v3.0.10:spacemonkeygo_monkit/vendor/github.com/spacemonkeygo/monkit/v3 \
+		spacemonkeygo:monkit:v3.0.12:spacemonkeygo_monkit/vendor/github.com/spacemonkeygo/monkit/v3 \
 		spacemonkeygo:spacelog:2296661a0572:spacemonkeygo_spacelog/vendor/github.com/spacemonkeygo/spacelog \
 		spf13:afero:v1.6.0:spf13_afero/vendor/github.com/spf13/afero \
 		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
@@ -89,20 +89,23 @@ GH_TUPLE=	\
 		storj:common:bcb03a80052f:storj_common/vendor/storj.io/common \
 		storj:drpc:v0.0.20:storj_drpc/vendor/storj.io/drpc \
 		storj:monkit-jaeger:debb1cbcbbd7:storj_monkit_jaeger/vendor/storj.io/monkit-jaeger \
-		storj:private:239fca6e9894:storj_private/vendor/storj.io/private \
-		storj:uplink:cfeb286eeeb9:storj_uplink/vendor/storj.io/uplink \
+		storj:private:421a3648fb1e:storj_private/vendor/storj.io/private \
+		storj:uplink:e2e5889614a9:storj_uplink/vendor/storj.io/uplink \
 		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		stripe:stripe-go:v70.15.0:stripe_stripe_go/vendor/github.com/stripe/stripe-go \
 		subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
-		uber-go:atomic:v1.6.0:uber_go_atomic/vendor/go.uber.org/atomic \
-		uber-go:multierr:v1.5.0:uber_go_multierr/vendor/go.uber.org/multierr \
+		uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \
+		uber-go:multierr:v1.6.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		uber-go:zap:v1.16.0:uber_go_zap/vendor/go.uber.org/zap \
 		vivint:infectious:25a574ae18a3:vivint_infectious/vendor/github.com/vivint/infectious \
 		xtgo:uuid:a0b114877d4c:xtgo_uuid/vendor/github.com/xtgo/uuid \
 		yuin:gopher-lua:ab39c6098bdb:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua \
 		zeebo:admission:v3.0.2:zeebo_admission/vendor/github.com/zeebo/admission/v3 \
 		zeebo:assert:v1.3.0:zeebo_assert/vendor/github.com/zeebo/assert \
+		zeebo:clingy:0504f579bda1:zeebo_clingy/vendor/github.com/zeebo/clingy \
 		zeebo:errs:v1.2.2:zeebo_errs/vendor/github.com/zeebo/errs \
+		zeebo:errs:v2.0.3:zeebo_errs_v2/vendor/github.com/zeebo/errs/v2 \
 		zeebo:float16:v0.1.0:zeebo_float16/vendor/github.com/zeebo/float16 \
 		zeebo:incenc:0d92902eec54:zeebo_incenc/vendor/github.com/zeebo/incenc \
+		zeebo:ini:86af75b4f524:zeebo_ini/vendor/github.com/zeebo/ini \
 		zeebo:structs:v1.0.2:zeebo_structs/vendor/github.com/zeebo/structs
diff --git a/net/storj/distinfo b/net/storj/distinfo
index 7caf4a6fe58d..6f34762d30fa 100644
--- a/net/storj/distinfo
+++ b/net/storj/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1621503216
-SHA256 (storj-storj-v1.30.2_GH0.tar.gz) = e26d9bbea734245bf63171224b30661c864bafc699cf93ffb268bac25cd74ab5
-SIZE (storj-storj-v1.30.2_GH0.tar.gz) = 6203817
+TIMESTAMP = 1622482713
+SHA256 (storj-storj-v1.31.2_GH0.tar.gz) = 6b7522079ef3b60d9f28493d611aa016ab88e589a3157e99ebd11d026378410a
+SIZE (storj-storj-v1.31.2_GH0.tar.gz) = 6127133
 SHA256 (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 3b2d62412b7ba2726a379cc0ae557595c027dc8206d0ef98f13831281b8f2b85
 SIZE (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 6042
 SHA256 (alessio-shellescape-v1.2.2_GH0.tar.gz) = f3cc6a97a0f91a5be58bbf0ab3fa9bcd049a61789944f9e3f0c353cb9e851103
@@ -41,6 +41,8 @@ SHA256 (go-ini-ini-v1.62.0_GH0.tar.gz) = 926ca2ff49018dc5c0991f3a790bc2083a3c52c
 SIZE (go-ini-ini-v1.62.0_GH0.tar.gz) = 50314
 SHA256 (go-redis-redis-v8.7.1_GH0.tar.gz) = a3fc63767c14b86b4e55856bc55a2376186847bc162835d90d77d539ed2d79a0
 SIZE (go-redis-redis-v8.7.1_GH0.tar.gz) = 132591
+SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
+SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
 SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34
@@ -143,8 +145,8 @@ SHA256 (open-telemetry-opentelemetry-go-v0.18.0_GH0.tar.gz) = 8243379f76c3d28a5e
 SIZE (open-telemetry-opentelemetry-go-v0.18.0_GH0.tar.gz) = 602628
 SHA256 (pelletier-go-toml-v1.9.0_GH0.tar.gz) = 037326a9c972cfbcf257e1d1f97a7ade6075cbb7f1e91a59a9a6cf45ebc811ef
 SIZE (pelletier-go-toml-v1.9.0_GH0.tar.gz) = 100816
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = c1c04d6e36c0d0fb6f3374197f9025d7e6df13f38a974098be020617c00fbaf2
@@ -155,8 +157,8 @@ SHA256 (segmentio-backo-go-23eae7c10bd3_GH0.tar.gz) = e11d38f68223e9ec5fc4224543
 SIZE (segmentio-backo-go-23eae7c10bd3_GH0.tar.gz) = 2963
 SHA256 (shopspring-decimal-v1.2.0_GH0.tar.gz) = 59fa76645f63d7383d3f306fe2f7136d923e2aa514d9a9353938d9654b842f58
 SIZE (shopspring-decimal-v1.2.0_GH0.tar.gz) = 37755
-SHA256 (spacemonkeygo-monkit-v3.0.10_GH0.tar.gz) = 2fc19d859d5b05b3af5b37f91e4dba2f6bd0f2f979033f1fb798e97fa80f2b9d
-SIZE (spacemonkeygo-monkit-v3.0.10_GH0.tar.gz) = 348850
+SHA256 (spacemonkeygo-monkit-v3.0.12_GH0.tar.gz) = 40f28d77016b7c4b764bf48880b73a101eec514e46afddec86f7be1327990fac
+SIZE (spacemonkeygo-monkit-v3.0.12_GH0.tar.gz) = 349892
 SHA256 (spacemonkeygo-spacelog-2296661a0572_GH0.tar.gz) = 0c29780eb883b7c42a882d2b9c087b203fc75e661d85cba2c2b0416ddd16a962
 SIZE (spacemonkeygo-spacelog-2296661a0572_GH0.tar.gz) = 16360
 SHA256 (spf13-afero-v1.6.0_GH0.tar.gz) = d1942de010ac7932bd21618aaf478b4f1413980449c061032f18beac7805d068
@@ -177,20 +179,20 @@ SHA256 (storj-drpc-v0.0.20_GH0.tar.gz) = 2cfac8ab71e80f2b0f8601af353d465cbe4b649
 SIZE (storj-drpc-v0.0.20_GH0.tar.gz) = 215777
 SHA256 (storj-monkit-jaeger-debb1cbcbbd7_GH0.tar.gz) = 1aeffa912917c6ce61e270c0ada6b1b1cae1ce9f01a63066b964673d36bac442
 SIZE (storj-monkit-jaeger-debb1cbcbbd7_GH0.tar.gz) = 34905
-SHA256 (storj-private-239fca6e9894_GH0.tar.gz) = 827322daf98dced21c19100e722e58c80905e846e2010e6d3fdbe6ecd334d446
-SIZE (storj-private-239fca6e9894_GH0.tar.gz) = 96341
-SHA256 (storj-uplink-cfeb286eeeb9_GH0.tar.gz) = c5d04ea09569412f8763455ecf76b0bb776661e4ba6e7d85ba5a9225e0a79ce8
-SIZE (storj-uplink-cfeb286eeeb9_GH0.tar.gz) = 141901
+SHA256 (storj-private-421a3648fb1e_GH0.tar.gz) = edf49167c8d68844bbf854f940bd950eea36c82b9f019414733a0d1e359625ff
+SIZE (storj-private-421a3648fb1e_GH0.tar.gz) = 97457
+SHA256 (storj-uplink-e2e5889614a9_GH0.tar.gz) = a12857c60caad5119b30d6950c9281e739b14d80283012b47835e4676831da93
+SIZE (storj-uplink-e2e5889614a9_GH0.tar.gz) = 141165
 SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
 SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
 SHA256 (stripe-stripe-go-v70.15.0_GH0.tar.gz) = 4299f1d9273fda95dfc51b640c04db973ba0a6e5768fe2ddb59abf7de24e17ed
 SIZE (stripe-stripe-go-v70.15.0_GH0.tar.gz) = 213133
 SHA256 (subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
 SIZE (subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359
-SHA256 (uber-go-atomic-v1.6.0_GH0.tar.gz) = 34abb632809f28d4106660d0211dfa624968c4d021717a2e16e1c6bf2606f34a
-SIZE (uber-go-atomic-v1.6.0_GH0.tar.gz) = 9678
-SHA256 (uber-go-multierr-v1.5.0_GH0.tar.gz) = 15fdd69d5f35e1c5c472d02b58fe3e229795d930398f9017c6c43a108504eaf1
-SIZE (uber-go-multierr-v1.5.0_GH0.tar.gz) = 12336
+SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1
+SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566
+SHA256 (uber-go-multierr-v1.6.0_GH0.tar.gz) = f8a139a06fd70bbda0f089274bd723a00c33c5b269a696de4d6a8ab455a22717
+SIZE (uber-go-multierr-v1.6.0_GH0.tar.gz) = 12369
 SHA256 (uber-go-zap-v1.16.0_GH0.tar.gz) = 098ceed0ab0aea975c1b816f222ac815b3c6a60940329f914709c47a4edda4f7
 SIZE (uber-go-zap-v1.16.0_GH0.tar.gz) = 131768
 SHA256 (vivint-infectious-25a574ae18a3_GH0.tar.gz) = 02f3b5efe0f8ad252ec2e39a3ebaa3da174fb96231a95a7a141957c4a042fe8a
@@ -203,11 +205,17 @@ SHA256 (zeebo-admission-v3.0.2_GH0.tar.gz) = a4b216b3a99f4fd9be215e46ca8d3994af9
 SIZE (zeebo-admission-v3.0.2_GH0.tar.gz) = 13658
 SHA256 (zeebo-assert-v1.3.0_GH0.tar.gz) = 1303ac1ea10293220665871e16c4f065467fc3f21787969b3d6ee143d5cac3f7
 SIZE (zeebo-assert-v1.3.0_GH0.tar.gz) = 5015
+SHA256 (zeebo-clingy-0504f579bda1_GH0.tar.gz) = 1da561bc1c80ca5519a508d590eb0625f931186bcf0934a62387fa3d6eb2bf56
+SIZE (zeebo-clingy-0504f579bda1_GH0.tar.gz) = 11986
 SHA256 (zeebo-errs-v1.2.2_GH0.tar.gz) = 81b47643bb76fab8ab2ffabbde6113c9af01d9a5c0fb9a89800353c75a56e355
 SIZE (zeebo-errs-v1.2.2_GH0.tar.gz) = 8607
+SHA256 (zeebo-errs-v2.0.3_GH0.tar.gz) = ce138e0b5ff8e9cd20ad832f4f5cef9c3e5fa8f84d29d203f1a72fcd5c93552e
+SIZE (zeebo-errs-v2.0.3_GH0.tar.gz) = 8169
 SHA256 (zeebo-float16-v0.1.0_GH0.tar.gz) = 7a787c1f87707d8ed52ba25773fb9c1b2d48637ce1ffd9715bf340866b13eed9
 SIZE (zeebo-float16-v0.1.0_GH0.tar.gz) = 7101
 SHA256 (zeebo-incenc-0d92902eec54_GH0.tar.gz) = 68a7226ef954df3093fbc6b09050cf326bd9e9fa38fea285633286132a5492ab
 SIZE (zeebo-incenc-0d92902eec54_GH0.tar.gz) = 8075
+SHA256 (zeebo-ini-86af75b4f524_GH0.tar.gz) = af5364ce6994a729e17c05faa7056e775cfb8819afec795d3f7573d06b2a687b
+SIZE (zeebo-ini-86af75b4f524_GH0.tar.gz) = 2642
 SHA256 (zeebo-structs-v1.0.2_GH0.tar.gz) = 177b9825340a290e4947cab64435bad0053c7daec4a0eb3672afc3c8fcebe81f
 SIZE (zeebo-structs-v1.0.2_GH0.tar.gz) = 7653
diff --git a/net/storj/pkg-plist b/net/storj/pkg-plist
index e0a80f462e8f..f2bb76fade3d 100644
--- a/net/storj/pkg-plist
+++ b/net/storj/pkg-plist
@@ -2,7 +2,6 @@ bin/certificates
 bin/connect-test
 bin/crashcollect
 bin/inspector
-bin/metabase-createdat-migration
 bin/metabase-verify
 bin/metainfo-loop-benchmark
 bin/metric-receiver
@@ -14,4 +13,5 @@ bin/storj-admin
 bin/storj-identity
 bin/storj-sim
 bin/uplink
+bin/uplinkng
 bin/versioncontrol