diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index af0b96d8782b..985b178a5cca 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,242 +1,96 @@ PORTNAME= gitaly -DISTVERSION= 14.10.0 +DISTVERSION= 15.0.0 +DISTVERSIONPREFIX= v PORTREVISION= 0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # Make sure the following patch is included: # https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4108 # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848 # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.35.1:devel/git \ +MY_DEPENDS= git>=2.36.1:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport61>=6.1.4.7<6.1.5:devel/rubygem-activesupport61 \ + rubygem-activesupport61>=6.1.4.7<6.1.7:devel/rubygem-activesupport61 \ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.2<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-grpc142>=1.42.0.pre1<2:net/rubygem-grpc142 \ 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.22.0<0.23:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ - rubygem-google-protobuf319>=3.19.0<3.20:devel/rubygem-google-protobuf319 + rubygem-google-protobuf319>=3.19.0<3.20:devel/rubygem-google-protobuf319 \ + rubygem-gitlab-license_finder>=6.14.2.1<7:devel/rubygem-gitlab-license_finder BUILD_DEPENDS= gem:devel/ruby-gems \ bash>0:shells/bash \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=13.22.1:devel/gitlab-shell LIB_DEPENDS= libgit2.so:devel/libgit2 USES= cpe gmake go:modules,no_targets pkgconfig USE_RUBY= yes CPE_VENDOR= gitlab 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= 1478932866d068186c3a8af85fa11e5a97f5558e +GL_COMMIT= acd4d5d616a1a0c0f4676b44755624d8a932857c # for go dependencies -USE_GITHUB= nodefault -# generated with: make gomod-vendor -# 145dd -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.38.35:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ - beevik:ntp:v0.3.0:beevik_ntp/vendor/github.com/beevik/ntp \ - 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 \ - census-instrumentation:opencensus-proto:v0.3.0:census_instrumentation_opencensus_proto/vendor/github.com/census-instrumentation/opencensus-proto \ - 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.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 \ - dgryski:go-minhash:7fe510aff544:dgryski_go_minhash/vendor/github.com/dgryski/go-minhash \ - 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 \ - ekzhu:minhash-lsh:5c06ee8586a1:ekzhu_minhash_lsh/vendor/github.com/ekzhu/minhash-lsh \ - emirpasic:gods:v1.12.0:emirpasic_gods/vendor/github.com/emirpasic/gods \ - 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 \ - 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-enry:go-license-detector:v4.3.0:go_enry_go_license_detector_v4/vendor/github.com/go-enry/go-license-detector/v4 \ - go-git:gcfg:v1.5.0:go_git_gcfg/vendor/github.com/go-git/gcfg \ - go-git:go-billy:v5.1.0:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \ - go-git:go-git:v5.3.0:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \ - 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-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \ - go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ - 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:a769d52b0f97:golang_crypto/vendor/golang.org/x/crypto \ - golang:exp:e8c3332aa8e5:golang_exp/vendor/golang.org/x/exp \ - golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ - golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \ - 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:4dd72447c267:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \ - golang:time:0e9765cccd65: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:4a47615972c2:google_go_genproto/vendor/google.golang.org/genproto \ - google:pprof:cbba55b83ad5:google_pprof/vendor/github.com/google/pprof \ - 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.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 \ - 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 \ - hhatto:gorst:ca9f730cac5b:hhatto_gorst/vendor/github.com/hhatto/gorst \ - imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \ - jackc:chunkreader:v2.0.1:jackc_chunkreader_v2/vendor/github.com/jackc/chunkreader/v2 \ - jackc:pgconn:v1.10.1:jackc_pgconn/vendor/github.com/jackc/pgconn \ - jackc:pgio:v1.0.0:jackc_pgio/vendor/github.com/jackc/pgio \ - jackc:pgpassfile:v1.0.0:jackc_pgpassfile/vendor/github.com/jackc/pgpassfile \ - jackc:pgproto3:v2.2.0:jackc_pgproto3_v2/vendor/github.com/jackc/pgproto3/v2 \ - jackc:pgservicefile:2b9c44734f2b:jackc_pgservicefile/vendor/github.com/jackc/pgservicefile \ - jackc:pgtype:v1.9.1:jackc_pgtype/vendor/github.com/jackc/pgtype \ - jackc:pgx:v4.14.1:jackc_pgx_v4/vendor/github.com/jackc/pgx/v4 \ - jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \ - 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 \ - jdkato:prose:v1.1.0:jdkato_prose/vendor/github.com/jdkato/prose \ - 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 \ - kevinburke:ssh_config:4977a11b4351:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \ - libgit2:git2go:v33.0.9:libgit2_git2go_v33/vendor/github.com/libgit2/git2go/v33 \ - 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-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 \ - mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ - montanaflynn:stats:eeaced052adb:montanaflynn_stats/vendor/github.com/montanaflynn/stats \ - neurosnap:sentences:v1.0.6:neurosnap_sentences/vendor/gopkg.in/neurosnap/sentences.v1 \ - 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 \ - 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 \ - russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \ - sebest:xff:671bd2870b3a:sebest_xff/vendor/github.com/sebest/xff \ - sergi:go-diff:v1.1.0:sergi_go_diff/vendor/github.com/sergi/go-diff \ - shirou:gopsutil:v2.20.1:shirou_gopsutil/vendor/github.com/shirou/gopsutil \ - shogo82148:go-shuffle:59829097ff3b:shogo82148_go_shuffle/vendor/github.com/shogo82148/go-shuffle \ - shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \ - 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: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.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 \ - xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \ - gonum:gonum:v0.8.2:gonum/vendor/gonum.org/v1/gonum - -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 +# Gitlab hosts there dependencies on their own platform and not on go-proxy +# so we download the required go.mod file from gitlab +# lines are taken from go.mk +# --------------------------- +FETCH_DEPENDS= ${GO_CMD}:${GO_PORT} \ + ca_root_nss>0:security/ca_root_nss +MASTER_SITES+= https://gitlab.com/gitlab-org/gitaly/-/raw/v${DISTVERSION}/ +DISTFILES+= go.mod +DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} +EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} +_USES_fetch+= 800:go-post-fetch +go-post-fetch: + @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; + @(cd ${DISTDIR}/${DIST_SUBDIR}; \ + [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ + ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) +# --------------------------- 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 93eb0bda3abd..6237da6af9fb 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,289 +1,5 @@ -TIMESTAMP = 1650541273 -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 -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 (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 1c1cd41669e75f4225b8fda42f7500f21408d0a8575ad3665542338ba267242b -SIZE (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 18967606 -SHA256 (beevik-ntp-v0.3.0_GH0.tar.gz) = 6a398b24ee7c4204f73881299a1860976b2a8d6f77c11895e2d06c6c657b5584 -SIZE (beevik-ntp-v0.3.0_GH0.tar.gz) = 10977 -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 -SIZE (census-ecosystem-opencensus-go-exporter-stackdriver-v0.13.8_GH0.tar.gz) = 90749 -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 (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0 -SIZE (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = 163404 -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.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 (dgryski-go-minhash-7fe510aff544_GH0.tar.gz) = f06a8ab1d533f01c8d60fce85622b21bf7690a7013c73ac6953564930476f245 -SIZE (dgryski-go-minhash-7fe510aff544_GH0.tar.gz) = 3480 -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 (ekzhu-minhash-lsh-5c06ee8586a1_GH0.tar.gz) = a31e5ad4af6914297bc675b6a996fc5d0472f67a0f6cbb300f53eff872476850 -SIZE (ekzhu-minhash-lsh-5c06ee8586a1_GH0.tar.gz) = 7279 -SHA256 (emirpasic-gods-v1.12.0_GH0.tar.gz) = 889d06b5f88db9e2dae19a799a35324c4f59305aa5e966dcdb4b637e70607ff9 -SIZE (emirpasic-gods-v1.12.0_GH0.tar.gz) = 76825 -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 -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-enry-go-license-detector-v4.3.0_GH0.tar.gz) = 2f905ed275a80a4eae30cd4dd276e07bcd338c9189f36ad9d5723e2a8a9b9bd7 -SIZE (go-enry-go-license-detector-v4.3.0_GH0.tar.gz) = 9004382 -SHA256 (go-git-gcfg-v1.5.0_GH0.tar.gz) = 662e46a93aba5ffe383e55597ce5749447e5c8e9409b1452f5790bfd6e1f8a11 -SIZE (go-git-gcfg-v1.5.0_GH0.tar.gz) = 28522 -SHA256 (go-git-go-billy-v5.1.0_GH0.tar.gz) = cb6a3e04b76af02af0aefad91b1e07007c27fba48b3a08ca8e87768e8ea272f5 -SIZE (go-git-go-billy-v5.1.0_GH0.tar.gz) = 28217 -SHA256 (go-git-go-git-v5.3.0_GH0.tar.gz) = 8f97b5e63d2d331f7502ab2d5d8874d41ab06c80c6052a61445df26764e51e42 -SIZE (go-git-go-git-v5.3.0_GH0.tar.gz) = 465156 -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-warnings-warnings-v0.1.2_GH0.tar.gz) = 4712c4ceae321433d8c1d9ebc6afd154d7932c849129ded48b1c4a51c21275e8 -SIZE (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 3769 -SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04 -SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898 -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-a769d52b0f97_GH0.tar.gz) = d93f7b5b85901b88518c3997c20ac1aff1d60ecb127a0427e87da87cc7d593a1 -SIZE (golang-crypto-a769d52b0f97_GH0.tar.gz) = 1731973 -SHA256 (golang-exp-e8c3332aa8e5_GH0.tar.gz) = 02d36b798456326f37ca4bebc8824c0eafe650ae9b0fc2673a034d7c3add5422 -SIZE (golang-exp-e8c3332aa8e5_GH0.tar.gz) = 1513507 -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-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-4dd72447c267_GH0.tar.gz) = 046e3dfe88c8788c03df268704fe3477de9354c56e364b87433935f35b415a36 -SIZE (golang-sys-4dd72447c267_GH0.tar.gz) = 1222385 -SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760 -SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095 -SHA256 (golang-time-0e9765cccd65_GH0.tar.gz) = ef4874b5cdfc2d21bb17e38c9a691e9e66c924cea852c8999fea7b08a649aab7 -SIZE (golang-time-0e9765cccd65_GH0.tar.gz) = 10226 -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-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.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.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 -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 (hhatto-gorst-ca9f730cac5b_GH0.tar.gz) = ff9702fb0409e8eb462c47093e972ff04c51578afe6de2312de621ada6d5826c -SIZE (hhatto-gorst-ca9f730cac5b_GH0.tar.gz) = 53795 -SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302 -SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319 -SHA256 (jackc-chunkreader-v2.0.1_GH0.tar.gz) = bf856bad6608fb7345707aba713a1d77eb984f1d217065738a12c97e37669be4 -SIZE (jackc-chunkreader-v2.0.1_GH0.tar.gz) = 3038 -SHA256 (jackc-pgconn-v1.10.1_GH0.tar.gz) = 7045b8e2059025229f1b1344d28289b753e0b1f1f6196adbcb10f07e56e10462 -SIZE (jackc-pgconn-v1.10.1_GH0.tar.gz) = 54190 -SHA256 (jackc-pgio-v1.0.0_GH0.tar.gz) = d36e367c877954acdc96b8cd1a0df417b4cfae80dae726474a8f0de3a68a68ab -SIZE (jackc-pgio-v1.0.0_GH0.tar.gz) = 1884 -SHA256 (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = df8904662382e1d0064ec7a5a8c36c49264d7128cea923d597802ada8c5b9603 -SIZE (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = 3254 -SHA256 (jackc-pgproto3-v2.2.0_GH0.tar.gz) = 752bf556fd414ca91e4ef0947c63a42566f46b9c26a4493deca7e9f135044f21 -SIZE (jackc-pgproto3-v2.2.0_GH0.tar.gz) = 23690 -SHA256 (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = dd6cf77deb2456b1c8e56875ed901a57eb887e63ae5de48f364906131275497e -SIZE (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = 2991 -SHA256 (jackc-pgtype-v1.9.1_GH0.tar.gz) = 5b88f70bb5f8a9b4c2db451f7e8ffad2a287a00ac88c2be27a6c3909209979f4 -SIZE (jackc-pgtype-v1.9.1_GH0.tar.gz) = 177403 -SHA256 (jackc-pgx-v4.14.1_GH0.tar.gz) = 775caa6b67d93da276212197ca33d1d7a5d52f12e9298f76a239cee115e19c0a -SIZE (jackc-pgx-v4.14.1_GH0.tar.gz) = 110607 -SHA256 (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = b5a5c4fe8d73dea7dc838f1c428c5fff0db9b50a2c014208a2761de4e94fa5ba -SIZE (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = 5945 -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 (jdkato-prose-v1.1.0_GH0.tar.gz) = cbd52065b256581358bd6fff517abaeced7b41fbbf6c2885f3940cdc20eb3c72 -SIZE (jdkato-prose-v1.1.0_GH0.tar.gz) = 4569644 -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 (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 568ea6be8d237ca16dcd03e2fa5e07461ab596ccff40197ac34dac43f97389ec -SIZE (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 17407 -SHA256 (libgit2-git2go-v33.0.9_GH0.tar.gz) = bcdaa5ed86d7ad513f51cdd80006a23a7fa9d9e68db06b3ce39a25a4196e4d67 -SIZE (libgit2-git2go-v33.0.9_GH0.tar.gz) = 130832 -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-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 -SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 -SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600 -SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362 -SHA256 (montanaflynn-stats-eeaced052adb_GH0.tar.gz) = cac27dcf47fe832944051095e017f84a6f171133ef08fa52ad601e5eeed08ad3 -SIZE (montanaflynn-stats-eeaced052adb_GH0.tar.gz) = 13094 -SHA256 (neurosnap-sentences-v1.0.6_GH0.tar.gz) = 385f750a3e7ee579ab7092659f2e2c13ef80269d845da1f5b88c334ff7ca1aa4 -SIZE (neurosnap-sentences-v1.0.6_GH0.tar.gz) = 5181913 -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 (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 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff -SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613 -SHA256 (sebest-xff-671bd2870b3a_GH0.tar.gz) = faaeb494b3e72bf49fa88382d7ce886e3c87d875c4f0745511512bfb12936a86 -SIZE (sebest-xff-671bd2870b3a_GH0.tar.gz) = 4022 -SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c217c0499ef5573ab7176352229451 -SIZE (sergi-go-diff-v1.1.0_GH0.tar.gz) = 43552 -SHA256 (shirou-gopsutil-v2.20.1_GH0.tar.gz) = f2afad4c7b4be33bafb78e577fd90dfbf46a63eafad480623aead5dd73eec315 -SIZE (shirou-gopsutil-v2.20.1_GH0.tar.gz) = 133895 -SHA256 (shogo82148-go-shuffle-59829097ff3b_GH0.tar.gz) = a81974c8de0bd2fe341467103e5dd450e1614991316e7caf757047ec6d94067e -SIZE (shogo82148-go-shuffle-59829097ff3b_GH0.tar.gz) = 2829 -SHA256 (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f -SIZE (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143 -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-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.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 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215b809e50f0a80c78b8730c61582858 -SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421 -SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663 -SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037 -SHA256 (gitlab-org-gitaly-1478932866d068186c3a8af85fa11e5a97f5558e_GL0.tar.gz) = 3d00f3ad8471908b0088aedd73d46dd17b19029e6fd40a10a71b6db1bb17f96a -SIZE (gitlab-org-gitaly-1478932866d068186c3a8af85fa11e5a97f5558e_GL0.tar.gz) = 3880674 -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 +TIMESTAMP = 1653635587 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-acd4d5d616a1a0c0f4676b44755624d8a932857c_GL0/go.mod) = 0f81920b355ef928d3d62a8f34c87240b9cc045e2a124cd617d25c1097a5c787 +SIZE (go/devel_gitaly/gitlab-org-gitaly-acd4d5d616a1a0c0f4676b44755624d8a932857c_GL0/go.mod) = 1827 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-acd4d5d616a1a0c0f4676b44755624d8a932857c_GL0/gitlab-org-gitaly-acd4d5d616a1a0c0f4676b44755624d8a932857c_GL0.tar.gz) = 6f7d393fd6961f140a1e887499444c0e8b01f9e5d2d59269ce83c3a588dd72ff +SIZE (go/devel_gitaly/gitlab-org-gitaly-acd4d5d616a1a0c0f4676b44755624d8a932857c_GL0/gitlab-org-gitaly-acd4d5d616a1a0c0f4676b44755624d8a932857c_GL0.tar.gz) = 3915148 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 8fdf8020feb2..dba82827dc1e 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,29 +1,29 @@ ---- Makefile.orig 2022-04-21 05:54:57 UTC +--- Makefile.orig 2022-05-20 13:52:23 UTC +++ Makefile -@@ -271,7 +271,7 @@ build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_EXECUTABLES +@@ -279,7 +279,7 @@ build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_EXECUTABLES gitaly: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} gitaly-git2go-v14: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} -gitaly-git2go-v14: libgit2 +#gitaly-git2go-v14: libgit2 .PHONY: ${GITALY_EXECUTABLES} ${GITALY_EXECUTABLES}: -@@ -283,7 +283,7 @@ ${GITALY_EXECUTABLES}: +@@ -291,7 +291,7 @@ ${GITALY_EXECUTABLES}: @ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the @ # GNU build-id from the empty string and causing guaranteed collisions. ${Q}GO_BUILD_ID=$$( go tool buildid $(addprefix ${BUILD_DIR}/bin/, $@) || openssl rand -hex 32 ) && \ - GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1sum | cut -d' ' -f1 ) && \ + GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1 | cut -d' ' -f1 ) && \ go install -ldflags '${GO_LDFLAGS}'" -B 0x$$GNU_BUILD_ID" -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $@) .PHONY: install -@@ -482,7 +482,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -493,7 +493,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 install + ${Q}cd ${GITALY_RUBY_DIR} && rm -f Gemfile.lock && bundle install --local ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 52a2caa92848..dec08c459f9e 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,83 +1,83 @@ ---- config.toml.example.orig 2021-09-21 10:03:53 UTC +--- config.toml.example.orig 2022-05-20 13:52:23 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and # https://docs.gitlab.com/ee//administration/gitaly/reference -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" +socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket" # The directory where Gitaly's executables are stored -bin_dir = "/home/git/gitaly/_build/bin" +bin_dir = "%%PREFIX%%/share/gitaly/bin/" - # # Optional: listen on a TCP socket. This is insecure (no authentication) - # listen_addr = "localhost:9999" -@@ -17,7 +17,7 @@ bin_dir = "/home/git/gitaly/_build/bin" + # # Optional: The directory where Gitaly can create all files required to + # # properly operate at runtime. If not set, Gitaly will create a directory in +@@ -22,7 +22,7 @@ bin_dir = "/home/git/gitaly/_build/bin" # # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly # # named temp directory each time it boots. # # Non Gitaly clients should never connect to these sockets. -# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal" +internal_socket_dir = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/internal" # # Optional: authenticate Gitaly requests using a shared secret # [auth] -@@ -28,9 +28,9 @@ bin_dir = "/home/git/gitaly/_build/bin" +@@ -33,9 +33,9 @@ bin_dir = "/home/git/gitaly/_build/bin" # certificate_path = '/home/git/cert.cert' # key_path = '/home/git/key.pem' -# # Git settings -# [git] -# bin_path = "/usr/bin/git" +# Git settings +[git] +bin_path = "%%PREFIX%%/bin/git" # catfile_cache_size = 100 # [[git.config]] # key = fetch.fsckObjects -@@ -38,7 +38,7 @@ bin_dir = "/home/git/gitaly/_build/bin" +@@ -43,7 +43,7 @@ bin_dir = "/home/git/gitaly/_build/bin" [[storage]] name = "default" -path = "/home/git/repositories" +path = "%%PREFIX%%/git/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -50,7 +50,7 @@ path = "/home/git/repositories" +@@ -55,7 +55,7 @@ path = "/home/git/repositories" # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout # [logging] # # The directory where Gitaly stores extra log files -dir = "/home/git/gitlab/log" +dir = "%%PREFIX%%/www/gitlab-ce/log" # format = "json" # # Optional: Set log level to only log entries with that severity or above # # One of, in order: debug, info, warn, errror, fatal, panic -@@ -68,7 +68,7 @@ dir = "/home/git/gitlab/log" +@@ -73,7 +73,7 @@ dir = "/home/git/gitlab/log" [gitaly-ruby] # The directory where gitaly-ruby is installed -dir = "/home/git/gitaly/ruby" +dir = "%%PREFIX%%/share/gitaly/ruby" # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 200000000 -@@ -88,14 +88,14 @@ dir = "/home/git/gitaly/ruby" +@@ -93,14 +93,14 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed -dir = "/home/git/gitlab-shell" +dir = "%%PREFIX%%/share/gitlab-shell" [hooks] -custom_hooks_dir = "/home/git/custom_hooks" +custom_hooks_dir = "%%PREFIX%%/git/custom_hooks" [gitlab] -secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" +secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret" +url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" # Only needed if a UNIX socket is used in `url` and GitLab is configured to # use a relative path (e.g. /gitlab). # relative_url_root = '/' diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 19fd7a0c66db..c45c9d730a3f 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,42 +1,39 @@ ---- ruby/Gemfile.orig 2022-04-20 09:55:22 UTC +--- ruby/Gemfile.orig 2022-05-20 13:52:23 UTC +++ ruby/Gemfile -@@ -2,7 +2,7 @@ source 'https://rubygems.org' +@@ -2,8 +2,8 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' -gem 'gitlab-markup', '~> 1.7.1' +-gem 'activesupport', '~> 6.1.4.7' +gem 'gitlab-markup', '~> 1.8.0' - gem 'activesupport', '~> 6.1.4.7' ++gem 'activesupport', '~> 6.1.4' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false -@@ -13,29 +13,10 @@ gem 'faraday', '~> 1.0' + gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false +@@ -13,24 +13,13 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.21.1' +gem 'gitlab-labkit', '~> 0.22.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' gem 'google-protobuf', '~> 3.19.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.42.0' -end -- --# Gems required in omnibus-gitlab pipeline --group :development, :test, :omnibus do -- # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is -- # resolved. For details, check discussion in -- # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881 -- gem 'gitlab-license_finder', require: false --end + + # Gems required in omnibus-gitlab pipeline + group :development, :test, :omnibus do