Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jun 2020 19:59:04 +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: r537948 - in head/devel/gitaly: . files
Message-ID:  <202006041959.054Jx4lG050313@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Thu Jun  4 19:59:04 2020
New Revision: 537948
URL: https://svnweb.freebsd.org/changeset/ports/537948

Log:
  Update to 13.0.5 which is required for gitlab-ce 13.0.

Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/distinfo
  head/devel/gitaly/files/patch-__support_Makefile.template
  head/devel/gitaly/files/patch-config.toml.example
  head/devel/gitaly/files/patch-ruby_Gemfile
  head/devel/gitaly/pkg-plist

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Thu Jun  4 19:57:53 2020	(r537947)
+++ head/devel/gitaly/Makefile	Thu Jun  4 19:59:04 2020	(r537948)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	12.10.9
+DISTVERSION=	13.0.5
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -15,11 +15,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 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-github-linguist>=7.9<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.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-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 \
 		rubygem-grpc124>=1.24.0:net/rubygem-grpc124 \
 		rubygem-sentry-raven29>=2.9.0<2.10.0:devel/rubygem-sentry-raven29 \
@@ -42,22 +42,22 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	f808a6941594bdf4997daa33ad37ead0e272d7be
+GL_COMMIT=	86292a176c16f247d2d1948e526d2bdf0ad3339f
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 53dd
+# 54dd
 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 \
 		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:8392f1641731:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \
+		cloudflare:tableflip:4baec9811f2b:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \
 		codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		getsentry:sentry-go:v0.3.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
+		getsentry:sentry-go:v0.5.1:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
 		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 \
 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
@@ -100,7 +100,8 @@ 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:fac94cb428e67efc019e7ba67429b53fa9b394c5:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+GL_TUPLE=	gitlab-org:gitlab-shell:716e30c55e893ebe2385b27f85902a789f26c6ef:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \
+		gitlab-org:labkit:0149780c759d60f61fcfe1648fb882ba7ec41f3f: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	Thu Jun  4 19:57:53 2020	(r537947)
+++ head/devel/gitaly/distinfo	Thu Jun  4 19:59:04 2020	(r537948)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1591282641
+TIMESTAMP = 1591293558
 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
