Date: Thu, 21 Jun 2018 15:32:01 +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: r472977 - in head/devel/gitaly: . files Message-ID: <201806211532.w5LFW1nA076802@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Thu Jun 21 15:32:00 2018 New Revision: 472977 URL: https://svnweb.freebsd.org/changeset/ports/472977 Log: Update gitaly to 0.100.0 required for gitlab 10.8. Reviewed by: mat, swills (mentor) Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D15947 Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Thu Jun 21 15:28:59 2018 (r472976) +++ head/devel/gitaly/Makefile Thu Jun 21 15:32:00 2018 (r472977) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.96.1 -PORTREVISION= 4 +DISTVERSION= 0.100.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -13,18 +12,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.16.2:devel/git \ - rubygem-rugged>=0.27.0:devel/rubygem-rugged \ + rubygem-rugged>=0.27.1:devel/rubygem-rugged \ rubygem-github-linguist53>=5.3.3:textproc/rubygem-github-linguist53 \ rubygem-bundler>0:sysutils/rubygem-bundler \ rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \ - rubygem-gitaly-proto095>=0.95.0:net/rubygem-gitaly-proto095 \ + rubygem-gitaly-proto099>=0.99.0:net/rubygem-gitaly-proto099 \ rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \ rubygem-rdoc>=4.2:devel/rubygem-rdoc \ - rubygem-gollum-lib-gitlab>=4.2:www/rubygem-gollum-lib-gitlab \ - rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \ - rubygem-grpc>=1.10.0:net/rubygem-grpc \ + rubygem-gitlab-gollum-lib>=4.2:www/rubygem-gitlab-gollum-lib \ + rubygem-gitlab-gollum-rugged_adapter>=0.4.4:www/rubygem-gitlab-gollum-rugged_adapter \ + rubygem-grpc>=1.11.0:net/rubygem-grpc \ rubygem-sentry-raven>=2.7.2:devel/rubygem-sentry-raven \ - rubygem-licensee8>=8.7.0:devel/rubygem-licensee8 \ + rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 BUILD_DEPENDS= go>=1.8:lang/go \ @@ -40,7 +39,7 @@ USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= d779c028099f79360209b92473c201e07721b885 +GL_COMMIT= 15606d3061414479453534814d32132bd9411617 post-patch: ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Thu Jun 21 15:28:59 2018 (r472976) +++ head/devel/gitaly/distinfo Thu Jun 21 15:32:00 2018 (r472977) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524579302 -SHA256 (gitlab-org-gitaly-d779c028099f79360209b92473c201e07721b885_GL0.tar.gz) = 8344bfff658433002444d756c3552b57ce7861b614efc2f3db42be68dd4aa4b5 -SIZE (gitlab-org-gitaly-d779c028099f79360209b92473c201e07721b885_GL0.tar.gz) = 3620431 +TIMESTAMP = 1529482774 +SHA256 (gitlab-org-gitaly-15606d3061414479453534814d32132bd9411617_GL0.tar.gz) = d93fd3c3481f65c918e2d8ebeeb0108ba68a9ce2106956799d24e862f77b0ba8 +SIZE (gitlab-org-gitaly-15606d3061414479453534814d32132bd9411617_GL0.tar.gz) = 4126919 Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Thu Jun 21 15:28:59 2018 (r472976) +++ head/devel/gitaly/files/patch-ruby_Gemfile Thu Jun 21 15:32:00 2018 (r472977) @@ -1,18 +1,15 @@ ---- ruby/Gemfile.orig 2018-04-12 00:44:37 UTC +--- ruby/Gemfile.orig 2018-06-20 08:20:28 UTC +++ ruby/Gemfile -@@ -8,17 +8,13 @@ gem 'activesupport', '~> 5.0.2' +@@ -8,7 +8,7 @@ gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' - gem 'gollum-lib', '~> 4.2', require: false - gem 'gollum-rugged_adapter', '~> 0.4.4', require: false + gem 'gitlab-gollum-lib', '~> 4.2', require: false + gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false -gem 'grpc', '~> 1.10.0' +gem 'grpc', '~> 1.11.0' gem 'sentry-raven', '~> 2.7.2', require: false # Detects the open source license the repository includes - # This version needs to be in sync with GitLab CE/EE --gem 'licensee', '~> 8.7.0' -+gem 'licensee', '~> 8.9' - +@@ -18,7 +18,3 @@ gem 'licensee', '~> 8.9.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Thu Jun 21 15:28:59 2018 (r472976) +++ head/devel/gitaly/pkg-plist Thu Jun 21 15:32:00 2018 (r472977) @@ -9,6 +9,7 @@ %%DATADIR%%/ruby/lib/gitaly_server/conflicts_service.rb %%DATADIR%%/ruby/lib/gitaly_server/diff_service.rb %%DATADIR%%/ruby/lib/gitaly_server/exception_sanitizer_interceptor.rb +%%DATADIR%%/ruby/lib/gitaly_server/health_service.rb %%DATADIR%%/ruby/lib/gitaly_server/operations_service.rb %%DATADIR%%/ruby/lib/gitaly_server/ref_service.rb %%DATADIR%%/ruby/lib/gitaly_server/remote_service.rb @@ -20,6 +21,8 @@ %%DATADIR%%/ruby/lib/gitlab/config.rb %%DATADIR%%/ruby/lib/gitlab/git.rb %%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.rb +%%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb +%%DATADIR%%/ruby/lib/gitlab/git/repository.rb %%DATADIR%%/ruby/lib/gitlab/git_logger.rb %%DATADIR%%/ruby/lib/gitlab/gitaly_client.rb %%DATADIR%%/ruby/lib/gitlab/gollum.rb @@ -47,6 +50,7 @@ %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/branch.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/commit.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/commit_stats.rb +%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/committer_with_hooks.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/compare.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/file.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/parser.rb @@ -54,18 +58,18 @@ %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/resolver.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/diff.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/diff_collection.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/env.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/gitlab_projects.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/gitmodules_parser.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hook.rb +%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hook_env.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hooks_service.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/index.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/info_attributes.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/lfs_changes.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/lfs_pointer_file.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/path_helper.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/popen.rb +%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/raw_diff_change.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/ref.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_mirror.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb @@ -80,6 +84,7 @@ %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage/forked_storage_check.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage/health.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage/null_circuit_breaker.rb +%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/support/format-git-cat-file-input %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/tag.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/tree.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/user.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806211532.w5LFW1nA076802>