Date: Sun, 23 Dec 2018 12:41:06 +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: r488208 - in head/devel/gitaly: . files Message-ID: <201812231241.wBNCf6Vr090746@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Sun Dec 23 12:41:06 2018 New Revision: 488208 URL: https://svnweb.freebsd.org/changeset/ports/488208 Log: Upgrade to 1.7.1 which is required for gitlab-ce 11.6. 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 Sun Dec 23 12:39:43 2018 (r488207) +++ head/devel/gitaly/Makefile Sun Dec 23 12:41:06 2018 (r488208) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.129.0 -PORTREVISION= 0 +DISTVERSION= 1.7.1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -17,8 +16,8 @@ MY_DEPENDS= git>=2.17:devel/git \ rubygem-bundler>=1.16.5:sysutils/rubygem-bundler \ rubygem-rugged>=0.27.4:devel/rubygem-rugged \ rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \ - rubygem-gitlab-markup>=1.6.4:textproc/rubygem-gitlab-markup \ - rubygem-gitaly-proto>=0.123.0:net/rubygem-gitaly-proto \ + rubygem-gitlab-markup>=1.6.5:textproc/rubygem-gitlab-markup \ + rubygem-gitaly-proto>=1.3.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= 1a4581d04d67d2821e5df6866af8ba6bbef40960 +GL_COMMIT= 8a89c4a6e20ff92193cdabd1bb9964b8e817d6b2 post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Sun Dec 23 12:39:43 2018 (r488207) +++ head/devel/gitaly/distinfo Sun Dec 23 12:41:06 2018 (r488208) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542968937 -SHA256 (gitlab-org-gitaly-1a4581d04d67d2821e5df6866af8ba6bbef40960_GL0.tar.gz) = e07cd0e36368f2ae8dfdb77a523ce89ba132261429cfdb814fcca1d443eef6ad -SIZE (gitlab-org-gitaly-1a4581d04d67d2821e5df6866af8ba6bbef40960_GL0.tar.gz) = 4183911 +TIMESTAMP = 1545487298 +SHA256 (gitlab-org-gitaly-8a89c4a6e20ff92193cdabd1bb9964b8e817d6b2_GL0.tar.gz) = 65407240a6da07dfc66d93ea6809eaa2546eef7f7f94c380479059ca20a20bed +SIZE (gitlab-org-gitaly-8a89c4a6e20ff92193cdabd1bb9964b8e817d6b2_GL0.tar.gz) = 4257794 Modified: head/devel/gitaly/files/patch-config.toml.example ============================================================================== --- head/devel/gitaly/files/patch-config.toml.example Sun Dec 23 12:39:43 2018 (r488207) +++ head/devel/gitaly/files/patch-config.toml.example Sun Dec 23 12:41:06 2018 (r488208) @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2018-08-17 16:15:58 UTC +--- config.toml.example.orig 2018-12-10 17:27:53 UTC +++ config.toml.example @@ -1,9 +1,9 @@ # Example Gitaly configuration file @@ -12,8 +12,8 @@ # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" -@@ -17,12 +17,12 @@ bin_dir = "/home/git/gitaly" - # prometheus_listen_addr = "localhost:9236" +@@ -22,12 +22,12 @@ bin_dir = "/home/git/gitaly" + # key_path = '/home/git/key.pem' # # Git executable settings -# [git] @@ -28,7 +28,7 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -50,7 +50,7 @@ path = "/home/git/repositories" +@@ -55,7 +55,7 @@ path = "/home/git/repositories" [gitaly-ruby] # The directory where gitaly-ruby is installed @@ -37,7 +37,7 @@ # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 200000000 -@@ -66,7 +66,7 @@ dir = "/home/git/gitaly/ruby" +@@ -71,7 +71,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 Sun Dec 23 12:39:43 2018 (r488207) +++ head/devel/gitaly/files/patch-ruby_Gemfile Sun Dec 23 12:41:06 2018 (r488208) @@ -1,8 +1,8 @@ ---- ruby/Gemfile.orig 2018-11-23 10:31:05 UTC +--- ruby/Gemfile.orig 2018-12-10 17:27:53 UTC +++ ruby/Gemfile -@@ -8,12 +8,13 @@ gem 'github-linguist', '~> 6.1', require - gem 'gitlab-markup', '~> 1.6.4' - gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly' +@@ -8,12 +8,13 @@ gem 'github-linguist', '~> 6.1', require: 'linguist' + gem 'gitlab-markup', '~> 1.6.5' + gem 'gitaly-proto', '~> 1.3.0' gem 'activesupport', '~> 5.0.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Sun Dec 23 12:39:43 2018 (r488207) +++ head/devel/gitaly/pkg-plist Sun Dec 23 12:41:06 2018 (r488208) @@ -51,6 +51,7 @@ %%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 @@ -67,6 +68,7 @@ %%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 @@ -85,20 +87,29 @@ %%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/raw_diff_change_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/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/version_info_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%%/bin/gitaly +@(,,555) %%DATADIR%%/bin/gitaly-debug @(,,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?201812231241.wBNCf6Vr090746>