@@ -9,14 +9,14 @@ SHA256 (census-instrumentation-opencensus-go-v0.22.2_G
 SIZE (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 165321
 SHA256 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875
 SIZE (client9-reopen-v1.0.0_GH0.tar.gz) = 6283
-SHA256 (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 0fab510fb61d488f63c59485dadb166d7d5fac5ebbd65e6a3cacfc9fdd1fb6d3
-SIZE (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 12582
+SHA256 (cloudflare-tableflip-4baec9811f2b_GH0.tar.gz) = d9437a27968b8d30e3923c1da75f3fd5b4fca4ea537073a22a089ab35c2106cd
+SIZE (cloudflare-tableflip-4baec9811f2b_GH0.tar.gz) = 16376
 SHA256 (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 3ef6b86658bc370e027304e55a8685767f7fd8a94199f4bea08c9388bf84a1b0
 SIZE (codahale-hdrhistogram-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 (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 16907c25fc86802614579a6a8e638fe4bd65ba2c07a18ff5185de14e75bd878f
-SIZE (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 57823
+SHA256 (getsentry-sentry-go-v0.5.1_GH0.tar.gz) = d2f980bebe15ef7685aa15bb788c67ce3a7b82220050871321d82cf9a90d2231
+SIZE (getsentry-sentry-go-v0.5.1_GH0.tar.gz) = 70280
 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
@@ -99,7 +99,9 @@ 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-f808a6941594bdf4997daa33ad37ead0e272d7be_GL0.tar.gz) = 0a57d9a1d14b4f845d91add570c86e346c02e792cc304f275ee49d0488dd8ca2
-SIZE (gitlab-org-gitaly-f808a6941594bdf4997daa33ad37ead0e272d7be_GL0.tar.gz) = 2958804
-SHA256 (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 496439133ff65307b8ce231f1c2d1ed27359acfdea5b2826be6799590a65d2f7
-SIZE (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 3619731
+SHA256 (gitlab-org-gitaly-86292a176c16f247d2d1948e526d2bdf0ad3339f_GL0.tar.gz) = 34287192e9c4f9f32a67a94c4a3fc14c88ff653eb545fd08f96f47d57415dd28
+SIZE (gitlab-org-gitaly-86292a176c16f247d2d1948e526d2bdf0ad3339f_GL0.tar.gz) = 3007692
+SHA256 (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 9a2a40a6c44802b1de7ff46bc9c6bc97c8be179d0ca4fe755c22044650d3f84c
+SIZE (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 65840
+SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = fa3a9e6a6da58375427ee1814d95dba8d55bee13537492bba19480eae772ab95
+SIZE (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = 3671144

Modified: head/devel/gitaly/files/patch-__support_Makefile.template
==============================================================================
--- head/devel/gitaly/files/patch-__support_Makefile.template	Thu Jun  4 19:57:53 2020	(r537947)
+++ head/devel/gitaly/files/patch-__support_Makefile.template	Thu Jun  4 19:59:04 2020	(r537948)
@@ -1,6 +1,6 @@
---- _support/Makefile.template.orig	2020-04-20 15:09:52 UTC
+--- _support/Makefile.template.orig	2020-05-21 17:02:13 UTC
 +++ _support/Makefile.template
-@@ -33,8 +33,8 @@ build: ../.ruby-bundle
+@@ -43,8 +43,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-config.toml.example
==============================================================================
--- head/devel/gitaly/files/patch-config.toml.example	Thu Jun  4 19:57:53 2020	(r537947)
+++ head/devel/gitaly/files/patch-config.toml.example	Thu Jun  4 19:59:04 2020	(r537948)
@@ -1,4 +1,4 @@
---- config.toml.example.orig	2019-12-19 16:43:27 UTC
+--- config.toml.example.orig	2020-05-21 17:02:13 UTC
 +++ config.toml.example
 @@ -2,10 +2,10 @@
  # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
@@ -48,12 +48,18 @@
  
  # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
  # max_rss = 200000000
-@@ -85,7 +85,7 @@ dir = "/home/git/gitaly/ruby"
+@@ -85,10 +85,10 @@ dir = "/home/git/gitaly/ruby"
  
  [gitlab-shell]
  # The directory where gitlab-shell is installed
 -dir = "/home/git/gitlab-shell"
+-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
+-custom_hooks_dir = "/home/git/custom_hooks"
+-gitlab_url = "http://localhost:8080"
 +dir = "%%PREFIX%%/share/gitlab-shell"
++secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret"
++custom_hooks_dir = "%%PREFIX%%/git/custom_hooks"
++gitlab_url = "https://_change_to_gitlab_url_"
  
- # # You can adjust the concurrency of each RPC endpoint
- # [[concurrency]]
+ [gitlab-shell.http-settings]
+ # read_timeout = 300

Modified: head/devel/gitaly/files/patch-ruby_Gemfile
==============================================================================
--- head/devel/gitaly/files/patch-ruby_Gemfile	Thu Jun  4 19:57:53 2020	(r537947)
+++ head/devel/gitaly/files/patch-ruby_Gemfile	Thu Jun  4 19:59:04 2020	(r537948)
@@ -1,35 +1,18 @@
---- ruby/Gemfile.orig	2020-04-30 14:14:13 UTC
+--- ruby/Gemfile.orig	2020-05-21 17:02:13 UTC
 +++ ruby/Gemfile
-@@ -3,38 +3,24 @@ source 'https://rubygems.org'
+@@ -3,7 +3,7 @@ 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.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
--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
+ gem 'github-linguist', '~> 7.9', require: 'linguist'
+ gem 'gitlab-markup', '~> 1.7.1'
+ gem 'activesupport', '~> 6.0.3.1'
+@@ -24,19 +24,3 @@ gem 'licensee', '~> 8.9.0'
  
- # Labkit provides observability functionality
--gem 'gitlab-labkit', '~> 0.9.1'
-+gem 'gitlab-labkit', '~> 0.12.0'
+ gem 'google-protobuf', '~> 3.8.0'
  
- # Detects the open source license the repository includes
- # This version needs to be in sync with GitLab CE/EE
- gem 'licensee', '~> 8.9.0'
- 
--gem 'google-protobuf', '~> 3.11.2'
-+gem 'google-protobuf', '~> 3.8.0'
- 
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
 -  gem 'rspec', require: false
@@ -37,6 +20,8 @@
 -  gem 'timecop', require: false
 -  gem 'factory_bot', require: false
 -  gem 'pry', '~> 0.12.2', require: false
+-
+-  gem 'grpc-tools', '= 1.0.1'
 -
 -  # gitlab-shell spec gems
 -  gem 'listen', '~> 0.5.0'

Modified: head/devel/gitaly/pkg-plist
==============================================================================
--- head/devel/gitaly/pkg-plist	Thu Jun  4 19:57:53 2020	(r537947)
+++ head/devel/gitaly/pkg-plist	Thu Jun  4 19:59:04 2020	(r537948)
@@ -115,7 +115,6 @@
 %%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb
 %%DATADIR%%/ruby/lib/gitlab/git/popen.rb
 %%DATADIR%%/ruby/lib/gitlab/git/push_options.rb
-%%DATADIR%%/ruby/lib/gitlab/git/push_results.rb
 %%DATADIR%%/ruby/lib/gitlab/git/ref.rb
 %%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb
 %%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb
@@ -174,6 +173,8 @@
 %%DATADIR%%/ruby/proto/gitaly/smarthttp_services_pb.rb
 %%DATADIR%%/ruby/proto/gitaly/ssh_pb.rb
 %%DATADIR%%/ruby/proto/gitaly/ssh_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/transaction_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/transaction_services_pb.rb
 %%DATADIR%%/ruby/proto/gitaly/version.rb
 %%DATADIR%%/ruby/proto/gitaly/wiki_pb.rb
 %%DATADIR%%/ruby/proto/gitaly/wiki_services_pb.rb
@@ -184,6 +185,7 @@
 %%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/feature_flags_spec.rb
+%%DATADIR%%/ruby/spec/lib/gitaly_server/remote_service_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/utils_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb
@@ -199,7 +201,6 @@
 %%DATADIR%%/ruby/spec/lib/gitlab/git/lfs_changes_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/popen_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/push_options_spec.rb
-%%DATADIR%%/ruby/spec/lib/gitlab/git/push_results_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_mirror_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_client_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_spec.rb



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006041959.054Jx4lG050313>