Date: Wed, 20 May 2020 06:06:35 +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: r535975 - in head/devel/gitaly: . files Message-ID: <202005200606.04K66ZP3029897@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Wed May 20 06:06:35 2020 New Revision: 535975 URL: https://svnweb.freebsd.org/changeset/ports/535975 Log: Update to 12.10.6 which is required for gitlab-ce 12.10.6 upgrade. Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-__support_Makefile.template head/devel/gitaly/files/patch-__support_makegen.go head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Wed May 20 06:05:41 2020 (r535974) +++ head/devel/gitaly/Makefile Wed May 20 06:06:35 2020 (r535975) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 12.9.5 +DISTVERSION= 12.10.6 PORTREVISION= 0 CATEGORIES= devel @@ -12,23 +12,24 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.24.3:devel/git \ +MY_DEPENDS= git>=2.26:devel/git \ rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \ rubygem-rugged>=0.28:devel/rubygem-rugged \ rubygem-github-linguist>=7.5<8.0:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport60>=6.0.2.2<6.0.2.3:devel/rubygem-activesupport60 \ + rubygem-activesupport60>=6.0.3.1<6.0.3.2:devel/rubygem-activesupport60 \ rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.8<4.2.8.0:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ - rubygem-grpc124>=1.24.0<1.25.0:net/rubygem-grpc124 \ + rubygem-grpc124>=1.24.0:net/rubygem-grpc124 \ rubygem-sentry-raven29>=2.9.0<2.10.0:devel/rubygem-sentry-raven29 \ rubygem-faraday>=0.12<1.0:www/rubygem-faraday \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ - rubygem-gitlab-labkit>=0.11.0<0.11.1:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.12.0<0.12.1:devel/rubygem-gitlab-labkit \ rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \ rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 BUILD_DEPENDS= gem:devel/ruby-gems \ + bash>0:shells/bash \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=9.3.0:devel/gitlab-shell @@ -41,12 +42,12 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 982f91e3c6f073c7c043cded0e29cd42e9a6b951 +GL_COMMIT= de65813a201020830bc6da809e5349caf1dac33e # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 52dd +# 53dd 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 \ @@ -70,7 +71,7 @@ GH_TUPLE= \ google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \ google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ - googleapis:gax-go:v2.0.5:googleapis_gax_go/vendor/github.com/googleapis/gax-go/v2 \ + googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \ googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ googleapis:google-cloud-go:v0.50.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ @@ -79,9 +80,10 @@ GH_TUPLE= \ 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 \ lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \ - libgit2:git2go:ecaeb7a21d47:libgit2_git2go/vendor/github.com/libgit2/git2go \ lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ + 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 \ opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ @@ -98,7 +100,7 @@ GH_TUPLE= \ 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:labkit:9cb7801f7feafecc53f5a061ffeae5c11567da9b:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit +GL_TUPLE= gitlab-org:labkit:fac94cb428e67efc019e7ba67429b53fa9b394c5:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Wed May 20 06:05:41 2020 (r535974) +++ head/devel/gitaly/distinfo Wed May 20 06:06:35 2020 (r535975) @@ -1,4 +1,4 @@ -TIMESTAMP = 1588326767 +TIMESTAMP = 1589649477 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 @@ -61,12 +61,14 @@ SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2 SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987 SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083 -SHA256 (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 2a7cd9579aad7f046795f26c17a92d79f6caded6a512cc37d366a6ae7e28b396 -SIZE (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 72760 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-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 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff @@ -97,7 +99,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b 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-982f91e3c6f073c7c043cded0e29cd42e9a6b951_GL0.tar.gz) = 04dc67e7bc74bd43385a67fff05c98c073c2936cc967755f503d3b9736530b78 -SIZE (gitlab-org-gitaly-982f91e3c6f073c7c043cded0e29cd42e9a6b951_GL0.tar.gz) = 2909758 -SHA256 (gitlab-org-labkit-9cb7801f7feafecc53f5a061ffeae5c11567da9b_GL0.tar.gz) = 03473dec168ecb298a1733fc8b5016f1e09f47214b5080dc4986dda73227788b -SIZE (gitlab-org-labkit-9cb7801f7feafecc53f5a061ffeae5c11567da9b_GL0.tar.gz) = 3619617 +SHA256 (gitlab-org-gitaly-de65813a201020830bc6da809e5349caf1dac33e_GL0.tar.gz) = f20511fbaced6c2573b266bfe5c2929c7704bee774d5b92bc422d92b2c58c152 +SIZE (gitlab-org-gitaly-de65813a201020830bc6da809e5349caf1dac33e_GL0.tar.gz) = 2958790 +SHA256 (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 496439133ff65307b8ce231f1c2d1ed27359acfdea5b2826be6799590a65d2f7 +SIZE (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 3619731 Modified: head/devel/gitaly/files/patch-__support_Makefile.template ============================================================================== --- head/devel/gitaly/files/patch-__support_Makefile.template Wed May 20 06:05:41 2020 (r535974) +++ head/devel/gitaly/files/patch-__support_Makefile.template Wed May 20 06:06:35 2020 (r535975) @@ -1,6 +1,6 @@ ---- _support/Makefile.template.orig 2020-03-26 12:14:05 UTC +--- _support/Makefile.template.orig 2020-04-20 15:09:52 UTC +++ _support/Makefile.template -@@ -56,8 +56,8 @@ build: ../.ruby-bundle +@@ -33,8 +33,8 @@ build: ../.ruby-bundle # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile Modified: head/devel/gitaly/files/patch-__support_makegen.go ============================================================================== --- head/devel/gitaly/files/patch-__support_makegen.go Wed May 20 06:05:41 2020 (r535974) +++ head/devel/gitaly/files/patch-__support_makegen.go Wed May 20 06:06:35 2020 (r535975) @@ -1,6 +1,6 @@ ---- _support/makegen.go.orig 2020-03-27 21:35:27 UTC +--- _support/makegen.go.orig 2020-04-20 15:09:52 UTC +++ _support/makegen.go -@@ -339,7 +339,7 @@ func (gm *gitalyMake) BundleFlags() string { +@@ -318,7 +318,7 @@ func (gm *gitalyMake) BundleFlags() string { return "--no-deployment" } Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Wed May 20 06:05:41 2020 (r535974) +++ head/devel/gitaly/files/patch-ruby_Gemfile Wed May 20 06:06:35 2020 (r535975) @@ -1,30 +1,34 @@ ---- ruby/Gemfile.orig 2020-03-26 12:14:05 UTC +--- ruby/Gemfile.orig 2020-04-30 14:14:13 UTC +++ ruby/Gemfile -@@ -3,10 +3,10 @@ +@@ -3,38 +3,24 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 gem 'bundler', '>= 1.17.3' - + -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0' gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '6.0.2' -+gem 'activesupport', '6.0.2.2' ++gem 'activesupport', '6.0.3.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -@@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' +-gem 'grpc', '~> 1.27.0' ++gem 'grpc', '~> 1.24' + gem 'sentry-raven', '~> 2.9.0', require: false + gem 'faraday', '~> 0.12' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.9.1' -+gem 'gitlab-labkit', '~> 0.11.0' ++gem 'gitlab-labkit', '~> 0.12.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE -@@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0' + gem 'licensee', '~> 8.9.0' - gem 'google-protobuf', '~> 3.8.0' +-gem 'google-protobuf', '~> 3.11.2' ++gem 'google-protobuf', '~> 3.8.0' -group :development, :test do - gem 'rubocop', '~> 0.69', require: false Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Wed May 20 06:05:41 2020 (r535974) +++ head/devel/gitaly/pkg-plist Wed May 20 06:06:35 2020 (r535975) @@ -59,12 +59,9 @@ %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml @@ -228,6 +225,7 @@ %%DATADIR%%/ruby/spec/support/helpers/gitlab_shell_helper.rb %%DATADIR%%/ruby/spec/support/helpers/integration_helper.rb %%DATADIR%%/ruby/spec/support/helpers/seed_repo.rb +%%DATADIR%%/ruby/spec/support/helpers/testdata/home/.gitconfig %%DATADIR%%/ruby/spec/support/sentry.rb %%DATADIR%%/ruby/spec/test_repo_helper.rb @(,,755) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook @@ -235,6 +233,7 @@ @(,,755) %%DATADIR%%/ruby/gitlab-shell/hooks/pre-receive @(,,755) %%DATADIR%%/ruby/gitlab-shell/hooks/update @(,,555) %%DATADIR%%/bin/gitaly +@(,,555) %%DATADIR%%/bin/gitaly-blackbox @(,,555) %%DATADIR%%/bin/gitaly-debug @(,,555) %%DATADIR%%/bin/gitaly-hooks @(,,555) %%DATADIR%%/bin/gitaly-ssh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005200606.04K66ZP3029897>