Date: Sat, 23 Mar 2019 17:44:34 +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: r496673 - in head/devel/gitaly: . files Message-ID: <201903231744.x2NHiYe6020035@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Sat Mar 23 17:44:33 2019 New Revision: 496673 URL: https://svnweb.freebsd.org/changeset/ports/496673 Log: Upgrade to 1.27.0 which is required for gitlab 11.9. Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo 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 Sat Mar 23 17:43:31 2019 (r496672) +++ head/devel/gitaly/Makefile Sat Mar 23 17:44:33 2019 (r496673) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 1.20.0 +DISTVERSION= 1.27.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.18:devel/git \ rubygem-bundler>=1.16.5:sysutils/rubygem-bundler \ - rubygem-rugged>=0.27.4:devel/rubygem-rugged \ + rubygem-rugged>=0.28.0:devel/rubygem-rugged \ rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.6.5:textproc/rubygem-gitlab-markup \ - rubygem-gitaly-proto>=1.3.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=1.13.0:net/rubygem-gitaly-proto \ rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2:www/rubygem-gitlab-gollum-lib \ @@ -41,7 +41,7 @@ USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= b9c89add404cc106906f9e9ce5cec58224ae40bc +GL_COMMIT= 4bfe01bd85344df74b8a681e2e062c5898158665 post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Sat Mar 23 17:43:31 2019 (r496672) +++ head/devel/gitaly/distinfo Sat Mar 23 17:44:33 2019 (r496673) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551205518 -SHA256 (gitlab-org-gitaly-b9c89add404cc106906f9e9ce5cec58224ae40bc_GL0.tar.gz) = 6f5d6760e02e673e9e7e583d5f082c3673bfc2d236bc6c11a83dde47e3de8e5f -SIZE (gitlab-org-gitaly-b9c89add404cc106906f9e9ce5cec58224ae40bc_GL0.tar.gz) = 4652575 +TIMESTAMP = 1553170864 +SHA256 (gitlab-org-gitaly-4bfe01bd85344df74b8a681e2e062c5898158665_GL0.tar.gz) = cedb7f42243253dece99d063d6a4164cc2d2ef235f755148c8bb6acdb8900f4f +SIZE (gitlab-org-gitaly-4bfe01bd85344df74b8a681e2e062c5898158665_GL0.tar.gz) = 4691449 Modified: head/devel/gitaly/files/patch-__support_makegen.go ============================================================================== --- head/devel/gitaly/files/patch-__support_makegen.go Sat Mar 23 17:43:31 2019 (r496672) +++ head/devel/gitaly/files/patch-__support_makegen.go Sat Mar 23 17:44:33 2019 (r496673) @@ -1,6 +1,6 @@ ---- _support/makegen.go.orig 2019-02-14 18:35:35 UTC +--- _support/makegen.go.orig 2019-03-11 20:46:03 UTC +++ _support/makegen.go -@@ -230,7 +230,7 @@ var templateText = ` +@@ -253,7 +253,7 @@ var templateText = ` # These variables may be overriden at runtime by top-level make PREFIX ?= /usr/local INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ @@ -9,7 +9,7 @@ ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly BUILD_TAGS := tracer_static tracer_static_jaeger -@@ -251,7 +251,7 @@ build: ../.ruby-bundle +@@ -274,7 +274,7 @@ build: ../.ruby-bundle # _build. Hence the '../' in front. ../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile cd {{ .GitalyRubyDir }} && bundle config # for debugging Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 23 17:43:31 2019 (r496672) +++ head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 23 17:44:33 2019 (r496673) @@ -1,15 +1,15 @@ ---- ruby/Gemfile.orig 2019-02-14 18:35:35 UTC +--- ruby/Gemfile.orig 2019-03-11 20:46:03 UTC +++ ruby/Gemfile @@ -8,7 +8,7 @@ gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.5' - gem 'gitaly-proto', '~> 1.10.0' + gem 'gitaly-proto', '~> 1.13.0' gem 'activesupport', '~> 5.0.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false gem 'grpc', '~> 1.15.0' -@@ -22,16 +22,3 @@ gem 'licensee', '~> 8.9.0' +@@ -22,17 +22,3 @@ gem 'licensee', '~> 8.9.0' gem 'google-protobuf', '~> 3.6' @@ -19,6 +19,7 @@ - gem 'rspec-parameterized', require: false - gem 'timecop', require: false - gem 'factory_bot', require: false +- gem 'pry', '~> 0.12.2', require: false - - # gitlab-shell spec gems - gem 'listen', '~> 0.5.0' Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Sat Mar 23 17:43:31 2019 (r496672) +++ head/devel/gitaly/pkg-plist Sat Mar 23 17:44:33 2019 (r496673) @@ -4,7 +4,6 @@ @(,,555) %%DATADIR%%/ruby/bin/ruby-cd %%DATADIR%%/ruby/.rubocop.yml %%DATADIR%%/ruby/.rubocop_todo.yml -%%DATADIR%%/ruby/git-hooks/gitlab-shell-hook %%DATADIR%%/ruby/git-hooks/post-receive %%DATADIR%%/ruby/git-hooks/pre-receive %%DATADIR%%/ruby/git-hooks/update @@ -32,7 +31,6 @@ %%DATADIR%%/ruby/lib/gitlab/git/branch.rb %%DATADIR%%/ruby/lib/gitlab/git/commit.rb %%DATADIR%%/ruby/lib/gitlab/git/commit_patches.rb -%%DATADIR%%/ruby/lib/gitlab/git/commit_stats.rb %%DATADIR%%/ruby/lib/gitlab/git/committer_with_hooks.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/file.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/parser.rb @@ -139,9 +137,6 @@ %%DATADIR%%/ruby/vendor/gitlab-shell/bin/install %%DATADIR%%/ruby/vendor/gitlab-shell/bin/test-logger %%DATADIR%%/ruby/vendor/gitlab-shell/config.yml.example -%%DATADIR%%/ruby/vendor/gitlab-shell/hooks/post-receive -%%DATADIR%%/ruby/vendor/gitlab-shell/hooks/pre-receive -%%DATADIR%%/ruby/vendor/gitlab-shell/hooks/update %%DATADIR%%/ruby/vendor/gitlab-shell/lib/action.rb %%DATADIR%%/ruby/vendor/gitlab-shell/lib/action/custom.rb %%DATADIR%%/ruby/vendor/gitlab-shell/lib/gitlab_access.rb @@ -224,7 +219,12 @@ %%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml %%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml %%DATADIR%%/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml +@(,,555) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook +@(,,555) %%DATADIR%%/ruby/vendor/gitlab-shell/hooks/post-receive +@(,,555) %%DATADIR%%/ruby/vendor/gitlab-shell/hooks/pre-receive +@(,,555) %%DATADIR%%/ruby/vendor/gitlab-shell/hooks/update @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-debug @(,,555) %%DATADIR%%/bin/gitaly-ssh +@(,,555) %%DATADIR%%/bin/praefect @sample %%DATADIR%%/config.toml.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903231744.x2NHiYe6020035>