Index: branches/2018Q3/devel/gitaly/Makefile =================================================================== --- branches/2018Q3/devel/gitaly/Makefile (revision 474948) +++ branches/2018Q3/devel/gitaly/Makefile (revision 474949) @@ -1,60 +1,64 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.100.0 +DISTVERSION= 0.105.0 +PORTREVISION= 1 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.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 BUILD_DEPENDS= go>=1.8: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= 15606d3061414479453534814d32132bd9411617 +GL_COMMIT= 90ec422b0e76840075010476898637a92f287245 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 post-install: ${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly ${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-ssh .include Index: branches/2018Q3/devel/gitaly/distinfo =================================================================== --- branches/2018Q3/devel/gitaly/distinfo (revision 474948) +++ branches/2018Q3/devel/gitaly/distinfo (revision 474949) @@ -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 Index: branches/2018Q3/devel/gitaly/files/patch-Makefile =================================================================== --- branches/2018Q3/devel/gitaly/files/patch-Makefile (revision 474948) +++ branches/2018Q3/devel/gitaly/files/patch-Makefile (revision 474949) @@ -1,20 +1,20 @@ ---- 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 ASSEMBLY_ROOT := $(TARGET_DIR)/assembly export GITALY_TEST_RUBY_DIR := $(BUILD_DIR)/ruby -BUNDLE_FLAGS ?= --deployment +BUNDLE_FLAGS ?= --local 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? Index: branches/2018Q3/devel/gitaly/files/patch-config.toml.example =================================================================== --- branches/2018Q3/devel/gitaly/files/patch-config.toml.example (revision 474948) +++ branches/2018Q3/devel/gitaly/files/patch-config.toml.example (revision 474949) @@ -1,48 +1,48 @@ ---- 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 = "%%PREFIX%%/www/gitlab-ce/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/" ++bin_dir = "%%PREFIX%%/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" - # +@@ -13,12 +13,12 @@ bin_dir = "/home/git/gitaly" + # prometheus_listen_addr = "localhost:9236" # # Git executable settings -# [git] -# bin_path = "/usr/bin/git" +[git] -+bin_path = "/usr/local/bin/git" ++bin_path = "%%PREFIX%%/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 # -@@ -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 -dir = "/home/git/gitaly/ruby" -+dir = "/usr/local/share/gitaly/ruby" ++dir = "%%PREFIX%%/share/gitaly/ruby" # # 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 -dir = "/home/git/gitlab-shell" -+dir = "/usr/local/share/gitlab-shell" ++dir = "%%PREFIX%%/share/gitlab-shell" # # You can adjust the concurrency of each RPC endpoint # [[concurrency]] Index: branches/2018Q3/devel/gitaly/files/patch-ruby_Gemfile =================================================================== --- branches/2018Q3/devel/gitaly/files/patch-ruby_Gemfile (revision 474948) +++ branches/2018Q3/devel/gitaly/files/patch-ruby_Gemfile (revision 474949) @@ -1,19 +1,26 @@ ---- 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 -end Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 474948) +++ branches/2018Q3 (revision 474949) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r473905,474905