From owner-svn-ports-head@freebsd.org Mon Mar 8 11:18:06 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B3E856ED28; Mon, 8 Mar 2021 11:18:06 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DvG6Q2DTrz4V0M; Mon, 8 Mar 2021 11:18:06 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B1F027E50; Mon, 8 Mar 2021 11:18:06 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 128BI5iH036882; Mon, 8 Mar 2021 11:18:05 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 128BI515036881; Mon, 8 Mar 2021 11:18:05 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202103081118.128BI515036881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Mon, 8 Mar 2021 11:18:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567835 - in head/devel/gitaly: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/devel/gitaly: . files X-SVN-Commit-Revision: 567835 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 11:18:06 -0000 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