Date: Fri, 23 Oct 2020 04:45:55 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553069 - in head/devel/gitaly: . files Message-ID: <202010230445.09N4jtB4067023@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Fri Oct 23 04:45:54 2020 New Revision: 553069 URL: https://svnweb.freebsd.org/changeset/ports/553069 Log: Upgrade to 13.5.0 which is required fÃŒr gitlab-ce 13.5. Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-Makefile head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Fri Oct 23 04:29:32 2020 (r553068) +++ head/devel/gitaly/Makefile Fri Oct 23 04:45:54 2020 (r553069) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.4.4 +DISTVERSION= 13.5.0 PORTREVISION= 0 CATEGORIES= devel @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.28:devel/git \ rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \ rubygem-rugged>=0.28:devel/rubygem-rugged \ - rubygem-github-linguist>=7.9<8.0:textproc/rubygem-github-linguist \ + rubygem-github-linguist>=7.11<8.0:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport60>=6.0.3.1<6.0.4:devel/rubygem-activesupport60 \ + rubygem-activesupport60>=6.0.3.3<6.0.4:devel/rubygem-activesupport60 \ rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.9<4.2.8:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ @@ -43,31 +43,39 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= e2faf9c14a626740fc415d637648b649482945a1 +GL_COMMIT= 2ab91ba999dc8cea4357d077a802c65a226ecf77 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 55dd +# 74dd GH_TUPLE= \ - BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ + 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.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \ cloudflare:tableflip:4baec9811f2b:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \ HdrHistogram:hdrhistogram-go:3a0bb77429bd:codahale_hdrhistogram_go/vendor/github.com/codahale/hdrhistogram \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ + dpotapov:go-spnego:c2c609116ad0:dpotapov_go_spnego/vendor/github.com/dpotapov/go-spnego \ getsentry:sentry-go:v0.5.1:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \ + git-lfs:git-lfs:9ea4eed5b112:git_lfs_git_lfs/vendor/github.com/git-lfs/git-lfs \ + git-lfs:gitobj:v2.0.0: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:go-ntlm:c5056e7fa066:git_lfs_go_ntlm/vendor/github.com/git-lfs/go-ntlm \ + 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-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \ + golang:crypto:5c72a883971a:golang_crypto/vendor/golang.org/x/crypto \ golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \ - golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \ + golang:net:62affa334b73:golang_net/vendor/golang.org/x/net \ golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \ - golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \ + golang:sync:6e8e738ad208:golang_sync/vendor/golang.org/x/sync \ + golang:sys:af09f7315aff:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \ @@ -78,15 +86,24 @@ GH_TUPLE= \ grpc-ecosystem:go-grpc-middleware:v1.0.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.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \ + hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \ + 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 \ - konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ + konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \ libgit2:git2go:v30.0.5:libgit2_git2go_v30/vendor/github.com/libgit2/git2go/v30 \ lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ + 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 \ olekukonko:tablewriter:v0.0.2:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \ + olekukonko:ts:78ecb04241c0:olekukonko_ts/vendor/github.com/olekukonko/ts \ opentracing:opentracing-go:v1.0.2: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.8.1:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ @@ -95,14 +112,16 @@ GH_TUPLE= \ prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \ prometheus:procfs:v0.0.3:prometheus_procfs/vendor/github.com/prometheus/procfs \ 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:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \ - sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \ + sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ + ssgelm:cookiejarparser:v1.0.1:ssgelm_cookiejarparser/vendor/github.com/ssgelm/cookiejarparser \ + stretchr:testify:v1.5.1:stretchr_testify/vendor/github.com/stretchr/testify \ tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \ uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \ uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib -GL_TUPLE= gitlab-org:gitlab-shell:82ec8144fb2a04d78f29ae5d1f4e5a407257309f:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ +GL_TUPLE= gitlab-org:gitlab-shell:1a2bfecd2f0ebb8e31f9833e0522c4643797041b:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ gitlab-org:labkit:45895e1290291a2519678a847a24edb22880b9e6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Fri Oct 23 04:29:32 2020 (r553068) +++ head/devel/gitaly/distinfo Fri Oct 23 04:45:54 2020 (r553069) @@ -1,8 +1,10 @@ -TIMESTAMP = 1602793309 -SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f -SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 +TIMESTAMP = 1603355137 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111 +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.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d @@ -15,26 +17,40 @@ SHA256 (HdrHistogram-hdrhistogram-go-3a0bb77429bd_GH0. SIZE (HdrHistogram-hdrhistogram-go-3a0bb77429bd_GH0.tar.gz) = 7738 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 +SHA256 (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 8093037eed2321f7496b3f66a3396e798463a2bb7dbf7e8bf9b0b54bc7c20a97 +SIZE (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 4294 SHA256 (getsentry-sentry-go-v0.5.1_GH0.tar.gz) = d2f980bebe15ef7685aa15bb788c67ce3a7b82220050871321d82cf9a90d2231 SIZE (getsentry-sentry-go-v0.5.1_GH0.tar.gz) = 70280 +SHA256 (git-lfs-git-lfs-9ea4eed5b112_GH0.tar.gz) = 0801cb7867005791509ce7e01cb1680ec5faa48e966135110ac559d4403e8a16 +SIZE (git-lfs-git-lfs-9ea4eed5b112_GH0.tar.gz) = 2848559 +SHA256 (git-lfs-gitobj-v2.0.0_GH0.tar.gz) = 77ff7ff8afa525e3ce5d99a9006755a2817f25ae6c6eeb1279b36b6513828792 +SIZE (git-lfs-gitobj-v2.0.0_GH0.tar.gz) = 95953 +SHA256 (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = f42d0b92162e3b104d79ec86281c7c1f16a40b0a9ae4d311003fe4c0bce03e89 +SIZE (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = 8477 +SHA256 (git-lfs-go-ntlm-c5056e7fa066_GH0.tar.gz) = 256d2e1af8c1613004a60e87ea2035c14aa585d91ecc41ed938f51a331ee42c2 +SIZE (git-lfs-go-ntlm-c5056e7fa066_GH0.tar.gz) = 32949 +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-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045 -SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732 +SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07 +SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816 SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316 SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903 +SHA256 (golang-crypto-5c72a883971a_GH0.tar.gz) = 2b8df0754ba64c95786bc5fe2071cadf4757f754e774f5985d725c1aaa6cb3d8 +SIZE (golang-crypto-5c72a883971a_GH0.tar.gz) = 1732429 SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70 SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040 -SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d -SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285 +SHA256 (golang-net-62affa334b73_GH0.tar.gz) = abc8bc764836181f0b510d48efcfbaaf9ad8858f799b23e4bbc6fa73291ffd23 +SIZE (golang-net-62affa334b73_GH0.tar.gz) = 1179195 SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8 SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 -SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393 -SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956 -SHA256 (golang-sys-86b910548bc1_GH0.tar.gz) = d078511490f41a676d909de4f1a319ea332819b72c527f4ea735313cc9391e49 -SIZE (golang-sys-86b910548bc1_GH0.tar.gz) = 1534522 +SHA256 (golang-sync-6e8e738ad208_GH0.tar.gz) = 011eb5dc95a0ede8be5d68edde93be5af1b88d7fc098d0f74c6f7560beb378f0 +SIZE (golang-sync-6e8e738ad208_GH0.tar.gz) = 17288 +SHA256 (golang-sys-af09f7315aff_GH0.tar.gz) = 42f744f4f5ce6019a7a52a5cfa417d4422bb054a397b3ca663151d3865b24e80 +SIZE (golang-sys-af09f7315aff_GH0.tar.gz) = 1063254 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332 SHA256 (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 06778b867759fad0b06fac4067911e616184aa40061cbd37cffaa950399ad7d4 @@ -55,24 +71,42 @@ SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.t SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074 +SHA256 (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 2dee0f810c3e3a2cd3d49a075d0a64a88806c90712a4b66013b20a1ff0562eae +SIZE (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 7058 +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 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe -SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987 +SHA256 (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 0fe1169bb05476f0a3270866cdd9b39b7986a1dce556f6508046ac5f0c5ad8f3 +SIZE (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 1983 SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083 SHA256 (libgit2-git2go-v30.0.5_GH0.tar.gz) = 114d374b81f8d6d342b3a426ee778e8836db4f3e9d002c26083c2b9576a1a973 SIZE (libgit2-git2go-v30.0.5_GH0.tar.gz) = 85156 SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14 SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986 +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 (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 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 +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.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 @@ -89,21 +123,25 @@ SHA256 (prometheus-procfs-v0.0.3_GH0.tar.gz) = 3af9b80 SIZE (prometheus-procfs-v0.0.3_GH0.tar.gz) = 91880 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-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e148324eff67b69524b0ef766d64050d9e3 SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000 -SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9 -SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373 -SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698 -SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085 +SHA256 (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 536151aa2fed39e2b74925f81c8cd31f0c02c013881ba2d30982731d12424ed0 +SIZE (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 45748 +SHA256 (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 8989734dc34c4cbd7841a98d96c4d9dbe3184be27f5b3a5d3a8e377d17a7f2f3 +SIZE (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 3237 +SHA256 (stretchr-testify-v1.5.1_GH0.tar.gz) = 6d65f92aeff186bb261dbdb885d9f3ba09db3d79eb5f212fcace1fd4a2858263 +SIZE (stretchr-testify-v1.5.1_GH0.tar.gz) = 78657 SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570 SIZE (tinylib-msgp-v1.1.0_GH0.tar.gz) = 77923 SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137df072e2c1f7b15feb69a8ef8963804c44c94 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655 -SHA256 (gitlab-org-gitaly-e2faf9c14a626740fc415d637648b649482945a1_GL0.tar.gz) = 2302ad12f5815c3e22234f4252ce30603a44c7aa0efbf2b807f889655dfc4cfa -SIZE (gitlab-org-gitaly-e2faf9c14a626740fc415d637648b649482945a1_GL0.tar.gz) = 3134480 -SHA256 (gitlab-org-gitlab-shell-82ec8144fb2a04d78f29ae5d1f4e5a407257309f_GL0.tar.gz) = f2cf085e3ce5f5b36efe70270a523c30eac56b61443d61786130082a136457e6 -SIZE (gitlab-org-gitlab-shell-82ec8144fb2a04d78f29ae5d1f4e5a407257309f_GL0.tar.gz) = 82364 +SHA256 (gitlab-org-gitaly-2ab91ba999dc8cea4357d077a802c65a226ecf77_GL0.tar.gz) = 0d047b2096a82c499c7d157c9f3d8c4f09023d0cf0f4430ed869bf60c2ca3c6a +SIZE (gitlab-org-gitaly-2ab91ba999dc8cea4357d077a802c65a226ecf77_GL0.tar.gz) = 3191610 +SHA256 (gitlab-org-gitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b_GL0.tar.gz) = 1e12b1d55928131ac24d9eae147b98c871f9a9139da5dd8011ce27e42c3083a1 +SIZE (gitlab-org-gitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b_GL0.tar.gz) = 82494 SHA256 (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 4aa5c67e6b864d3e52705ac4401f47286af9af88c00fa338ef22a451db617011 SIZE (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 66930 Modified: head/devel/gitaly/files/patch-Makefile ============================================================================== --- head/devel/gitaly/files/patch-Makefile Fri Oct 23 04:29:32 2020 (r553068) +++ head/devel/gitaly/files/patch-Makefile Fri Oct 23 04:45:54 2020 (r553069) @@ -1,4 +1,4 @@ ---- Makefile.orig 2020-09-21 16:21:08 UTC +--- Makefile.orig 2020-10-21 18:08:19 UTC +++ Makefile @@ -46,7 +46,7 @@ GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertura @@ -9,18 +9,7 @@ GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) -@@ -147,7 +147,10 @@ export GOPROXY ?= https://proxy.gola - export PATH := ${BUILD_DIR}/bin:${PATH} - export PKG_CONFIG_PATH := ${LIBGIT2_INSTALL_DIR}/lib/pkgconfig - export GITALY_TESTING_GIT_BINARY ?= ${GIT_INSTALL_DIR}/bin/git -+# Whiteliste the linker flag -D_THREAD_SAFE as libgit2 is compiled with it -+export CGO_LDFLAGS_ALLOW=-D_THREAD_SAFE - -+ - .NOTPARALLEL: - - .PHONY: all -@@ -155,7 +158,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} +@@ -157,7 +157,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} all: install .PHONY: build @@ -29,7 +18,7 @@ go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands)) .PHONY: install -@@ -193,7 +196,7 @@ assemble-ruby: +@@ -195,7 +195,7 @@ assemble-ruby: .PHONY: binaries binaries: assemble ${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi @@ -38,7 +27,7 @@ .PHONY: prepare-tests prepare-tests: git ${GITLAB_SHELL_DIR}/config.yml ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle -@@ -349,8 +352,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -354,8 +354,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 @@ -48,7 +37,7 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -380,17 +382,17 @@ ${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR} +@@ -385,17 +384,17 @@ ${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR} # jobs of a CI pipeline, we start depending on its hash. Like this, we only # rebuild if the Makefile actually has changed contents. ${BUILD_DIR}/Makefile.sha256: Makefile | ${BUILD_DIR} Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Fri Oct 23 04:29:32 2020 (r553068) +++ head/devel/gitaly/files/patch-ruby_Gemfile Fri Oct 23 04:45:54 2020 (r553069) @@ -1,4 +1,4 @@ ---- ruby/Gemfile.orig 2020-10-01 12:46:36 UTC +--- ruby/Gemfile.orig 2020-10-21 18:08:19 UTC +++ ruby/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 @@ -6,9 +6,9 @@ -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0' - gem 'github-linguist', '~> 7.9', require: 'linguist' + gem 'github-linguist', '~> 7.11', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' - gem 'activesupport', '~> 6.0.3.1' + gem 'activesupport', '~> 6.0.3.3' @@ -24,19 +24,3 @@ gem 'licensee', '~> 8.9.0' gem 'google-protobuf', '~> 3.12' Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Fri Oct 23 04:29:32 2020 (r553068) +++ head/devel/gitaly/pkg-plist Fri Oct 23 04:45:54 2020 (r553069) @@ -241,6 +241,7 @@ @(,,555) %%DATADIR%%/bin/gitaly-debug @(,,555) %%DATADIR%%/bin/gitaly-git2go @(,,555) %%DATADIR%%/bin/gitaly-hooks +@(,,555) %%DATADIR%%/bin/gitaly-lfs-smudge @(,,555) %%DATADIR%%/bin/gitaly-ssh @(,,555) %%DATADIR%%/bin/gitaly-wrapper @(,,555) %%DATADIR%%/bin/praefect
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010230445.09N4jtB4067023>