From c38b989478106a6bd9a3dbc07c6f752a99390a98 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Mon, 8 Mar 2021 11:11:53 +0000 Subject: [PATCH 1/2] Set google-protobuf dependency to a version that works. Gitlab does not work with google-protobuff 3.15.x. Using the new version causes segfaults: /usr/local/lib/libruby27.so.27(rb_profile_frame_full_label+0x1665) [0x80059c535] /usr/local/lib/libruby27.so.27(0x8003fa3fb) [0x8003fa3fb] /usr/local/lib/libruby27.so.27(0x8005094d2) [0x8005094d2] /lib/libthr.so.3(_pthread_sigmask+0x53e) [0x800649b7e] /lib/libthr.so.3(0x80064913f) [0x80064913f] [0x7ffffffff193] /usr/local/lib/ruby/gems/2.7/gems/google-protobuf-3.15.0/lib/google/protobuf_c.so(Defs_register+0xc99) [0x811958699] /usr/local/lib/ruby/gems/2.7/gems/google-protobuf-3.15.0/lib/google/protobuf_c.so(0x81195c675) [0x81195c675] For more details see this bug report: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254010 --- ruby/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/Gemfile b/ruby/Gemfile index cdb388b5d8..a865a03c68 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.12.0' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.12' +gem 'google-protobuf', '~> 3.14.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false -- GitLab From 4527410a5ae1cdd0cd57c198454e5195894752bd Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Wed, 24 Mar 2021 07:33:51 +0100 Subject: [PATCH 2/2] Manually edited the .lock file (I do not have a build environment for ruby available. --- ruby/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 456f201308..5f89189610 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -75,7 +75,7 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) - google-protobuf (3.12.4) + google-protobuf (3.14.0) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) grpc (1.30.2) @@ -217,7 +217,7 @@ DEPENDENCIES gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.12.0) gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.12) + google-protobuf (~> 3.14.0) grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 8.9.0) -- GitLab