svn commit: r473905 - in head/devel/gitaly: . files
Matthias Fechner
mfechner at FreeBSD.org
Wed Jul 4 17:31:01 UTC 2018
Author: mfechner
Date: Wed Jul 4 17:30:59 2018
New Revision: 473905
URL: https://svnweb.freebsd.org/changeset/ports/473905
Log:
Update to 0.105.0 which is required for gitlab 11.0.2.
Reviewed by: swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D16127
Modified:
head/devel/gitaly/Makefile
head/devel/gitaly/distinfo
head/devel/gitaly/files/patch-Makefile
head/devel/gitaly/files/patch-config.toml.example
head/devel/gitaly/files/patch-ruby_Gemfile
Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile Wed Jul 4 17:29:00 2018 (r473904)
+++ head/devel/gitaly/Makefile Wed Jul 4 17:30:59 2018 (r473905)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitaly
-DISTVERSION= 0.100.0
+DISTVERSION= 0.105.0
CATEGORIES= devel
MAINTAINER= mfechner at FreeBSD.org
@@ -12,17 +12,19 @@ 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-i18n>=0:devel/rubygem-i18n \
rubygem-rugged>=0.27.1: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-proto099>=0.99.0:net/rubygem-gitaly-proto099 \
+ rubygem-gitaly-proto>=0.101.0:net/rubygem-gitaly-proto \
rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \
- rubygem-rdoc>=4.2:devel/rubygem-rdoc \
+ rubygem-rdoc>=6.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4:www/rubygem-gitlab-gollum-rugged_adapter \
rubygem-grpc>=1.11.0:net/rubygem-grpc \
rubygem-sentry-raven>=2.7.2:devel/rubygem-sentry-raven \
+ rubygem-faraday>=0.12:www/rubygem-faraday \
rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351
@@ -39,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= 15606d3061414479453534814d32132bd9411617
+GL_COMMIT= 90ec422b0e76840075010476898637a92f287245
post-patch:
${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo Wed Jul 4 17:29:00 2018 (r473904)
+++ head/devel/gitaly/distinfo Wed Jul 4 17:30:59 2018 (r473905)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529482774
-SHA256 (gitlab-org-gitaly-15606d3061414479453534814d32132bd9411617_GL0.tar.gz) = d93fd3c3481f65c918e2d8ebeeb0108ba68a9ce2106956799d24e862f77b0ba8
-SIZE (gitlab-org-gitaly-15606d3061414479453534814d32132bd9411617_GL0.tar.gz) = 4126919
+TIMESTAMP = 1530370061
+SHA256 (gitlab-org-gitaly-90ec422b0e76840075010476898637a92f287245_GL0.tar.gz) = 0ec6140877d53dae22247d16ddb89374cade68ab47800b74e649e2a073c63e71
+SIZE (gitlab-org-gitaly-90ec422b0e76840075010476898637a92f287245_GL0.tar.gz) = 4145322
Modified: head/devel/gitaly/files/patch-Makefile
==============================================================================
--- head/devel/gitaly/files/patch-Makefile Wed Jul 4 17:29:00 2018 (r473904)
+++ head/devel/gitaly/files/patch-Makefile Wed Jul 4 17:30:59 2018 (r473905)
@@ -1,4 +1,4 @@
---- Makefile.orig 2018-02-08 14:44:53 UTC
+--- Makefile.orig 2018-07-01 11:16:07 UTC
+++ Makefile
@@ -11,7 +11,7 @@ INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/
COVERAGE_DIR := $(TARGET_DIR)/cover
@@ -9,12 +9,12 @@
BUILDTIME = $(shell date -u +%Y%m%d.%H%M%S)
VERSION_PREFIXED = $(shell git describe)
-@@ -56,7 +56,7 @@ build: .ruby-bundle $(TARGET_SETUP)
- cp $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(BUILD_DIR)/
+@@ -57,7 +57,7 @@ build: .ruby-bundle $(TARGET_SETUP)
.ruby-bundle: ruby/Gemfile.lock ruby/Gemfile
+ cd ruby && bundle config # for debugging
- cd ruby && bundle install $(BUNDLE_FLAGS)
+ cd ruby && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS)
+ cd ruby && bundle show gitaly-proto # sanity check
touch $@
- # TODO: confirm what references this target? Omnibus? Source installs?
Modified: head/devel/gitaly/files/patch-config.toml.example
==============================================================================
--- head/devel/gitaly/files/patch-config.toml.example Wed Jul 4 17:29:00 2018 (r473904)
+++ head/devel/gitaly/files/patch-config.toml.example Wed Jul 4 17:30:59 2018 (r473905)
@@ -1,10 +1,10 @@
---- config.toml.example.orig 2018-04-12 00:44:37 UTC
+--- config.toml.example.orig 2018-06-04 16:17:50 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"
++socket_path = "/usr/local/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
# The directory where Gitaly's executables are stored
-bin_dir = "/home/git/gitaly"
@@ -12,8 +12,8 @@
# # Optional: listen on a TCP socket. This is insecure (no authentication)
# listen_addr = "localhost:9999"
-@@ -14,12 +14,12 @@ bin_dir = "/home/git/gitaly"
- #
+@@ -13,12 +13,12 @@ bin_dir = "/home/git/gitaly"
+ # prometheus_listen_addr = "localhost:9236"
# # Git executable settings
-# [git]
@@ -28,7 +28,7 @@
# # You can optionally configure more storages for this Gitaly instance to serve up
#
-@@ -42,7 +42,7 @@ path = "/home/git/repositories"
+@@ -46,7 +46,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 = 300000000
-@@ -55,7 +55,7 @@ dir = "/home/git/gitaly/ruby"
+@@ -62,7 +62,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 Wed Jul 4 17:29:00 2018 (r473904)
+++ head/devel/gitaly/files/patch-ruby_Gemfile Wed Jul 4 17:30:59 2018 (r473905)
@@ -1,18 +1,25 @@
---- ruby/Gemfile.orig 2018-06-20 08:20:28 UTC
+--- ruby/Gemfile.orig 2018-06-04 16:17:50 UTC
+++ ruby/Gemfile
-@@ -8,7 +8,7 @@ gem 'activesupport', '~> 5.0.2'
- gem 'rdoc', '~> 4.2'
+@@ -5,12 +5,13 @@ gem 'github-linguist', '~> 5.3.3', requi
+ gem 'gitlab-markup', '~> 1.6.2'
+ gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly'
+ 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.10.0'
-+gem 'grpc', '~> 1.11.0'
+ gem 'grpc', '~> 1.11.0'
gem 'sentry-raven', '~> 2.7.2', require: false
+ gem 'faraday', '~> 0.12'
++gem 'i18n'
# Detects the open source license the repository includes
-@@ -18,7 +18,3 @@ gem 'licensee', '~> 8.9.0'
+ # This version needs to be in sync with GitLab CE/EE
+@@ -18,8 +19,3 @@ gem 'licensee', '~> 8.9.0'
+
# 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
More information about the svn-ports-all
mailing list