git: 422f21b3fbf6 - main - devel/gitaly: Update to 14.2.1
Matthias Fechner
mfechner at FreeBSD.org
Tue Aug 31 09:55:14 UTC 2021
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=422f21b3fbf63cb6466507341f560a678f250918
commit 422f21b3fbf63cb6466507341f560a678f250918
Author: Matthias Fechner <mfechner at FreeBSD.org>
AuthorDate: 2021-08-31 09:51:20 +0000
Commit: Matthias Fechner <mfechner at FreeBSD.org>
CommitDate: 2021-08-31 09:54:31 +0000
devel/gitaly: Update to 14.2.1
Required for gitlab-ce 14.2.
---
devel/gitaly/Makefile | 76 +++++++++++++++++--------
devel/gitaly/distinfo | 104 ++++++++++++++++++++++------------
devel/gitaly/files/patch-Makefile | 10 ++--
devel/gitaly/files/patch-ruby_Gemfile | 20 +++----
4 files changed, 134 insertions(+), 76 deletions(-)
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 7aee2c805671..dadfdfcb7b30 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 14.1.2
+DISTVERSION= 14.2.1
PORTREVISION= 0
CATEGORIES= devel
@@ -16,14 +16,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport61>=6.1.3.2<6.2:devel/rubygem-activesupport61 \
- rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
+ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
- rubygem-grpc>=1.30.2<2:net/rubygem-grpc \
+ rubygem-grpc>=1.38.0<2:net/rubygem-grpc \
rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
rubygem-faraday>=1.0.1<2:www/rubygem-faraday \
rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \
- rubygem-gitlab-labkit>=0.20<0.21:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.21<0.22:devel/rubygem-gitlab-labkit \
rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
rubygem-google-protobuf>=3.17.3<3.18:devel/rubygem-google-protobuf
BUILD_DEPENDS= gem:devel/ruby-gems \
@@ -43,20 +43,28 @@ MAKE_ENV+= ${GO_ENV}
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT= 1905b9707bd9c3ba5b47738b64a68a01f1f93c99
+GL_COMMIT= b01470ef32862f7ef17384b646fc8085e4947988
# for go dependencies
USE_GITHUB= nodefault
# generated with: make gomod-vendor
-# 100dd
+# 115dd
GH_TUPLE= \
+ Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
+ Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
+ Azure:go-autorest:79a63e70c4d8:azure_go_autorest_adal \
+ Azure:go-autorest:autorest/v0.11.18:azure_go_autorest_autorest \
+ Azure:go-autorest:b3a0b30a7423:azure_go_autorest_date \
+ Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \
+ Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \
+ Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
DataDog:datadog-go:v4.4.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \
DataDog:dd-trace-go:v1.30.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
Microsoft:go-winio:v0.4.19:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
alexbrainman:sspi:4729b3d4d858:alexbrainman_sspi/vendor/github.com/alexbrainman/sspi \
avast:retry-go:v2.4.2:avast_retry_go/vendor/github.com/avast/retry-go \
- aws:aws-sdk-go:v1.37.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+ aws:aws-sdk-go:v1.38.35:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
census-ecosystem:opencensus-go-exporter-stackdriver:v0.13.8:census_ecosystem_opencensus_go_exporter_stackdriver/vendor/contrib.go.opencensus.io/exporter/stackdriver \
census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
@@ -65,10 +73,11 @@ GH_TUPLE= \
client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \
cloudflare:tableflip:v1.2.2:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \
containerd:cgroups:2819c83ced99:containerd_cgroups/vendor/github.com/containerd/cgroups \
- coreos:go-systemd:v22.0.0:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \
+ coreos:go-systemd:v22.3.1:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
dpotapov:go-spnego:c2c609116ad0:dpotapov_go_spnego/vendor/github.com/dpotapov/go-spnego \
+ form3tech-oss:jwt-go:v3.2.2:form3tech_oss_jwt_go/vendor/github.com/form3tech-oss/jwt-go \
getsentry:sentry-go:v0.10.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
git-lfs:git-lfs:2e1d981afbe3:git_lfs_git_lfs/vendor/github.com/git-lfs/git-lfs \
git-lfs:gitobj:v2.0.1:git_lfs_gitobj_v2/vendor/github.com/git-lfs/gitobj/v2 \
@@ -77,27 +86,31 @@ GH_TUPLE= \
go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \
go-ole:go-ole:v1.2.4:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
- godbus:dbus:v5.0.3:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
+ godbus:dbus:v5.0.4:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
- golang:crypto:eec23a3978ad:golang_crypto/vendor/golang.org/x/crypto \
+ golang:crypto:38f3c27a63bf:golang_crypto/vendor/golang.org/x/crypto \
golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \
- golang:net:d523dce5a7f4:golang_net/vendor/golang.org/x/net \
- golang:oauth2:5e61552d6c78:golang_oauth2/vendor/golang.org/x/oauth2 \
+ golang:mod:v0.4.2:golang_mod/vendor/golang.org/x/mod \
+ golang:net:0714010a04ed:golang_net/vendor/golang.org/x/net \
+ golang:oauth2:81ed05c6b58c:golang_oauth2/vendor/golang.org/x/oauth2 \
golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
- golang:sys:f1c623a9e750:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
- golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+ golang:sys:0981d6026fa6:golang_sys/vendor/golang.org/x/sys \
+ golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
+ golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
+ google:go-cloud:v0.23.0:google_go_cloud/vendor/gocloud.dev \
google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp \
- google:go-genproto:c14fb6ef47c3:google_go_genproto/vendor/google.golang.org/genproto \
+ google:go-genproto:4a47615972c2:google_go_genproto/vendor/google.golang.org/genproto \
google:pprof:cbba55b83ad5:google_pprof/vendor/github.com/google/pprof \
- google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \
+ google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
+ google:wire:v0.5.0:google_wire/vendor/github.com/google/wire \
googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
- googleapis:google-api-go-client:v0.45.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+ googleapis:google-api-go-client:v0.46.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+ googleapis:google-cloud-go:storage/v1.15.0:googleapis_google_cloud_go_storage \
googleapis:google-cloud-go:v0.81.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
@@ -111,12 +124,14 @@ GH_TUPLE= \
jcmturner:gokrb5:v5.3.0:jcmturner_gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v5 \
jcmturner:rpc:v0.0.2:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v0 \
jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
+ jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \
kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \
- lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
+ lib:pq:v1.10.1:lib_pq/vendor/github.com/lib/pq \
libgit2:git2go:v31.4.12:libgit2_git2go_v31/vendor/github.com/libgit2/git2go/v31 \
lightstep:lightstep-tracer-common:a8dfcb80d3a7:lightstep_lightstep_tracer_common_gogo/vendor/github.com/lightstep/lightstep-tracer-common \
lightstep:lightstep-tracer-go:v0.24.0:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
- mattn:go-isatty:v0.0.9:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+ mattn:go-ieproxy:v0.0.1:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
+ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
oklog:ulid:v2.0.2:oklog_ulid_v2/vendor/github.com/oklog/ulid/v2 \
@@ -139,17 +154,32 @@ GH_TUPLE= \
shirou:gopsutil:v2.20.1:shirou_gopsutil/vendor/github.com/shirou/gopsutil \
sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
ssgelm:cookiejarparser:v1.0.1:ssgelm_cookiejarparser/vendor/github.com/ssgelm/cookiejarparser \
- stretchr:objx:v0.1.1:stretchr_objx/vendor/github.com/stretchr/objx \
+ stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
tinylib:msgp:v1.1.2:tinylib_msgp/vendor/github.com/tinylib/msgp \
- uber-go:atomic:v1.5.0:uber_go_atomic/vendor/go.uber.org/atomic \
+ uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \
uber-go:goleak:v1.1.10:uber_go_goleak/vendor/go.uber.org/goleak \
uber:jaeger-client-go:v2.27.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
uber:jaeger-lib:v2.4.1:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
-GL_TUPLE= gitlab-org:gitlab-shell:a9c25c17ea0a511ec6554a4dd3bcd9f5012d59d5:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \
+GL_TUPLE= gitlab-org:gitlab-shell:50da611814d256c77e689977265ec7e07633a4dc:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \
gitlab-org:labkit:397363e2404ac0276b1959373a1c1c2bc1610d67:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+# 13dd
+post-extract:
+ @${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage
+ @${RLN} ${WRKSRC_googleapis_google_cloud_go_storage}/storage ${WRKSRC}/vendor/cloud.google.com/go/storage
+ @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
+ @${RLN} ${WRKSRC_azure_go_autorest_autorest}/autorest ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
+ @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
+ @${RLN} ${WRKSRC_azure_go_autorest_adal}/autorest/adal ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
+ @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date
+ @${RLN} ${WRKSRC_azure_go_autorest_date}/autorest/date ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date
+ @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
+ @${RLN} ${WRKSRC_azure_go_autorest_logger}/logger ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
+ @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
+ @${RLN} ${WRKSRC_azure_go_autorest_tracing}/tracing ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
+
post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 49bee73a2026..e82ab4a039b3 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,20 @@
-TIMESTAMP = 1628061640
+TIMESTAMP = 1630396879
+SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
+SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
+SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
+SIZE (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 242403
+SHA256 (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = d7156c20c47fcd04edae683e718a1e72dcb9178a3b07e6c18615cee5b1dd67d6
+SIZE (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = 175215
+SHA256 (Azure-go-autorest-autorest-v0.11.18_GH0.tar.gz) = c6fc9480fbdc441b40e45ca97244ea3bdd82efe245a52fdd7cb2faa58b4d55b2
+SIZE (Azure-go-autorest-autorest-v0.11.18_GH0.tar.gz) = 175246
+SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f
+SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123
+SHA256 (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = fac35805dc320638a322b407c0cd0c471932a4855e9ef0485c85e533af8146dc
+SIZE (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = 175062
+SHA256 (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = b43cd0127dd6e91debe1eb98873e219817b71c10988d0a6c550e4ad19a29a8ea
+SIZE (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = 167113
+SHA256 (Azure-go-autorest-v14.2.0_GH0.tar.gz) = d0db0e47112570e3f2bd2e38ae56338f1e74625dd4cb553007082fdad5fd844d
+SIZE (Azure-go-autorest-v14.2.0_GH0.tar.gz) = 167851
SHA256 (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = ca4e63041f5e0a176f0affd7a59979255de116686479816a80ff067531f141dc
SIZE (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = 43175
SHA256 (DataDog-dd-trace-go-v1.30.0_GH0.tar.gz) = a739f6c2c20cfa8ffe427451c9eeea3b369fd7bf1334507eef2b8d60088974a2
@@ -11,8 +27,8 @@ SHA256 (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 757930d82a7fca04d46d1c69ac2
SIZE (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 15857
SHA256 (avast-retry-go-v2.4.2_GH0.tar.gz) = 9ed430a4e0c24740db16ba2696422d2d2b07b5e11ea4bcd9a2dde4b58c5a2b50
SIZE (avast-retry-go-v2.4.2_GH0.tar.gz) = 7225
-SHA256 (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = d0bc2f98fe8ead35497d267ee9dc534ab26a5417bb5ca61ce63ca75e9a801b1d
-SIZE (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = 18127514
+SHA256 (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 1c1cd41669e75f4225b8fda42f7500f21408d0a8575ad3665542338ba267242b
+SIZE (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 18967606
SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
SHA256 (census-ecosystem-opencensus-go-exporter-stackdriver-v0.13.8_GH0.tar.gz) = 759ac647e059e4fddf4857bcac7b5a82a4a5c389a15dd67b74f647bb8dcf127e
@@ -29,14 +45,16 @@ SHA256 (cloudflare-tableflip-v1.2.2_GH0.tar.gz) = c4773f3a8de95bf654d3002d528809
SIZE (cloudflare-tableflip-v1.2.2_GH0.tar.gz) = 17812
SHA256 (containerd-cgroups-2819c83ced99_GH0.tar.gz) = 716242603cc675f072031528fab440588dfc1350e4dc037a546234fee52ef7d9
SIZE (containerd-cgroups-2819c83ced99_GH0.tar.gz) = 83338
-SHA256 (coreos-go-systemd-v22.0.0_GH0.tar.gz) = c531193b788f30a0927a0f1396b9010b81227b7a29c5a324cf867202e2099af4
-SIZE (coreos-go-systemd-v22.0.0_GH0.tar.gz) = 67883
+SHA256 (coreos-go-systemd-v22.3.1_GH0.tar.gz) = aa7001afc1f25ebb424bb6f53fc6fb3a5efb8cc7fcab5811ee11386c9124f5cb
+SIZE (coreos-go-systemd-v22.3.1_GH0.tar.gz) = 72419
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b
SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514
SHA256 (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 8093037eed2321f7496b3f66a3396e798463a2bb7dbf7e8bf9b0b54bc7c20a97
SIZE (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 4294
+SHA256 (form3tech-oss-jwt-go-v3.2.2_GH0.tar.gz) = 179ca725463e7f13be8591bc285f4048da6887b1056d96848b16e137c995a2e2
+SIZE (form3tech-oss-jwt-go-v3.2.2_GH0.tar.gz) = 38248
SHA256 (getsentry-sentry-go-v0.10.0_GH0.tar.gz) = 2afd6ccb3a8f6e9998313a99456760d8cf7260994cefd285fba17a32598595e1
SIZE (getsentry-sentry-go-v0.10.0_GH0.tar.gz) = 111875
SHA256 (git-lfs-git-lfs-2e1d981afbe3_GH0.tar.gz) = ac86befae8b958b79c460ca45e5982e87d472c071710b37b97743f27d4ac0b1c
@@ -53,48 +71,56 @@ SHA256 (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 1f30df494ffc50c133c5f276f64c94820046b
SIZE (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 51655
SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
-SHA256 (godbus-dbus-v5.0.3_GH0.tar.gz) = 49d27bde2861f5e5ab4195fddc5f38f25324aac3b32b3cc03e712cca3d2b75fa
-SIZE (godbus-dbus-v5.0.3_GH0.tar.gz) = 63630
+SHA256 (godbus-dbus-v5.0.4_GH0.tar.gz) = cc43459f4c165c1f782aea9a1b79405b5a07cab9694a637246dacde9c889bc56
+SIZE (godbus-dbus-v5.0.4_GH0.tar.gz) = 69965
SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34
SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725
SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
-SHA256 (golang-crypto-eec23a3978ad_GH0.tar.gz) = bd882536660d6b65619c9d9b9334e9a5c55557613e56e1b485323a2293dfa2f8
-SIZE (golang-crypto-eec23a3978ad_GH0.tar.gz) = 1725798
+SHA256 (golang-crypto-38f3c27a63bf_GH0.tar.gz) = b55bc13c8a313ed80310a84eb7cceb303532774439493636a89b17c170250e31
+SIZE (golang-crypto-38f3c27a63bf_GH0.tar.gz) = 1731839
SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394
SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101
SHA256 (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 5014077abbc075c3b4b459f7ad98cc1c28f2ae6bde906a9d8ed19d8c8b97987a
SIZE (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 31889
-SHA256 (golang-net-d523dce5a7f4_GH0.tar.gz) = 2845c6b37390b25a88a8a71e211e1ed9da8a1f6363baa275d6d30e8dd0d00a21
-SIZE (golang-net-d523dce5a7f4_GH0.tar.gz) = 1252646
-SHA256 (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 01ea885d501ffceaecaef9a91a433c3391583f4ee6cae16115ebb2ccafcc90c9
-SIZE (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 78982
+SHA256 (golang-mod-v0.4.2_GH0.tar.gz) = ce4131eb443ac67ededb139a43bae4fbb2c4b84843936495c6a6de92b8033917
+SIZE (golang-mod-v0.4.2_GH0.tar.gz) = 104584
+SHA256 (golang-net-0714010a04ed_GH0.tar.gz) = 62ba863366262fbbc211a65b1301f7fcf75f5f710fd979c27607af49ea51ba21
+SIZE (golang-net-0714010a04ed_GH0.tar.gz) = 1250017
+SHA256 (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 84828c3d8d1e1b5fdec9fef502f37308de4244571316063f72beb0bb20f07fe0
+SIZE (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 79557
SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-f1c623a9e750_GH0.tar.gz) = 15a6f78a91827579b9e204b14e4efa338840b5cd797d03400cea62a0b9d8bed5
-SIZE (golang-sys-f1c623a9e750_GH0.tar.gz) = 1219335
-SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27
-SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127
-SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
-SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
+SHA256 (golang-sys-0981d6026fa6_GH0.tar.gz) = 1027a8cd31706610f83425e844a1ea03309526ed499d5cab13ecf9f53d923eca
+SIZE (golang-sys-0981d6026fa6_GH0.tar.gz) = 1235549
+SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
+SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
+SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb
+SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656
SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2
SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055
SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
+SHA256 (google-go-cloud-v0.23.0_GH0.tar.gz) = 7d5688a41b79443f775c5db9118e27f3d37a6b9f9e0064635eb800fa25244ae5
+SIZE (google-go-cloud-v0.23.0_GH0.tar.gz) = 2619492
SHA256 (google-go-cmp-v0.5.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e
SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358
-SHA256 (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 26b5114e119b8945b16a7205d55e1dbd3c006940ac4568d670081690ef7210a8
-SIZE (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 8642924
+SHA256 (google-go-genproto-4a47615972c2_GH0.tar.gz) = b24811e4ac7d0d46c4778cb87a4afd77f99eaf152fd43609fcb004ed1f4b98df
+SIZE (google-go-genproto-4a47615972c2_GH0.tar.gz) = 8968771
SHA256 (google-pprof-cbba55b83ad5_GH0.tar.gz) = 637bcea06f4a595d126e02e94075c625bc283ac9056904e68bb57fb2b125e47f
SIZE (google-pprof-cbba55b83ad5_GH0.tar.gz) = 1717915
-SHA256 (google-uuid-v1.1.2_GH0.tar.gz) = e650558e314307cf33391d0a9ef575b418188206d61cb9751e9f11bceb0874d0
-SIZE (google-uuid-v1.1.2_GH0.tar.gz) = 13871
+SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
+SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
+SHA256 (google-wire-v0.5.0_GH0.tar.gz) = 97f21d31d8a2b3b04feeee1467697c863919b62882ab2ec450ee282dab076812
+SIZE (google-wire-v0.5.0_GH0.tar.gz) = 88112
SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
-SHA256 (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 628120c26b3db51e218d50b3555eb552a12993e5c1096b4ed8ad200bae925985
-SIZE (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 20020236
+SHA256 (googleapis-google-api-go-client-v0.46.0_GH0.tar.gz) = 33cd2b3a446679cc8dbbbcc64aaf730241ee3400ac0c89021922683b12355e3d
+SIZE (googleapis-google-api-go-client-v0.46.0_GH0.tar.gz) = 20181199
+SHA256 (googleapis-google-cloud-go-storage-v1.15.0_GH0.tar.gz) = b33646613edf0deffdf6ff397e94b3cc17253cf8abda2480b417e9316181fb09
+SIZE (googleapis-google-cloud-go-storage-v1.15.0_GH0.tar.gz) = 3751063
SHA256 (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 307f191f0ebcd71b96ec66554670eb3cf0398c64a427e43651472b5d9616f1ae
SIZE (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 3510192
SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc
@@ -121,18 +147,22 @@ SHA256 (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 61aeb3064e5659e26ab0a9e75108f4dbf9ade
SIZE (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 9128
SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d
SIZE (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = 128861
+SHA256 (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 4999e6d8feefe5b89eb9c2b3845a3c0ecdb6f0b0ba4e9785567a43f8952fff15
+SIZE (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 17764
SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec9fc320de81509f4aa582ea3b6ce18476c3e40dd
SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408
-SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
-SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
+SHA256 (lib-pq-v1.10.1_GH0.tar.gz) = bbf8f9796747e3e8645175c4e4c12c39c05938b62f93386ac401bba2abfa6a91
+SIZE (lib-pq-v1.10.1_GH0.tar.gz) = 103789
SHA256 (libgit2-git2go-v31.4.12_GH0.tar.gz) = 4425db097e682e62a1781a83f1eeb22b6106a7e5f3459742fda8de69466f8b1d
SIZE (libgit2-git2go-v31.4.12_GH0.tar.gz) = 115471
SHA256 (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 0403290c66b3dd109d0a726784b8b0a8583c5d19d35d12a0c2b89a434ed2d0c6
SIZE (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 58493
SHA256 (lightstep-lightstep-tracer-go-v0.24.0_GH0.tar.gz) = 794c5cea97c46ee5a9139c1b2770cbd81d4534ba4359a8b6b744566c4abfb15b
SIZE (lightstep-lightstep-tracer-go-v0.24.0_GH0.tar.gz) = 63446
-SHA256 (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 71d57a3fb3f990a5a5d1e190ae5112a8aca2fcdda9eb42770bd524076e8f371f
-SIZE (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 3904
+SHA256 (mattn-go-ieproxy-v0.0.1_GH0.tar.gz) = 26cc1f0d9ba19556cd91e0d4ed07ba2042eacd07c5b9aec082f7a77e2ef1fa28
+SIZE (mattn-go-ieproxy-v0.0.1_GH0.tar.gz) = 9090
+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
@@ -177,23 +207,23 @@ SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860
SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
SHA256 (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 8989734dc34c4cbd7841a98d96c4d9dbe3184be27f5b3a5d3a8e377d17a7f2f3
SIZE (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 3237
-SHA256 (stretchr-objx-v0.1.1_GH0.tar.gz) = 3bb0a581651f4c040435a70167ab60b723c5af04a5b0326af3c8b01ccc6fdcf0
-SIZE (stretchr-objx-v0.1.1_GH0.tar.gz) = 75768
+SHA256 (stretchr-objx-v0.2.0_GH0.tar.gz) = be7dce02798cdc24cee6bd2d95bfcf6976b1521ef735349bf5e7dfe6d147746f
+SIZE (stretchr-objx-v0.2.0_GH0.tar.gz) = 79981
SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
SHA256 (tinylib-msgp-v1.1.2_GH0.tar.gz) = 9759dc9f45160ff1161d670d019f509d55e12b22dfc8a8e1ed71f4c358ee1a01
SIZE (tinylib-msgp-v1.1.2_GH0.tar.gz) = 83078
-SHA256 (uber-go-atomic-v1.5.0_GH0.tar.gz) = 3b003515efb86c67aced0ce9e954cca50964ee0afe83e5a63dfe43aa58347290
-SIZE (uber-go-atomic-v1.5.0_GH0.tar.gz) = 9365
+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-goleak-v1.1.10_GH0.tar.gz) = 99ccfd2270aebb09e5c1693094d1da5f47be09689fd515b623657f75e6dc2c40
SIZE (uber-go-goleak-v1.1.10_GH0.tar.gz) = 12098
SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5ec977731646363c5350d56faba31a097d996
SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139
SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc
SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
-SHA256 (gitlab-org-gitaly-1905b9707bd9c3ba5b47738b64a68a01f1f93c99_GL0.tar.gz) = e8a2d336badf17a1794e597efceba84337b8c0037f899c03a8bf0de0244c6469
-SIZE (gitlab-org-gitaly-1905b9707bd9c3ba5b47738b64a68a01f1f93c99_GL0.tar.gz) = 3578601
-SHA256 (gitlab-org-gitlab-shell-a9c25c17ea0a511ec6554a4dd3bcd9f5012d59d5_GL0.tar.gz) = 4a92479caaa62e50de0a26d710aa1905b0d9b51c4d33d14973410b6dcb7babeb
-SIZE (gitlab-org-gitlab-shell-a9c25c17ea0a511ec6554a4dd3bcd9f5012d59d5_GL0.tar.gz) = 121791
+SHA256 (gitlab-org-gitaly-b01470ef32862f7ef17384b646fc8085e4947988_GL0.tar.gz) = 4d2ad37a974fca7f8aa70508a8fca7eb72ec14d32552d4eb7110baa2debe2ccd
+SIZE (gitlab-org-gitaly-b01470ef32862f7ef17384b646fc8085e4947988_GL0.tar.gz) = 3625470
+SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af
+SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516
SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb
SIZE (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = 171896
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index f7b0f1366353..717aa0177e0a 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,15 +1,15 @@
---- Makefile.orig 2021-07-21 11:54:58 UTC
+--- Makefile.orig 2021-08-23 16:25:31 UTC
+++ Makefile
-@@ -200,7 +200,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
- all: install
+@@ -242,7 +242,7 @@ help:
.PHONY: build
+ ## Build Go binaries and install required Ruby Gems.
-build: ${SOURCE_DIR}/.ruby-bundle libgit2
+build: ${SOURCE_DIR}/.ruby-bundle
go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
# We use version suffix for the gitaly-git2go binary to support compatibility contract between
# gitaly and gitaly-git2go during upgrade deployment.
-@@ -373,9 +373,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -433,9 +433,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
# step. Both Omnibus and CNG assume it is in the Gitaly root, not in
# _build. Hence the '../' in front.
${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
@@ -20,7 +20,7 @@
${Q}touch $@
${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -443,7 +441,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+@@ -503,7 +501,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
${TOOLS_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version
${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi
curl -o $@.tmp --silent --show-error -L ${PROTOC_URL}
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 189679801611..34ca5d35e771 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,15 +1,13 @@
---- ruby/Gemfile.orig 2021-07-21 11:54:58 UTC
+--- ruby/Gemfile.orig 2021-08-23 16:25:31 UTC
+++ ruby/Gemfile
-@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2'
- gem 'rdoc', '~> 6.0'
- gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
- gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
--gem 'grpc', '~> 1.30.2'
-+gem 'grpc', '~> 1.30'
- gem 'sentry-raven', '~> 3.0', require: false
- gem 'faraday', '~> 1.0'
+@@ -13,21 +13,10 @@ gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
-@@ -19,15 +19,4 @@ gem 'gitlab-labkit', '~> 0.20.0'
+
+ # Labkit provides observability functionality
+-gem 'gitlab-labkit', '~> 0.20.0'
++gem 'gitlab-labkit', '~> 0.21.0'
+
+ # Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.14.1'
@@ -23,6 +21,6 @@
- gem 'factory_bot', require: false
- gem 'pry', '~> 0.12.2', require: false
-
-- gem 'grpc-tools', '= 1.30.2'
+- gem 'grpc-tools', '= 1.38.0'
-end
+gem 'google-protobuf', '~> 3.17.3'
More information about the dev-commits-ports-main
mailing list