Index: branches/2018Q2/devel/gitaly/Makefile =================================================================== --- branches/2018Q2/devel/gitaly/Makefile (revision 471805) +++ branches/2018Q2/devel/gitaly/Makefile (revision 471806) @@ -1,60 +1,61 @@ # $FreeBSD$ PORTNAME= gitaly DISTVERSION= 0.91.0 PORTREVISION= 1 CATEGORIES= devel MAINTAINER= idefix@fechner.net 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.16.2:devel/git \ + rubygem-rugged>=0.27.0: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-proto088>=0.88.0:net/rubygem-gitaly-proto088 \ + rubygem-gitaly-proto095>=0.95.0:net/rubygem-gitaly-proto095 \ rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \ rubygem-rdoc>=4.2:devel/rubygem-rdoc \ - rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \ + 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-sentry-raven>=2.7.2:devel/rubygem-sentry-raven \ - rubygem-licensee8>=8.7:devel/rubygem-licensee8 \ + rubygem-licensee8>=8.7.0:devel/rubygem-licensee8 \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 BUILD_DEPENDS= go>=1.8:lang/go \ gem:devel/ruby-gems \ - rubygem-bundler>0:sysutils/rubygem-bundler \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=6.0.4:devel/gitlab-shell -USES= gmake +USES= gmake USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= 89298fe8b80b73a34352023555fe061866aff3ad +GL_COMMIT= d779c028099f79360209b92473c201e07721b885 post-patch: ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin - $(RM) -f ${WRKSRC}/ruby/Gemfile.orig + ${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 post-install: ${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly ${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-ssh .include Index: branches/2018Q2/devel/gitaly/distinfo =================================================================== --- branches/2018Q2/devel/gitaly/distinfo (revision 471805) +++ branches/2018Q2/devel/gitaly/distinfo (revision 471806) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523378733 -SHA256 (gitlab-org-gitaly-89298fe8b80b73a34352023555fe061866aff3ad_GL0.tar.gz) = c1a8e836b572f249e05c3a821002781af6a3a1bf3434dff5fe515078700994b3 -SIZE (gitlab-org-gitaly-89298fe8b80b73a34352023555fe061866aff3ad_GL0.tar.gz) = 3586830 +TIMESTAMP = 1524579302 +SHA256 (gitlab-org-gitaly-d779c028099f79360209b92473c201e07721b885_GL0.tar.gz) = 8344bfff658433002444d756c3552b57ce7861b614efc2f3db42be68dd4aa4b5 +SIZE (gitlab-org-gitaly-d779c028099f79360209b92473c201e07721b885_GL0.tar.gz) = 3620431 Index: branches/2018Q2/devel/gitaly/files/patch-config.toml.example =================================================================== --- branches/2018Q2/devel/gitaly/files/patch-config.toml.example (revision 471805) +++ branches/2018Q2/devel/gitaly/files/patch-config.toml.example (revision 471806) @@ -1,48 +1,48 @@ ---- config.toml.example.orig 2018-02-08 14:44:53 UTC +--- config.toml.example.orig 2018-04-12 00:44:37 UTC +++ config.toml.example @@ -1,9 +1,9 @@ # Example Gitaly configuration file -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" +socket_path = "/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket" # The directory where Gitaly's executables are stored -bin_dir = "/home/git/gitaly" +bin_dir = "/usr/local/share/gitaly/bin/" # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" @@ -14,12 +14,12 @@ bin_dir = "/home/git/gitaly" # # # Git executable settings -# [git] -# bin_path = "/usr/bin/git" +[git] +bin_path = "/usr/local/bin/git" [[storage]] name = "default" -path = "/home/git/repositories" +path = "/usr/home/git/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -40,7 +40,7 @@ path = "/home/git/repositories" +@@ -42,7 +42,7 @@ path = "/home/git/repositories" [gitaly-ruby] # The directory where gitaly-ruby is installed -dir = "/home/git/gitaly/ruby" +dir = "/usr/local/share/gitaly/ruby" # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 300000000 -@@ -53,7 +53,7 @@ dir = "/home/git/gitaly/ruby" +@@ -55,7 +55,7 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed -dir = "/home/git/gitlab-shell" -+dir = "/usr/local/share/gitlab-shell/bin" ++dir = "/usr/local/share/gitlab-shell" # # You can adjust the concurrency of each RPC endpoint # [[concurrency]] Index: branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile =================================================================== --- branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile (revision 471805) +++ branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile (revision 471806) @@ -1,10 +1,16 @@ ---- ruby/Gemfile.orig 2018-02-25 18:31:26 UTC +--- ruby/Gemfile.orig 2018-04-12 00:44:37 UTC +++ ruby/Gemfile -@@ -12,7 +12,3 @@ gem 'grpc', '~> 1.8.0' +@@ -13,12 +13,8 @@ gem 'sentry-raven', '~> 2.7.2', require: + + # 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' + # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' -group :development, :test do - gem 'gitlab-styles', '~> 2.0.0', require: false - gem 'rspec', require: false -end Index: branches/2018Q2/devel/gitaly/pkg-plist =================================================================== --- branches/2018Q2/devel/gitaly/pkg-plist (revision 471805) +++ branches/2018Q2/devel/gitaly/pkg-plist (revision 471806) @@ -1,95 +1,94 @@ %%DATADIR%%/ruby/Gemfile -%%DATADIR%%/ruby/Gemfile.lock %%DATADIR%%/ruby/README.md @(,,555) %%DATADIR%%/ruby/bin/gitaly-ruby @(,,555) %%DATADIR%%/ruby/bin/ruby-cd %%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/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/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/git.rb %%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.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/spec/gitaly/ref_service_spec.rb %%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb %%DATADIR%%/ruby/spec/integration_helper.rb %%DATADIR%%/ruby/spec/lib/gitaly_server/exception_sanitizer_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/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/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/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/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/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/ref.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/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/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/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 @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-ssh @sample %%DATADIR%%/config.toml.sample Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 471805) +++ branches/2018Q2 (revision 471806) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r469312,469938,470126