svn commit: r491730 - in head/devel/gitaly: . files
Matthias Fechner
mfechner at FreeBSD.org
Thu Jan 31 14:22:05 UTC 2019
Author: mfechner
Date: Thu Jan 31 14:22:03 2019
New Revision: 491730
URL: https://svnweb.freebsd.org/changeset/ports/491730
Log:
Upgrade to 1.12.1 which is required for gitlab-ce 11.7 upgrade.
Modified:
head/devel/gitaly/Makefile
head/devel/gitaly/distinfo
head/devel/gitaly/files/patch-ruby_Gemfile
head/devel/gitaly/pkg-plist
Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile Thu Jan 31 14:20:59 2019 (r491729)
+++ head/devel/gitaly/Makefile Thu Jan 31 14:22:03 2019 (r491730)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitaly
-DISTVERSION= 1.7.1
+DISTVERSION= 1.12.1
CATEGORIES= devel
MAINTAINER= mfechner at FreeBSD.org
@@ -12,7 +12,6 @@ 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-bundler>=1.16.5:sysutils/rubygem-bundler \
rubygem-rugged>=0.27.4:devel/rubygem-rugged \
rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \
@@ -41,7 +40,7 @@ USE_RUBY= yes
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT= 8a89c4a6e20ff92193cdabd1bb9964b8e817d6b2
+GL_COMMIT= 8aacfc36317eaa286d2f04990de4c4acf218aa52
post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo Thu Jan 31 14:20:59 2019 (r491729)
+++ head/devel/gitaly/distinfo Thu Jan 31 14:22:03 2019 (r491730)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545487298
-SHA256 (gitlab-org-gitaly-8a89c4a6e20ff92193cdabd1bb9964b8e817d6b2_GL0.tar.gz) = 65407240a6da07dfc66d93ea6809eaa2546eef7f7f94c380479059ca20a20bed
-SIZE (gitlab-org-gitaly-8a89c4a6e20ff92193cdabd1bb9964b8e817d6b2_GL0.tar.gz) = 4257794
+TIMESTAMP = 1548341561
+SHA256 (gitlab-org-gitaly-8aacfc36317eaa286d2f04990de4c4acf218aa52_GL0.tar.gz) = 0d892261f6cf113a1867fc43d71d782be7c0dd86b05ac4658470f73c020ffd3b
+SIZE (gitlab-org-gitaly-8aacfc36317eaa286d2f04990de4c4acf218aa52_GL0.tar.gz) = 4274878
Modified: head/devel/gitaly/files/patch-ruby_Gemfile
==============================================================================
--- head/devel/gitaly/files/patch-ruby_Gemfile Thu Jan 31 14:20:59 2019 (r491729)
+++ head/devel/gitaly/files/patch-ruby_Gemfile Thu Jan 31 14:22:03 2019 (r491730)
@@ -1,21 +1,18 @@
---- ruby/Gemfile.orig 2018-12-10 17:27:53 UTC
+--- ruby/Gemfile.orig 2019-01-14 15:50:42 UTC
+++ ruby/Gemfile
-@@ -8,12 +8,13 @@ gem 'github-linguist', '~> 6.1', require: 'linguist'
+@@ -6,9 +6,9 @@ gem 'bundler', '>= 1.16.5'
+ gem 'rugged', '~> 0.27'
+ gem 'github-linguist', '~> 6.1', require: 'linguist'
gem 'gitlab-markup', '~> 1.6.5'
- gem 'gitaly-proto', '~> 1.3.0'
+-gem 'gitaly-proto', '~> 1.3.0'
++gem 'gitaly-proto', '~> 1.5.0'
gem 'activesupport', '~> 5.0.2'
-gem 'rdoc', '~> 4.2'
+gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
gem 'grpc', '~> 1.15.0'
- gem 'sentry-raven', '~> 2.7.2', require: false
- gem 'faraday', '~> 0.12'
-+gem 'i18n'
-
- # Detects the open source license the repository includes
- # This version needs to be in sync with GitLab CE/EE
-@@ -21,10 +22,3 @@ gem 'licensee', '~> 8.9.0'
+@@ -21,10 +21,3 @@ gem 'licensee', '~> 8.9.0'
gem 'google-protobuf', '~> 3.6'
Modified: head/devel/gitaly/pkg-plist
==============================================================================
--- head/devel/gitaly/pkg-plist Thu Jan 31 14:20:59 2019 (r491729)
+++ head/devel/gitaly/pkg-plist Thu Jan 31 14:22:03 2019 (r491730)
@@ -62,6 +62,7 @@
%%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/lib/gitlab/version_info.rb
%%DATADIR%%/ruby/spec/factories/gitaly/commit.rb
@@ -96,9 +97,12 @@
%%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/lib/gitlab/version_info_spec.rb
%%DATADIR%%/ruby/spec/spec_helper.rb
%%DATADIR%%/ruby/spec/support/generate-seed-repo-rb
More information about the svn-ports-all
mailing list