Date: Tue, 5 Jun 2018 19:24:01 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471806 - in branches/2018Q2/devel/gitaly: . files Message-ID: <201806051924.w55JO11M059170@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Tue Jun 5 19:24:00 2018 New Revision: 471806 URL: https://svnweb.freebsd.org/changeset/ports/471806 Log: MFH: r469312 r469938 r470126 Remove duplicate entry of BUILD_DEPENDS - Fix indent rubygem-bundler is already listed in MY_DEPENDS. Differential Revision: https://reviews.freebsd.org/D15281 Submitted by: sunpoet (myself) Approved by: mfechner (maintainer) Upgrade devel/gitaly to 0.96.1 required for gitlab 10.7.x. Reviewed by: tz (mentor) Approved by: tz (mentor) Differential Revision: https://reviews.freebsd.org/D15323 Fixed a wrong standard path in a configuration. New projects can be created again if the standard gitaly configuration is used. Reviewed by: tz (mentor) Approved by: tz (mentor) Differential Revision: https://reviews.freebsd.org/D15447 Approved by: ports-secteam (eadler) Modified: branches/2018Q2/devel/gitaly/Makefile branches/2018Q2/devel/gitaly/distinfo branches/2018Q2/devel/gitaly/files/patch-config.toml.example branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile branches/2018Q2/devel/gitaly/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/gitaly/Makefile ============================================================================== --- branches/2018Q2/devel/gitaly/Makefile Tue Jun 5 19:16:33 2018 (r471805) +++ branches/2018Q2/devel/gitaly/Makefile Tue Jun 5 19:24:00 2018 (r471806) @@ -13,34 +13,34 @@ 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 @@ -48,7 +48,8 @@ post-patch: 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 Modified: branches/2018Q2/devel/gitaly/distinfo ============================================================================== --- branches/2018Q2/devel/gitaly/distinfo Tue Jun 5 19:16:33 2018 (r471805) +++ branches/2018Q2/devel/gitaly/distinfo Tue Jun 5 19:24:00 2018 (r471806) @@ -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 Modified: branches/2018Q2/devel/gitaly/files/patch-config.toml.example ============================================================================== --- branches/2018Q2/devel/gitaly/files/patch-config.toml.example Tue Jun 5 19:16:33 2018 (r471805) +++ branches/2018Q2/devel/gitaly/files/patch-config.toml.example Tue Jun 5 19:24:00 2018 (r471806) @@ -1,4 +1,4 @@ ---- 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 @@ -28,7 +28,7 @@ # # 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 @@ -37,12 +37,12 @@ # # 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]] Modified: branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile Tue Jun 5 19:16:33 2018 (r471805) +++ branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile Tue Jun 5 19:24:00 2018 (r471806) @@ -1,6 +1,12 @@ ---- 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' Modified: branches/2018Q2/devel/gitaly/pkg-plist ============================================================================== --- branches/2018Q2/devel/gitaly/pkg-plist Tue Jun 5 19:16:33 2018 (r471805) +++ branches/2018Q2/devel/gitaly/pkg-plist Tue Jun 5 19:24:00 2018 (r471806) @@ -1,5 +1,4 @@ %%DATADIR%%/ruby/Gemfile -%%DATADIR%%/ruby/Gemfile.lock %%DATADIR%%/ruby/README.md @(,,555) %%DATADIR%%/ruby/bin/gitaly-ruby @(,,555) %%DATADIR%%/ruby/bin/ruby-cd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806051924.w55JO11M059170>