Date: Thu, 6 Sep 2018 19:06:17 +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: r479139 - in head/devel/gitaly: . files Message-ID: <201809061906.w86J6HQW056393@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Thu Sep 6 19:06:16 2018 New Revision: 479139 URL: https://svnweb.freebsd.org/changeset/ports/479139 Log: Update devel/gitaly to 0.117.2 which is required for gitlab-ce 11.2.x. Approved by: mentors (implicit) Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo 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 Sep 6 19:04:03 2018 (r479138) +++ head/devel/gitaly/Makefile Thu Sep 6 19:06:16 2018 (r479139) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.111.2 -PORTREVISION= 2 +DISTVERSION= 0.117.2 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -14,11 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.17:devel/git \ rubygem-i18n>=0:devel/rubygem-i18n \ - rubygem-rugged>=0.27.2:devel/rubygem-rugged \ + rubygem-rugged>=0.27.4: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-proto>=0.105.0:net/rubygem-gitaly-proto \ + rubygem-gitlab-markup>=1.6.4:textproc/rubygem-gitlab-markup \ + rubygem-gitaly-proto>=0.107.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 \ @@ -42,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= 39b113e394a7773d3c5781180119f4dbcbec7bd5 +GL_COMMIT= 93cc4119d91af9644da2b748f2563fd67ee5b855 post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Thu Sep 6 19:04:03 2018 (r479138) +++ head/devel/gitaly/distinfo Thu Sep 6 19:06:16 2018 (r479139) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532595343 -SHA256 (gitlab-org-gitaly-39b113e394a7773d3c5781180119f4dbcbec7bd5_GL0.tar.gz) = 881bd5b82e33462029d483bd416adba453330bd6d4f22197a11626fa140ecdde -SIZE (gitlab-org-gitaly-39b113e394a7773d3c5781180119f4dbcbec7bd5_GL0.tar.gz) = 3604279 +TIMESTAMP = 1535130930 +SHA256 (gitlab-org-gitaly-93cc4119d91af9644da2b748f2563fd67ee5b855_GL0.tar.gz) = 6e0dda552c34dd39f352ff7e2bb65c5cb961073f41e6f49aff5a605c89c5b0d4 +SIZE (gitlab-org-gitaly-93cc4119d91af9644da2b748f2563fd67ee5b855_GL0.tar.gz) = 3601446 Modified: head/devel/gitaly/files/patch-config.toml.example ============================================================================== --- head/devel/gitaly/files/patch-config.toml.example Thu Sep 6 19:04:03 2018 (r479138) +++ head/devel/gitaly/files/patch-config.toml.example Thu Sep 6 19:06:16 2018 (r479139) @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2018-06-04 16:17:50 UTC +--- config.toml.example.orig 2018-08-17 16:15:58 UTC +++ config.toml.example @@ -1,9 +1,9 @@ # Example Gitaly configuration file @@ -12,7 +12,7 @@ # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" -@@ -13,12 +13,12 @@ bin_dir = "/home/git/gitaly" +@@ -17,12 +17,12 @@ bin_dir = "/home/git/gitaly" # prometheus_listen_addr = "localhost:9236" # # Git executable settings @@ -28,7 +28,7 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -46,7 +46,7 @@ path = "/home/git/repositories" +@@ -50,7 +50,7 @@ path = "/home/git/repositories" [gitaly-ruby] # The directory where gitaly-ruby is installed @@ -36,8 +36,8 @@ +dir = "%%PREFIX%%/share/gitaly/ruby" # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) - # max_rss = 300000000 -@@ -62,7 +62,7 @@ dir = "/home/git/gitaly/ruby" + # max_rss = 200000000 +@@ -66,7 +66,7 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Thu Sep 6 19:04:03 2018 (r479138) +++ head/devel/gitaly/files/patch-ruby_Gemfile Thu Sep 6 19:06:16 2018 (r479139) @@ -1,8 +1,14 @@ ---- ruby/Gemfile.orig 2018-07-20 10:35:57 UTC +--- ruby/Gemfile.orig 2018-08-17 16:15:58 UTC +++ ruby/Gemfile -@@ -5,12 +5,13 @@ gem 'github-linguist', '~> 5.3.3', requi - gem 'gitlab-markup', '~> 1.6.2' - gem 'gitaly-proto', '~> 0.105.0', require: 'gitaly' +@@ -1,16 +1,17 @@ + source 'https://rubygems.org' + + gem 'rugged', '~> 0.27.4' +-gem 'github-linguist', '~> 6.1', require: 'linguist' ++gem 'github-linguist', '~> 5.3', require: 'linguist' + gem 'gitlab-markup', '~> 1.6.4' +-gem 'gitaly-proto', '~> 0.107.0', require: 'gitaly' ++gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Thu Sep 6 19:04:03 2018 (r479138) +++ head/devel/gitaly/pkg-plist Thu Sep 6 19:06:16 2018 (r479139) @@ -22,17 +22,28 @@ %%DATADIR%%/ruby/lib/gitlab/git.rb %%DATADIR%%/ruby/lib/gitlab/git/blob.rb %%DATADIR%%/ruby/lib/gitlab/git/commit.rb +%%DATADIR%%/ruby/lib/gitlab/git/commit_stats.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/index.rb %%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb %%DATADIR%%/ruby/lib/gitlab/git/pre_receive_error.rb %%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.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/support/format-git-cat-file-input %%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/version_info.rb %%DATADIR%%/ruby/spec/gitaly/ref_service_spec.rb %%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb %%DATADIR%%/ruby/spec/integration_helper.rb @@ -41,6 +52,11 @@ %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb %%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/index_spec.rb +%%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb +%%DATADIR%%/ruby/spec/lib/gitlab/git/wiki_spec.rb +%%DATADIR%%/ruby/spec/lib/gitlab/version_info_spec.rb %%DATADIR%%/ruby/spec/spec_helper.rb %%DATADIR%%/ruby/spec/support/sentry.rb %%DATADIR%%/ruby/spec/test_repo_helper.rb @@ -50,28 +66,14 @@ %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/attributes_at_ref_parser.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/attributes_parser.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/blame.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/blob.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/blob_snippet.rb %%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 %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/resolution.rb -%%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/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/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 @@ -82,27 +84,11 @@ %%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/rev_list.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage/checker.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage/circuit_breaker.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage/circuit_breaker_settings.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/storage/failure_info.rb -%%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 %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/util.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/version.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki_file.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki_page.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/wiki_page_version.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/utils/strong_memoize.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/version_info.rb @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-ssh @sample %%DATADIR%%/config.toml.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809061906.w86J6HQW056393>