Date: Mon, 8 Mar 2021 11:18:05 +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: r567835 - in head/devel/gitaly: . files Message-ID: <202103081118.128BI515036881@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Mon Mar 8 11:18:05 2021 New Revision: 567835 URL: https://svnweb.freebsd.org/changeset/ports/567835 Log: Make sure we use google-protobug version that does not segfault. Is also reported upstream: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3233 Modified: head/devel/gitaly/Makefile head/devel/gitaly/files/patch-ruby_Gemfile Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Mon Mar 8 11:10:09 2021 (r567834) +++ head/devel/gitaly/Makefile Mon Mar 8 11:18:05 2021 (r567835) @@ -2,7 +2,7 @@ PORTNAME= gitaly DISTVERSION= 13.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -27,7 +27,7 @@ MY_DEPENDS= git>=2.29:devel/git \ rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \ rubygem-gitlab-labkit>=0.15.0<0.16:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ - rubygem-google-protobuf314>=3.12.0<4:devel/rubygem-google-protobuf314 + rubygem-google-protobuf314>=3.12.0<3.15:devel/rubygem-google-protobuf314 BUILD_DEPENDS= gem:devel/ruby-gems \ bash>0:shells/bash \ ${MY_DEPENDS} Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Mon Mar 8 11:10:09 2021 (r567834) +++ head/devel/gitaly/files/patch-ruby_Gemfile Mon Mar 8 11:18:05 2021 (r567835) @@ -1,8 +1,11 @@ ---- ruby/Gemfile.orig 2021-02-19 09:28:00 UTC +--- ruby/Gemfile.orig 2021-03-04 13:36:33 UTC +++ ruby/Gemfile -@@ -21,13 +21,3 @@ gem 'licensee', '~> 9.14.1' +@@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.15.0' + # This version needs to be in sync with GitLab CE/EE + gem 'licensee', '~> 9.14.1' - gem 'google-protobuf', '~> 3.12' +-gem 'google-protobuf', '~> 3.12' ++gem 'google-protobuf', '~> 3.14.0' -group :development, :test do - gem 'rubocop', '~> 0.69', require: false
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103081118.128BI515036881>