summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/gitaly/Makefile4
-rw-r--r--devel/gitaly/distinfo6
-rw-r--r--devel/gitaly/files/patch-ruby_Gemfile2
-rw-r--r--devel/gitaly/pkg-plist38
4 files changed, 20 insertions, 30 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index c1d1e76edcc3..c901589a520b 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitaly
-DISTVERSION= 0.120.1
+DISTVERSION= 0.125.1
PORTREVISION= 1
CATEGORIES= devel
@@ -42,7 +42,7 @@ USE_RUBY= yes
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT= 5a739d657452de73137c2a0cb7d171c40fa3557a
+GL_COMMIT= 076f3b0710ac07af5530ff20618e3fc27a5aead7
post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 10319c1006e6..6981a6e3fbc3 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538419557
-SHA256 (gitlab-org-gitaly-5a739d657452de73137c2a0cb7d171c40fa3557a_GL0.tar.gz) = 1bc5e27bef1ae2ff6c69f8a04afbd8db954562d3888398226e281a4004ea5ea0
-SIZE (gitlab-org-gitaly-5a739d657452de73137c2a0cb7d171c40fa3557a_GL0.tar.gz) = 3608844
+TIMESTAMP = 1540328037
+SHA256 (gitlab-org-gitaly-076f3b0710ac07af5530ff20618e3fc27a5aead7_GL0.tar.gz) = 7d4f62b68b5e8b587024a3db5833285068bb25d77b3f40c440bbeb3a9d9418f0
+SIZE (gitlab-org-gitaly-076f3b0710ac07af5530ff20618e3fc27a5aead7_GL0.tar.gz) = 3603356
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 2fe6c3527205..e3c83d8f01f2 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -8,7 +8,7 @@
+gem 'github-linguist', '~> 5.3', require: 'linguist'
gem 'gitlab-markup', '~> 1.6.4'
-gem 'gitaly-proto', '~> 0.116.0', require: 'gitaly'
-+gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
++gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
gem 'activesupport', '~> 5.0.2'
-gem 'rdoc', '~> 4.2'
+gem 'rdoc', '~> 6.0'
diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist
index 7343457a8688..d4c34d8f9b4d 100644
--- a/devel/gitaly/pkg-plist
+++ b/devel/gitaly/pkg-plist
@@ -19,33 +19,44 @@
%%DATADIR%%/ruby/lib/gitaly_server/utils.rb
%%DATADIR%%/ruby/lib/gitaly_server/wiki_service.rb
%%DATADIR%%/ruby/lib/gitlab/config.rb
+%%DATADIR%%/ruby/lib/gitlab/encoding_helper.rb
%%DATADIR%%/ruby/lib/gitlab/git.rb
%%DATADIR%%/ruby/lib/gitlab/git/blob.rb
%%DATADIR%%/ruby/lib/gitlab/git/branch.rb
%%DATADIR%%/ruby/lib/gitlab/git/commit.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
+%%DATADIR%%/ruby/lib/gitlab/git/conflict/resolution.rb
%%DATADIR%%/ruby/lib/gitlab/git/conflict/resolver.rb
%%DATADIR%%/ruby/lib/gitlab/git/diff.rb
%%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.rb
%%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb
+%%DATADIR%%/ruby/lib/gitlab/git/hook.rb
+%%DATADIR%%/ruby/lib/gitlab/git/hooks_service.rb
%%DATADIR%%/ruby/lib/gitlab/git/index.rb
%%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb
-%%DATADIR%%/ruby/lib/gitlab/git/pre_receive_error.rb
+%%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb
+%%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb
+%%DATADIR%%/ruby/lib/gitlab/git/popen.rb
%%DATADIR%%/ruby/lib/gitlab/git/raw_diff_change.rb
%%DATADIR%%/ruby/lib/gitlab/git/ref.rb
%%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb
+%%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb
%%DATADIR%%/ruby/lib/gitlab/git/repository.rb
%%DATADIR%%/ruby/lib/gitlab/git/repository_mirroring.rb
%%DATADIR%%/ruby/lib/gitlab/git/rev_list.rb
%%DATADIR%%/ruby/lib/gitlab/git/tag.rb
+%%DATADIR%%/ruby/lib/gitlab/git/user.rb
%%DATADIR%%/ruby/lib/gitlab/git/wiki.rb
%%DATADIR%%/ruby/lib/gitlab/git/wiki_file.rb
%%DATADIR%%/ruby/lib/gitlab/git/wiki_page.rb
%%DATADIR%%/ruby/lib/gitlab/git/wiki_page_version.rb
%%DATADIR%%/ruby/lib/gitlab/git_logger.rb
-%%DATADIR%%/ruby/lib/gitlab/gitaly_client.rb
%%DATADIR%%/ruby/lib/gitlab/gollum.rb
%%DATADIR%%/ruby/lib/gitlab/rails_logger.rb
+%%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb
%%DATADIR%%/ruby/lib/gitlab/version_info.rb
%%DATADIR%%/ruby/spec/gitaly/ref_service_spec.rb
%%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb
@@ -56,6 +67,7 @@
%%DATADIR%%/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/config_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/diff_spec.rb
+%%DATADIR%%/ruby/spec/lib/gitlab/git/gitlab_projects_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb
@@ -64,28 +76,6 @@
%%DATADIR%%/ruby/spec/spec_helper.rb
%%DATADIR%%/ruby/spec/support/sentry.rb
%%DATADIR%%/ruby/spec/test_repo_helper.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/ORIGIN
-%%DATADIR%%/ruby/vendor/gitlab_git/REVISION
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/encoding_helper.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/committer_with_hooks.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/file.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/parser.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/resolution.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/gitlab_projects.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hook.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hooks_service.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/pre_receive_error.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_mirror.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository_mirroring.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/user.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/util.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/utils/strong_memoize.rb
@(,,555) %%DATADIR%%/bin/gitaly
@(,,555) %%DATADIR%%/bin/gitaly-ssh
@sample %%DATADIR%%/config.toml.sample
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-22 00:37:15 +0000