Date: Thu, 23 Sep 2021 19:42:34 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ddc11484938 - main - devel/gitaly: Update to 14.3.0 Message-ID: <202109231942.18NJgYrM063163@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ddc1148493845364bd66087026afa850046df8c commit 2ddc1148493845364bd66087026afa850046df8c Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2021-09-22 15:25:49 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2021-09-23 19:42:04 +0000 devel/gitaly: Update to 14.3.0 Required for gitlab-ce 14.3. --- devel/gitaly/Makefile | 35 +++++++++++++++---- devel/gitaly/distinfo | 52 ++++++++++++++++++++++++++-- devel/gitaly/files/patch-Makefile | 12 +++---- devel/gitaly/files/patch-config.toml.example | 11 +++++- 4 files changed, 94 insertions(+), 16 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 55603a54d69c..8f793ffd6269 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly -DISTVERSION= 14.2.2 -PORTREVISION= 1 +DISTVERSION= 14.3.0 +PORTREVISION= 0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -33,7 +33,7 @@ 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 +USES= cpe gmake go:modules,no_targets pkgconfig USE_RUBY= yes MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" @@ -43,12 +43,12 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 94000ca352ea7d2c730cd913e7365690463a61b6 +GL_COMMIT= 1a0e5d9b50a5ae76b5a11fd09cf66d2213ffbef6 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 115dd +# 137dd 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 \ @@ -75,21 +75,30 @@ GH_TUPLE= \ 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:38f3c27a63bf: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 \ @@ -118,14 +127,19 @@ GH_TUPLE= \ 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 \ + 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 \ 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 \ @@ -134,6 +148,9 @@ GH_TUPLE= \ 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 \ @@ -150,8 +167,12 @@ GH_TUPLE= \ 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:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \ @@ -160,7 +181,9 @@ GH_TUPLE= \ 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 + 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 diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index cc97bab87a64..ce843681dac1 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1630441867 +TIMESTAMP = 1632233264 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 @@ -49,10 +49,16 @@ SHA256 (coreos-go-systemd-v22.3.1_GH0.tar.gz) = aa7001afc1f25ebb424bb6f53fc6fb3a 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 @@ -65,10 +71,20 @@ SHA256 (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = f42d0b92162e3b104d79ec86281c 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 @@ -79,6 +95,8 @@ SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d81333 SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007 SHA256 (golang-crypto-38f3c27a63bf_GH0.tar.gz) = b55bc13c8a313ed80310a84eb7cceb303532774439493636a89b17c170250e31 SIZE (golang-crypto-38f3c27a63bf_GH0.tar.gz) = 1731839 +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 @@ -135,6 +153,12 @@ SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e907169 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 (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 @@ -145,12 +169,16 @@ SHA256 (jcmturner-gokrb5-v5.3.0_GH0.tar.gz) = a33a482f48b9b230cccee66e3d5335c23f 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 (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 @@ -167,6 +195,12 @@ SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22 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 @@ -199,10 +233,18 @@ SHA256 (rubenv-sql-migrate-06338513c237_GH0.tar.gz) = 922ed3e65f2fa3ad337259253b 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 @@ -221,8 +263,12 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5 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-94000ca352ea7d2c730cd913e7365690463a61b6_GL0.tar.gz) = b28150d856f186bb80a3e0f7b9275fd2032e346f232d17b588665217cf6b2c8f -SIZE (gitlab-org-gitaly-94000ca352ea7d2c730cd913e7365690463a61b6_GL0.tar.gz) = 3625321 +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-1a0e5d9b50a5ae76b5a11fd09cf66d2213ffbef6_GL0.tar.gz) = 7c7b2dfa3bc235104c11fcb334421fb0cb10da4bf7a7664443d988b23a3725e3 +SIZE (gitlab-org-gitaly-1a0e5d9b50a5ae76b5a11fd09cf66d2213ffbef6_GL0.tar.gz) = 3672411 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 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 717aa0177e0a..3e742b7462d6 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,15 +1,15 @@ ---- Makefile.orig 2021-08-23 16:25:31 UTC +--- Makefile.orig 2021-09-21 10:03:53 UTC +++ Makefile -@@ -242,7 +242,7 @@ help: +@@ -287,7 +287,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. -@@ -433,9 +433,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a + ${Q}# We use version suffix for the gitaly-git2go binary to support compatibility contract between + ${Q}# gitaly and gitaly-git2go during upgrade deployment. +@@ -468,9 +468,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 -@@ -503,7 +501,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI +@@ -546,7 +544,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-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 79221efafd18..52a2caa92848 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2021-06-17 15:17:56 UTC +--- config.toml.example.orig 2021-09-21 10:03:53 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and @@ -13,6 +13,15 @@ # # 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: 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" # certificate_path = '/home/git/cert.cert' # key_path = '/home/git/key.pem'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109231942.18NJgYrM063163>