From owner-dev-commits-ports-main@freebsd.org Sat Jul 3 12:17:47 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C282651853; Sat, 3 Jul 2021 12:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GH9vH2sdJz3FCQ; Sat, 3 Jul 2021 12:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B2EA27585; Sat, 3 Jul 2021 12:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 163CHlpw041832; Sat, 3 Jul 2021 12:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 163CHlS9041831; Sat, 3 Jul 2021 12:17:47 GMT (envelope-from git) Date: Sat, 3 Jul 2021 12:17:47 GMT Message-Id: <202107031217.163CHlS9041831@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 44c178674134 - main - net/storj: the port had been updated (+) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44c178674134286a3b2960dc62499eae0d7eaa29 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2021 12:17:47 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=44c178674134286a3b2960dc62499eae0d7eaa29 commit 44c178674134286a3b2960dc62499eae0d7eaa29 Author: Alexey Dokuchaev AuthorDate: 2021-07-03 12:15:12 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-07-03 12:15:31 +0000 net/storj: the port had been updated (+) - Update Storj programs to version 1.33.1 - Revert one upstream commit which causes the following error during `make gomod-vendor': expected 'package', found "quic-go doesn't build on Go 1.18 yet." Reported by: portscout --- net/storj/Makefile | 5 +++-- net/storj/Makefile.deps | 9 +++++++-- net/storj/distinfo | 24 +++++++++++++++++------- net/storj/files/patch-revert-f1a9b45 | 35 +++++++++++++++++++++++++++++++++++ net/storj/pkg-plist | 1 + 5 files changed, 63 insertions(+), 11 deletions(-) diff --git a/net/storj/Makefile b/net/storj/Makefile index 93b28c3c63f1..2b835fe26169 100644 --- a/net/storj/Makefile +++ b/net/storj/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev PORTNAME= storj -PORTVERSION= 1.31.2 +PORTVERSION= 1.33.1 DISTVERSIONPREFIX= v CATEGORIES= net @@ -16,7 +16,8 @@ USE_GITHUB= yes .include "${.CURDIR}/Makefile.deps" STORJ_CMDS= certificates connect-test crashcollect identity inspector \ - metabase-verify metainfo-loop-benchmark metric-receiver \ + metabase-expireat-migration metabase-verify \ + metainfo-loop-benchmark metric-receiver \ multinode satellite storagenode storagenode-updater \ storj-admin storj-sim uplink uplinkng versioncontrol diff --git a/net/storj/Makefile.deps b/net/storj/Makefile.deps index 829b90c2f3cc..d935500c8fd0 100644 --- a/net/storj/Makefile.deps +++ b/net/storj/Makefile.deps @@ -20,6 +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-rod:rod:v0.100.0:go_rod_rod/vendor/github.com/go-rod/rod \ 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 \ @@ -56,6 +57,7 @@ GH_TUPLE= \ jackc:pgservicefile:2b9c44734f2b:jackc_pgservicefile/vendor/github.com/jackc/pgservicefile \ jackc:pgtype:v1.6.2:jackc_pgtype/vendor/github.com/jackc/pgtype \ jackc:pgx:v4.10.1:jackc_pgx/vendor/github.com/jackc/pgx/v4 \ + jackc:puddle:v1.1.3:jackc_puddle/vendor/github.com/jackc/puddle \ jtolds:monkit-hw:141a0da276b3:jtolds_monkit_hw/vendor/github.com/jtolds/monkit-hw/v2 \ jtolds:tracetagger:v2.0.0-rc5:jtolds_tracetagger/vendor/github.com/jtolds/tracetagger/v2 \ loov:hrtime:v1.0.3:loov_hrtime/vendor/github.com/loov/hrtime \ @@ -78,7 +80,7 @@ GH_TUPLE= \ 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.12:spacemonkeygo_monkit/vendor/github.com/spacemonkeygo/monkit/v3 \ + spacemonkeygo:monkit:v3.0.13: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,7 +91,7 @@ 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:421a3648fb1e:storj_private/vendor/storj.io/private \ + storj:private:f53a5fcf98e0: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 \ @@ -99,6 +101,9 @@ GH_TUPLE= \ 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 \ + ysmood:goob:v0.3.0:ysmood_goob/vendor/github.com/ysmood/goob \ + ysmood:gson:v0.6.4:ysmood_gson/vendor/github.com/ysmood/gson \ + ysmood:leakless:v0.7.0:ysmood_leakless/vendor/github.com/ysmood/leakless \ 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 \ diff --git a/net/storj/distinfo b/net/storj/distinfo index 6f34762d30fa..968bc5fd3a53 100644 --- a/net/storj/distinfo +++ b/net/storj/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1622482713 -SHA256 (storj-storj-v1.31.2_GH0.tar.gz) = 6b7522079ef3b60d9f28493d611aa016ab88e589a3157e99ebd11d026378410a -SIZE (storj-storj-v1.31.2_GH0.tar.gz) = 6127133 +TIMESTAMP = 1624827693 +SHA256 (storj-storj-v1.33.1_GH0.tar.gz) = 24f2c9c8edf46e6f0e1e8ae374ed0a3652027e923c56341c95e1fff7e15fa1cb +SIZE (storj-storj-v1.33.1_GH0.tar.gz) = 5806630 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-rod-rod-v0.100.0_GH0.tar.gz) = db136a0b5bf09bf7c6f1171e14650a23b238aca94d0ba092e77f0abfce03bb99 +SIZE (go-rod-rod-v0.100.0_GH0.tar.gz) = 358887 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 @@ -113,6 +115,8 @@ SHA256 (jackc-pgtype-v1.6.2_GH0.tar.gz) = 143c7e4b58451348a8b57ee13e74a1ae2c7eb7 SIZE (jackc-pgtype-v1.6.2_GH0.tar.gz) = 174708 SHA256 (jackc-pgx-v4.10.1_GH0.tar.gz) = f0e996611beb31a9d1478298d83c072c611564560c323d5411ddff2a69bd6b51 SIZE (jackc-pgx-v4.10.1_GH0.tar.gz) = 101964 +SHA256 (jackc-puddle-v1.1.3_GH0.tar.gz) = 6ce53fe368d6777b7aee47c2e2e0558d7089d08d23b311f4b84613ba08edc99b +SIZE (jackc-puddle-v1.1.3_GH0.tar.gz) = 10317 SHA256 (jtolds-monkit-hw-141a0da276b3_GH0.tar.gz) = 235a0f0feb47f9b74dc13175fc8c0f5ddf00ba3e3750ca92ff9d144071fd2e1d SIZE (jtolds-monkit-hw-141a0da276b3_GH0.tar.gz) = 9020 SHA256 (jtolds-tracetagger-v2.0.0-rc5_GH0.tar.gz) = 64fe472585b4acd937cd3aaa5945741e3f7825b75838e51ea39ef550dd2cccbe @@ -157,8 +161,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.12_GH0.tar.gz) = 40f28d77016b7c4b764bf48880b73a101eec514e46afddec86f7be1327990fac -SIZE (spacemonkeygo-monkit-v3.0.12_GH0.tar.gz) = 349892 +SHA256 (spacemonkeygo-monkit-v3.0.13_GH0.tar.gz) = 0151c3a344916c9bb2d5464b5a58f96139b3155de03c0bf82ef8c5666ea8784d +SIZE (spacemonkeygo-monkit-v3.0.13_GH0.tar.gz) = 350120 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 @@ -179,8 +183,8 @@ 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-421a3648fb1e_GH0.tar.gz) = edf49167c8d68844bbf854f940bd950eea36c82b9f019414733a0d1e359625ff -SIZE (storj-private-421a3648fb1e_GH0.tar.gz) = 97457 +SHA256 (storj-private-f53a5fcf98e0_GH0.tar.gz) = 31888cf67f2e5b9959a50ab53103c0cf685a9288bb5dd619a54558a79611fbf7 +SIZE (storj-private-f53a5fcf98e0_GH0.tar.gz) = 97965 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 @@ -199,6 +203,12 @@ SHA256 (vivint-infectious-25a574ae18a3_GH0.tar.gz) = 02f3b5efe0f8ad252ec2e39a3eb SIZE (vivint-infectious-25a574ae18a3_GH0.tar.gz) = 29905 SHA256 (xtgo-uuid-a0b114877d4c_GH0.tar.gz) = 7c8311a61fd2facf661da136f2d7f9a1caaca5a1b27c5edfd85a8c12cb85b61d SIZE (xtgo-uuid-a0b114877d4c_GH0.tar.gz) = 4028 +SHA256 (ysmood-goob-v0.3.0_GH0.tar.gz) = 55b073cf2c6ba56c916270508f959d6060942240e58d2fcf3afcf8a19d06ddf0 +SIZE (ysmood-goob-v0.3.0_GH0.tar.gz) = 3477 +SHA256 (ysmood-gson-v0.6.4_GH0.tar.gz) = 6779a1bfd1ff5f7e4c94ada0449805cdb32f28e0d98ae8a979b05d4e5695ab6a +SIZE (ysmood-gson-v0.6.4_GH0.tar.gz) = 4687 +SHA256 (ysmood-leakless-v0.7.0_GH0.tar.gz) = 22ba7cb076ff27ccbc9ca6ee399dfaf18785b6f6b33d143305ce2e03169dc9da +SIZE (ysmood-leakless-v0.7.0_GH0.tar.gz) = 4022887 SHA256 (yuin-gopher-lua-ab39c6098bdb_GH0.tar.gz) = 709a4aeb7a033157f678db2a5f785a1bfc541cbeb5cf53a1e92ba8d8fd93fd07 SIZE (yuin-gopher-lua-ab39c6098bdb_GH0.tar.gz) = 161569 SHA256 (zeebo-admission-v3.0.2_GH0.tar.gz) = a4b216b3a99f4fd9be215e46ca8d3994af9c10101ee1ca3def626360354a18ec diff --git a/net/storj/files/patch-revert-f1a9b45 b/net/storj/files/patch-revert-f1a9b45 new file mode 100644 index 000000000000..8551a32d0c86 --- /dev/null +++ b/net/storj/files/patch-revert-f1a9b45 @@ -0,0 +1,35 @@ +--- go.mod.orig ++++ go.mod +@@ -24,7 +24,7 @@ require ( + github.com/jackc/pgx/v4 v4.10.1 + github.com/jtolds/monkit-hw/v2 v2.0.0-20191108235325-141a0da276b3 + github.com/loov/hrtime v1.0.3 +- github.com/lucas-clemente/quic-go v0.21.0 ++ github.com/lucas-clemente/quic-go v0.20.1 + github.com/mattn/go-sqlite3 v2.0.3+incompatible + github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce + github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 +--- go.sum.orig ++++ go.sum +@@ -313,8 +313,8 @@ github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= + github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= + github.com/loov/hrtime v1.0.3 h1:LiWKU3B9skJwRPUf0Urs9+0+OE3TxdMuiRPOTwR0gcU= + github.com/loov/hrtime v1.0.3/go.mod h1:yDY3Pwv2izeY4sq7YcPX/dtLwzg5NU1AxWuWxKwd0p0= +-github.com/lucas-clemente/quic-go v0.21.0 h1:ZdC8UBxUSBdPlEv1+4y4SqIBy54VA8bRxN7DmkQ0URs= +-github.com/lucas-clemente/quic-go v0.21.0/go.mod h1:BWkfkkOSJD1AxFNBqdjBZi6FznZ96bhdcvZiA+LDrY8= ++github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk= ++github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= + github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= + github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= + github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= +--- private/quic/conn.go.orig ++++ private/quic/conn.go +@@ -97,7 +97,7 @@ func (c *Conn) ConnectionState() tls.ConnectionState { + + // Close closes the quic connection. + func (c *Conn) Close() error { +- return c.session.CloseWithError(0, "") ++ return c.session.CloseWithError(quic.ErrorCode(0), "") + } + + // LocalAddr returns the local address. diff --git a/net/storj/pkg-plist b/net/storj/pkg-plist index f2bb76fade3d..2c409eda3f45 100644 --- a/net/storj/pkg-plist +++ b/net/storj/pkg-plist @@ -2,6 +2,7 @@ bin/certificates bin/connect-test bin/crashcollect bin/inspector +bin/metabase-expireat-migration bin/metabase-verify bin/metainfo-loop-benchmark bin/metric-receiver