Index: head/devel/gitaly/Makefile =================================================================== --- head/devel/gitaly/Makefile (revision 502878) +++ head/devel/gitaly/Makefile (revision 502879) @@ -1,58 +1,58 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 1.34.1 +DISTVERSION= 1.42.0 PORTREVISION= 0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.21:devel/git \ - rubygem-bundler>=1.16.5:sysutils/rubygem-bundler \ + rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \ rubygem-rugged>=0.28.0:devel/rubygem-rugged \ rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \ - rubygem-gitaly-proto>=1.22.0:net/rubygem-gitaly-proto \ - rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \ + rubygem-activesupport5>=5.1.7:devel/rubygem-activesupport5 \ + rubygem-gitaly-proto>=1.27.0:net/rubygem-gitaly-proto \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2:www/rubygem-gitlab-gollum-rugged_adapter \ - rubygem-grpc>=1.15.0:net/rubygem-grpc \ + rubygem-grpc>=1.19.0:net/rubygem-grpc \ rubygem-sentry-raven>=2.9.0:devel/rubygem-sentry-raven \ rubygem-faraday>=0.12:www/rubygem-faraday \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ - rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf + rubygem-google-protobuf>=3.7.1:devel/rubygem-google-protobuf BUILD_DEPENDS= go>=1.11:lang/go \ gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=6.0.4:devel/gitlab-shell USES= gmake USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= eecc26aa64353daa3d38077251f92dbe77c35c16 +GL_COMMIT= 6f8f5ae53799e8275ed1f83a99cdaa96467125b2 post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/bin && \ cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample ${STAGEDIR}${DATADIR}) && \ cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby .include Index: head/devel/gitaly/distinfo =================================================================== --- head/devel/gitaly/distinfo (revision 502878) +++ head/devel/gitaly/distinfo (revision 502879) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556571177 -SHA256 (gitlab-org-gitaly-eecc26aa64353daa3d38077251f92dbe77c35c16_GL0.tar.gz) = b3488da6f1c9d49b000becc2249887c908b136e9004ece042186f8e121a87bdf -SIZE (gitlab-org-gitaly-eecc26aa64353daa3d38077251f92dbe77c35c16_GL0.tar.gz) = 8257429 +TIMESTAMP = 1558384783 +SHA256 (gitlab-org-gitaly-6f8f5ae53799e8275ed1f83a99cdaa96467125b2_GL0.tar.gz) = 6a513f47ca530d866a26279d015faa2c49877c61f442b1d132bce122d1d1cf63 +SIZE (gitlab-org-gitaly-6f8f5ae53799e8275ed1f83a99cdaa96467125b2_GL0.tar.gz) = 8282676 Index: head/devel/gitaly/files/patch-ruby_Gemfile =================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile (revision 502878) +++ head/devel/gitaly/files/patch-ruby_Gemfile (revision 502879) @@ -1,29 +1,29 @@ ---- ruby/Gemfile.orig 2019-04-05 16:17:09 UTC +--- ruby/Gemfile.orig 2019-05-06 14:54:47 UTC +++ ruby/Gemfile @@ -8,7 +8,7 @@ gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' - gem 'gitaly-proto', '~> 1.19.0' - gem 'activesupport', '~> 5.0.2' + gem 'activesupport', '~> 5.1.7' + gem 'gitaly-proto', '~> 1.27.0' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false - gem 'grpc', '~> 1.15.0' + gem 'grpc', '~> 1.19.0' @@ -22,17 +22,3 @@ gem 'licensee', '~> 8.9.0' - gem 'google-protobuf', '~> 3.6' + gem 'google-protobuf', '~> 3.7.1' -group :development, :test do -- gem 'rubocop', '~> 0.50', require: false +- gem 'rubocop', '~> 0.68', require: false - gem 'rspec', require: false - 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' - gem 'simplecov', '~> 0.9.0', require: false - gem 'vcr', '~> 4.0.0' - gem 'webmock', '~> 3.4.0' -end Index: head/devel/gitaly/pkg-plist =================================================================== --- head/devel/gitaly/pkg-plist (revision 502878) +++ head/devel/gitaly/pkg-plist (revision 502879) @@ -1,198 +1,199 @@ %%DATADIR%%/ruby/Gemfile %%DATADIR%%/ruby/README.md @(,,555) %%DATADIR%%/ruby/bin/gitaly-ruby @(,,555) %%DATADIR%%/ruby/bin/ruby-cd %%DATADIR%%/ruby/.rubocop.yml %%DATADIR%%/ruby/.rubocop_todo.yml %%DATADIR%%/ruby/git-hooks/post-receive %%DATADIR%%/ruby/git-hooks/pre-receive %%DATADIR%%/ruby/git-hooks/update %%DATADIR%%/ruby/gitlab-shell/.codeclimate.yml %%DATADIR%%/ruby/gitlab-shell/.gitlab-ci.yml %%DATADIR%%/ruby/gitlab-shell/.rubocop.yml %%DATADIR%%/ruby/gitlab-shell/.ruby-version %%DATADIR%%/ruby/gitlab-shell/CHANGELOG %%DATADIR%%/ruby/gitlab-shell/CONTRIBUTING.md %%DATADIR%%/ruby/gitlab-shell/Gemfile %%DATADIR%%/ruby/gitlab-shell/LICENSE %%DATADIR%%/ruby/gitlab-shell/README.md %%DATADIR%%/ruby/gitlab-shell/README.orig.md %%DATADIR%%/ruby/gitlab-shell/VERSION %%DATADIR%%/ruby/gitlab-shell/bin/check %%DATADIR%%/ruby/gitlab-shell/bin/test-logger %%DATADIR%%/ruby/gitlab-shell/config.yml.example %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access_status.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_config.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_custom_hook.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_init.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_logger.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_metrics.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net/errors.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_post_receive.rb %%DATADIR%%/ruby/gitlab-shell/lib/hooks_utils.rb %%DATADIR%%/ruby/gitlab-shell/lib/http_helper.rb %%DATADIR%%/ruby/gitlab-shell/lib/httpunix.rb %%DATADIR%%/ruby/gitlab-shell/lib/object_dirs_helper.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_access_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_config_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_custom_hook_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_logger_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_metrics_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_net_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/hooks_utils_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/httpunix_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/spec_helper.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/gitlab_shell_setup.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/gl_id_test_hook %%DATADIR%%/ruby/gitlab-shell/spec/support/hook_fail %%DATADIR%%/ruby/gitlab-shell/spec/support/hook_ok %%DATADIR%%/ruby/gitlab-shell/spec/support/http_unix_server.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/vcr.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/webmock.rb %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml %%DATADIR%%/ruby/lib/gitaly_server.rb %%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb %%DATADIR%%/ruby/lib/gitaly_server/client.rb %%DATADIR%%/ruby/lib/gitaly_server/commit_service.rb %%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 %%DATADIR%%/ruby/lib/gitaly_server/repository_service.rb %%DATADIR%%/ruby/lib/gitaly_server/rugged_interceptor.rb %%DATADIR%%/ruby/lib/gitaly_server/sentry.rb %%DATADIR%%/ruby/lib/gitaly_server/sentry_interceptor.rb %%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_patches.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/http_auth.rb %%DATADIR%%/ruby/lib/gitlab/git/index.rb %%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.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/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/ssh_auth.rb %%DATADIR%%/ruby/lib/gitlab/git/submodule.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/gollum.rb %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb %%DATADIR%%/ruby/lib/gitlab/ref_matcher.rb %%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb %%DATADIR%%/ruby/spec/factories/gitaly/commit.rb %%DATADIR%%/ruby/spec/factories/gitaly/commit_author.rb %%DATADIR%%/ruby/spec/factories/sequences.rb %%DATADIR%%/ruby/spec/gitaly/ref_service_spec.rb %%DATADIR%%/ruby/spec/gitaly/remote_service_spec.rb %%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/rugged_interceptor_spec.rb %%DATADIR%%/ruby/spec/lib/gitaly_server/utils_spec.rb %%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/blob_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/branch_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_patches_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_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/hook_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb %%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/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 %%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/ssh_auth_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/submodule_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycert.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycert2.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycert3.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycertdup.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/gitalycert.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/user_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/wiki_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/ref_matcher_spec.rb %%DATADIR%%/ruby/spec/spec_helper.rb %%DATADIR%%/ruby/spec/support/generate-seed-repo-rb %%DATADIR%%/ruby/spec/support/helpers/certs/gitalycert.pem %%DATADIR%%/ruby/spec/support/helpers/certs/gitalykey.pem %%DATADIR%%/ruby/spec/support/helpers/gitlab_shell_helper.rb %%DATADIR%%/ruby/spec/support/helpers/integration_helper.rb %%DATADIR%%/ruby/spec/support/helpers/seed_repo.rb %%DATADIR%%/ruby/spec/support/sentry.rb %%DATADIR%%/ruby/spec/test_repo_helper.rb @(,,555) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook @(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/post-receive @(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/pre-receive @(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/update @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-debug @(,,555) %%DATADIR%%/bin/gitaly-ssh @(,,555) %%DATADIR%%/bin/gitaly-wrapper @(,,555) %%DATADIR%%/bin/praefect @sample %%DATADIR%%/config.toml.sample