diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 55cf4a3dd2cd..84b6b45a340e 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,172 +1,172 @@ PORTNAME= gitaly -DISTVERSION= 14.0.5 +DISTVERSION= 14.1.0 PORTREVISION= 0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=1.1<2:devel/rubygem-rugged \ 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.0.3.6<6.2:devel/rubygem-activesupport61 \ + rubygem-activesupport61>=6.1.3.2<6.2:devel/rubygem-activesupport61 \ rubygem-rdoc>=6.1<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-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.18<0.19:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.20<0.21: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 \ bash>0:shells/bash \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=9.3.0:devel/gitlab-shell LIB_DEPENDS= libgit2.so:devel/libgit2 USES= gmake go:modules,no_targets pkgconfig USE_RUBY= yes MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 9adacd9933b211ca82452fe9b7eb565820c5417b +GL_COMMIT= 11ceaf6b6204634021c70ed510e2805f9633bb14 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor # 97dd GH_TUPLE= \ 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 \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \ 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 \ 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 \ 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 \ git-lfs:go-netrc:e0e9ca483a18:git_lfs_go_netrc/vendor/github.com/git-lfs/go-netrc \ git-lfs:wildmatch:v1.0.4:git_lfs_wildmatch/vendor/github.com/git-lfs/wildmatch \ 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 \ 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:be400aefbc4c:golang_crypto/vendor/golang.org/x/crypto \ golang:groupcache:8c9f03a8e57e: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: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:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \ 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:pprof:cbba55b83ad5:google_pprof/vendor/github.com/google/pprof \ google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \ 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-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 \ grpc:grpc-go:v1.38.0:grpc_grpc_go/vendor/google.golang.org/grpc \ hashicorp:go-uuid:v1.0.1:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \ hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ hashicorp:yamux:a95892c5f864:hashicorp_yamux/vendor/github.com/hashicorp/yamux \ jcmturner:aescts:v1.0.1:jcmturner_aescts/vendor/gopkg.in/jcmturner/aescts.v1 \ jcmturner:dnsutils:v1.0.1:jcmturner_dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \ jcmturner:gofork:v1.0.0:jcmturner_gofork/vendor/github.com/jcmturner/gofork \ 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 \ kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \ lib:pq:v1.2.0: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-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 \ olekukonko:tablewriter:v0.0.2:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \ olekukonko:ts:78ecb04241c0:olekukonko_ts/vendor/github.com/olekukonko/ts \ opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/vendor/github.com/opencontainers/runtime-spec \ opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ otiai10:curr:v1.0.0:otiai10_curr/vendor/github.com/otiai10/curr \ pelletier:go-toml:v1.8.1:pelletier_go_toml/vendor/github.com/pelletier/go-toml \ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ 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 \ prometheus:client_golang:v1.10.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \ prometheus:common:v0.18.0:prometheus_common/vendor/github.com/prometheus/common \ prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \ protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \ rubenv:sql-migrate:06338513c237:rubenv_sql_migrate/vendor/github.com/rubenv/sql-migrate \ rubyist:tracerx:787959303086:rubyist_tracerx/vendor/github.com/rubyist/tracerx \ sebest:xff:671bd2870b3a:sebest_xff/vendor/github.com/sebest/xff \ 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: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: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:3f9890ef73dced430d86801a1efc0e93ec50890e:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ gitlab-org:labkit:bdc29f9e957c46d7b0a4747a4662879c7189bf08:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/bin && \ cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample ${STAGEDIR}${DATADIR}) && \ cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby post-install: ${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /gitlab-shell-hook$$/ s#^#@(,,755) #; \ s#${DATADIR_REL}/ruby/bin#@(,,555) ${DATADIR_REL}/ruby/bin#; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} .include diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index ffa77518965a..fd55894b4323 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,193 +1,193 @@ -TIMESTAMP = 1625901926 +TIMESTAMP = 1627071975 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 SIZE (DataDog-dd-trace-go-v1.30.0_GH0.tar.gz) = 592127 SHA256 (Microsoft-go-winio-v0.4.19_GH0.tar.gz) = aa80cb2aa45ffd97808c2365c554f839757408f822a0774a356b7b918360fc20 SIZE (Microsoft-go-winio-v0.4.19_GH0.tar.gz) = 87784 SHA256 (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 14dbc4af6952acdb1b941d002cd36fd2299aa6b3144cbcbddbb032c47f816da5 SIZE (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 11279 SHA256 (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 757930d82a7fca04d46d1c69ac27361ef2dadcb9fabbb3bf3a5ed785ebfc4e27 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 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 SHA256 (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = cc9dc0234de1baacf1855cf19615b381ca2f2adb83a2871e7a9b8b74e46818cf SIZE (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = 176498 SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148 SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292 SHA256 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875 SIZE (client9-reopen-v1.0.0_GH0.tar.gz) = 6283 SHA256 (cloudflare-tableflip-v1.2.2_GH0.tar.gz) = c4773f3a8de95bf654d3002d52880940c0d7278ad583f04a850e2759e92cb431 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 (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 (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 SIZE (git-lfs-git-lfs-2e1d981afbe3_GH0.tar.gz) = 2871805 SHA256 (git-lfs-gitobj-v2.0.1_GH0.tar.gz) = 67ef655aff54198e8d51699cd247e3def990e85548e5055ceb4a5d8a101a96cd SIZE (git-lfs-gitobj-v2.0.1_GH0.tar.gz) = 96072 SHA256 (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = f42d0b92162e3b104d79ec86281c7c1f16a40b0a9ae4d311003fe4c0bce03e89 SIZE (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = 8477 SHA256 (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 03fb70141dfa9064aefd59e51df396fbc1a5b9fb7b44997414c0a216aafb62c0 SIZE (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 9580 SHA256 (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 63488c583d4bf25eb03f8224eef5934158da81650063a96b53ff4f50b9ff5409 SIZE (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 36726 SHA256 (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 1f30df494ffc50c133c5f276f64c94820046b1a3a660c0cca49a5c3a8106db11 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 (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-be400aefbc4c_GH0.tar.gz) = 52f3f5dc88c5ab7428a9bed403127266d1b5fc90af6a4f6685f98259bb7b7452 SIZE (golang-crypto-be400aefbc4c_GH0.tar.gz) = 1722808 SHA256 (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = b92f918daa48048fd360f14d1a4aed6e70c1176ae6b00b0dc04094bb088e9865 SIZE (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = 26047 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-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-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-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-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 (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-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 SIZE (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = 103780 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 SHA256 (grpc-grpc-go-v1.38.0_GH0.tar.gz) = fd6a2e2ae9e810670fdb63d196275ddb171e7f99f3bb801a02dde973de2f557b SIZE (grpc-grpc-go-v1.38.0_GH0.tar.gz) = 1253222 SHA256 (hashicorp-go-uuid-v1.0.1_GH0.tar.gz) = 2e4e3f95caaf954f54a01b82094533ae3e2cdd754c81f7a977b86aa23cbf4135 SIZE (hashicorp-go-uuid-v1.0.1_GH0.tar.gz) = 6847 SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428 SHA256 (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 9468ab6cee06cee3e1883a99f5d763bd8d9111e13ce499c5f5f5a705a9979789 SIZE (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 24397 SHA256 (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 89d8aa45b05c9cd5e66c40a5c4f3a5224dbf9632d1fd1e27d05f2ad26effae32 SIZE (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 7311 SHA256 (jcmturner-dnsutils-v1.0.1_GH0.tar.gz) = 9781a79a5b46e6ad245d238d1be1b37d8eab9ca9e57edb575ef0af158adeeefb SIZE (jcmturner-dnsutils-v1.0.1_GH0.tar.gz) = 6346 SHA256 (jcmturner-gofork-v1.0.0_GH0.tar.gz) = d85188110837abd563dca4d9013665f82348a541beb47ee08207e70a161c9755 SIZE (jcmturner-gofork-v1.0.0_GH0.tar.gz) = 27036 SHA256 (jcmturner-gokrb5-v5.3.0_GH0.tar.gz) = a33a482f48b9b230cccee66e3d5335c23fc52a8afc240e243c873766886bad87 SIZE (jcmturner-gokrb5-v5.3.0_GH0.tar.gz) = 55015964 SHA256 (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 61aeb3064e5659e26ab0a9e75108f4dbf9ade7ca2b030d147e583948a5e3c39c SIZE (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 9128 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 (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-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 SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 SHA256 (oklog-ulid-v2.0.2_GH0.tar.gz) = d2b0dadd45201cd3385736bd5bd9c8c572e42249e713fe65dfb1e1df6870e3e3 SIZE (oklog-ulid-v2.0.2_GH0.tar.gz) = 56670 SHA256 (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 07e3c6c6f36f6d6e5fc0aa5490f756a9d987e2f3ed20c74e1ec3805c027fd71d SIZE (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 18831 SHA256 (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = e773762d9adb136c048e20f75f90ed3da9c4fd670c1798d26ef592b9aa4e44c7 SIZE (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = 3173 SHA256 (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 0933a1ba6e418fe020993e80426107da8de3572f3f20b4cd1ef296de6e62bb61 SIZE (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 71840 SHA256 (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = cb32b383422a9aae11d260657d52a3789bd799802881b9ced3ee82c370be6f76 SIZE (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = 35914 SHA256 (otiai10-curr-v1.0.0_GH0.tar.gz) = 4db2a3563b84d3888758cd426473cfcfd0f9f5938a78342d140e9424a7ecdf33 SIZE (otiai10-curr-v1.0.0_GH0.tar.gz) = 2464 SHA256 (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 837b8407fb401deff36961ce32498a1145c5ef4bad0b0060a25e632c14621941 SIZE (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 98819 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221 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 (prometheus-client_golang-v1.10.0_GH0.tar.gz) = e7305f84aa6553d9dd4bfd148d29289df36a9df82dae7be3c6eda62feb56f3d1 SIZE (prometheus-client_golang-v1.10.0_GH0.tar.gz) = 176316 SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12 SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986 SHA256 (prometheus-common-v0.18.0_GH0.tar.gz) = 64b0963add6f1945d8da40452d9bf796db263e4d8aba26cf17fdcc3f76b8f940 SIZE (prometheus-common-v0.18.0_GH0.tar.gz) = 123693 SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898 SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676 SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215 SHA256 (rubenv-sql-migrate-06338513c237_GH0.tar.gz) = 922ed3e65f2fa3ad337259253b541204de5448eeb2a1db6d5361419204dd8e67 SIZE (rubenv-sql-migrate-06338513c237_GH0.tar.gz) = 29603 SHA256 (rubyist-tracerx-787959303086_GH0.tar.gz) = ab122682b792765fbd999c6b97812e9b10eb9717ceb0863f02b437a818410b60 SIZE (rubyist-tracerx-787959303086_GH0.tar.gz) = 2833 SHA256 (sebest-xff-671bd2870b3a_GH0.tar.gz) = faaeb494b3e72bf49fa88382d7ce886e3c87d875c4f0745511512bfb12936a86 SIZE (sebest-xff-671bd2870b3a_GH0.tar.gz) = 4022 SHA256 (shirou-gopsutil-v2.20.1_GH0.tar.gz) = f2afad4c7b4be33bafb78e577fd90dfbf46a63eafad480623aead5dd73eec315 SIZE (shirou-gopsutil-v2.20.1_GH0.tar.gz) = 133895 SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74 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-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-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-9adacd9933b211ca82452fe9b7eb565820c5417b_GL0.tar.gz) = 3f79fc2c173f6f0a8411b6904aaef24912276d7fa88bf2434ea7cb95081ca043 -SIZE (gitlab-org-gitaly-9adacd9933b211ca82452fe9b7eb565820c5417b_GL0.tar.gz) = 3528548 +SHA256 (gitlab-org-gitaly-11ceaf6b6204634021c70ed510e2805f9633bb14_GL0.tar.gz) = b71749cd0e36976cb77c72bc7857706f742be154de605b1e0edb8daf8da5c38b +SIZE (gitlab-org-gitaly-11ceaf6b6204634021c70ed510e2805f9633bb14_GL0.tar.gz) = 3577870 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693 SHA256 (gitlab-org-labkit-bdc29f9e957c46d7b0a4747a4662879c7189bf08_GL0.tar.gz) = 89f9ff3689f9338379e62abda71c678e6ff1a65f7d67392c284941678dc90c7e SIZE (gitlab-org-labkit-bdc29f9e957c46d7b0a4747a4662879c7189bf08_GL0.tar.gz) = 167627 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 6728d7cbad0d..f7b0f1366353 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,31 +1,31 @@ ---- Makefile.orig 2021-06-17 15:17:56 UTC +--- Makefile.orig 2021-07-21 11:54:58 UTC +++ Makefile -@@ -198,7 +198,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} +@@ -200,7 +200,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} all: install .PHONY: build -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. -@@ -370,9 +370,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -373,9 +373,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 - ${Q}cd ${GITALY_RUBY_DIR} && bundle config set --local deployment "${BUNDLE_DEPLOYMENT}" - ${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging - ${Q}cd ${GITALY_RUBY_DIR} && bundle install + ${Q}cd ${GITALY_RUBY_DIR} && rm -f Gemfile.lock && bundle install --local ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -440,7 +438,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI +@@ -443,7 +441,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} - ${Q}printf '${PROTOC_HASH} $@.tmp' | sha256sum -c - + ${Q}printf '${PROTOC_HASH} $@.tmp' | sha256 -c - ${Q}mv $@.tmp $@ ${PROTOC}: ${TOOLS_DIR}/protoc.zip diff --git a/devel/gitaly/files/patch-go.sum b/devel/gitaly/files/patch-go.sum deleted file mode 100644 index 3cde5ac680ff..000000000000 --- a/devel/gitaly/files/patch-go.sum +++ /dev/null @@ -1,13 +0,0 @@ ---- go.sum.orig 2021-06-22 05:39:34 UTC -+++ go.sum -@@ -1092,9 +1092,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMe - google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= - google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= - google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg= --gopkg.in/DataDog/dd-trace-go.v1 v1.31.0 h1:ouY+DNlRTckk63TNh468tPWBC21qBZPniVQXQs0iq10= --gopkg.in/DataDog/dd-trace-go.v1 v1.31.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8= -+gopkg.in/DataDog/dd-trace-go.v1 v1.30.0 h1:yJJrDYzAlUsDPpAVBjv4VFnXKTbgvaJFTX0646xDPi4= - gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index e70d313bfb2a..189679801611 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,38 +1,28 @@ ---- ruby/Gemfile.orig 2021-06-21 15:49:22 UTC +--- ruby/Gemfile.orig 2021-07-21 11:54:58 UTC +++ ruby/Gemfile -@@ -3,31 +3,21 @@ source 'https://rubygems.org' - gem 'rugged', '~> 1.1' - gem 'github-linguist', '~> 7.12', require: 'linguist' - gem 'gitlab-markup', '~> 1.7.1' --gem 'activesupport', '~> 6.0.3.6' -+gem 'activesupport', '~> 6.1.3.2' +@@ -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' gem 'rbtrace', require: false - - # Labkit provides observability functionality --gem 'gitlab-labkit', '~> 0.17.1' -+gem 'gitlab-labkit', '~> 0.18.0' - - # Detects the open source license the repository includes +@@ -19,15 +19,4 @@ gem 'gitlab-labkit', '~> 0.20.0' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' --gem 'google-protobuf', '~> 3.14.0' -+gem 'google-protobuf', '~> 3.17.1' - +-gem 'google-protobuf', '~> 3.17.0' +- -group :development, :test do - gem 'rubocop', '~> 0.69', require: false - gem 'rspec', require: false - gem 'rspec-parameterized', require: false - gem 'timecop', require: false - gem 'factory_bot', require: false - gem 'pry', '~> 0.12.2', require: false - - gem 'grpc-tools', '= 1.30.2' -end ++gem 'google-protobuf', '~> 3.17.3'