Date: Mon, 22 Nov 2021 15:18:11 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0bbacd67dc43 - main - www/gitlab-ce: fix segfaults Message-ID: <202111221518.1AMFIBku058138@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bbacd67dc435bd595e7ef204fb002e2ee2df210 commit 0bbacd67dc435bd595e7ef204fb002e2ee2df210 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2021-11-21 07:56:27 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2021-11-22 15:17:58 +0000 www/gitlab-ce: fix segfaults Accessing the project page or doing anything that is related to a license file caused segfault in gitaly. Upgrading now the gems to this specific version fixed the problem. As we need to use a prerelease of rubygem-grpc, it is added as extra port. Please see also upstream here: https://gitlab.com/gitlab-org/gitlab/-/issues/345693 PR: 259848 Reported by: admin@asu-vei.ru --- devel/gitaly/Makefile | 14 +- devel/gitaly/files/patch-4108.patch | 770 +++++++++++++++++++++ devel/gitaly/files/patch-ruby_Gemfile | 21 +- devel/rubygem-gitlab-labkit/Makefile | 4 +- .../files/patch-gitlab-labkit.gemspec | 29 + net/Makefile | 1 + net/rubygem-gitaly/Makefile | 4 +- net/rubygem-gitaly/files/patch-gitaly.gemspec | 18 + net/rubygem-grpc142/Makefile | 30 + net/rubygem-grpc142/distinfo | 3 + .../files/patch-src_ruby_ext_grpc_extconf.rb | 51 ++ .../files/patch-src_ruby_lib_grpc.rb | 11 + net/rubygem-grpc142/pkg-descr | 3 + net/rubygem-kas-grpc/Makefile | 4 +- net/rubygem-kas-grpc/files/patch-kas-grpc.gemspec | 18 + net/rubygem-spamcheck/Makefile | 4 +- .../files/patch-spamcheck.gemspec | 18 + textproc/Makefile | 1 + textproc/rubygem-autoprefixer-rails1025/Makefile | 22 + textproc/rubygem-autoprefixer-rails1025/distinfo | 3 + textproc/rubygem-autoprefixer-rails1025/pkg-descr | 5 + www/gitlab-ce/Makefile | 8 +- www/gitlab-ce/files/patch-Gemfile | 9 +- 23 files changed, 1023 insertions(+), 28 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 87a813144c2b..c381a0fcf779 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,18 +1,18 @@ PORTNAME= gitaly DISTVERSION= 14.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel -#PATCH_SITES= https://gitlab.com/mfechner/gitaly/-/merge_requests/ -# Make sure we have grpc files for grpc 1.41.0 available -#PATCHFILES= 2.patch:-p1 - MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +# Make sure the following patch is included: +# https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4108 +# it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848 + # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ @@ -23,13 +23,13 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ - rubygem-grpc130>=1.30.2<2:net/rubygem-grpc130 \ + rubygem-grpc142>=1.42.0.pre1<2:net/rubygem-grpc142 \ rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \ rubygem-faraday>=1.0.1<2:www/rubygem-faraday \ rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \ rubygem-gitlab-labkit>=0.21.1<0.22:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ - rubygem-google-protobuf317>=3.17.3<3.18:devel/rubygem-google-protobuf317 + rubygem-google-protobuf>=3.19.0<3.20:devel/rubygem-google-protobuf BUILD_DEPENDS= gem:devel/ruby-gems \ bash>0:shells/bash \ ${MY_DEPENDS} diff --git a/devel/gitaly/files/patch-4108.patch b/devel/gitaly/files/patch-4108.patch new file mode 100644 index 000000000000..90551051d743 --- /dev/null +++ b/devel/gitaly/files/patch-4108.patch @@ -0,0 +1,770 @@ +--- ruby/proto/gitaly/blob_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/blob_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: blob.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("blob.proto", :syntax => :proto3) do + add_message "gitaly.GetBlobRequest" do +--- ruby/proto/gitaly/blob_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/blob_services_pb.rb +@@ -8,7 +8,7 @@ module Gitaly + module BlobService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode +@@ -17,29 +17,29 @@ module Gitaly + # GetBlob returns the contents of a blob object referenced by its object + # ID. We use a stream to return a chunked arbitrarily large binary + # response +- rpc :GetBlob, Gitaly::GetBlobRequest, stream(Gitaly::GetBlobResponse) +- rpc :GetBlobs, Gitaly::GetBlobsRequest, stream(Gitaly::GetBlobsResponse) ++ rpc :GetBlob, ::Gitaly::GetBlobRequest, stream(::Gitaly::GetBlobResponse) ++ rpc :GetBlobs, ::Gitaly::GetBlobsRequest, stream(::Gitaly::GetBlobsResponse) + # ListBlobs will list all blobs reachable from a given set of revisions by + # doing a graph walk. It is not valid to pass revisions which do not resolve + # to an existing object. +- rpc :ListBlobs, Gitaly::ListBlobsRequest, stream(Gitaly::ListBlobsResponse) ++ rpc :ListBlobs, ::Gitaly::ListBlobsRequest, stream(::Gitaly::ListBlobsResponse) + # ListAllBlobs retrieves all blobs pointers in the repository, including + # those not reachable by any reference. +- rpc :ListAllBlobs, Gitaly::ListAllBlobsRequest, stream(Gitaly::ListAllBlobsResponse) ++ rpc :ListAllBlobs, ::Gitaly::ListAllBlobsRequest, stream(::Gitaly::ListAllBlobsResponse) + # GetLFSPointers retrieves LFS pointers from a given set of object IDs. + # This RPC filters all requested objects and only returns those which refer + # to a valid LFS pointer. +- rpc :GetLFSPointers, Gitaly::GetLFSPointersRequest, stream(Gitaly::GetLFSPointersResponse) ++ rpc :GetLFSPointers, ::Gitaly::GetLFSPointersRequest, stream(::Gitaly::GetLFSPointersResponse) + # ListLFSPointers retrieves LFS pointers reachable from a given set of + # revisions by doing a graph walk. This includes both normal revisions like + # an object ID or branch, but also the pseudo-revisions "--all" and "--not" + # as documented in git-rev-parse(1). Revisions which don't directly or + # transitively reference any LFS pointers are ignored. It is not valid to + # pass revisions which do not resolve to an existing object. +- rpc :ListLFSPointers, Gitaly::ListLFSPointersRequest, stream(Gitaly::ListLFSPointersResponse) ++ rpc :ListLFSPointers, ::Gitaly::ListLFSPointersRequest, stream(::Gitaly::ListLFSPointersResponse) + # ListAllLFSPointers retrieves all LFS pointers in the repository, including + # those not reachable by any reference. +- rpc :ListAllLFSPointers, Gitaly::ListAllLFSPointersRequest, stream(Gitaly::ListAllLFSPointersResponse) ++ rpc :ListAllLFSPointers, ::Gitaly::ListAllLFSPointersRequest, stream(::Gitaly::ListAllLFSPointersResponse) + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/cleanup_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/cleanup_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: cleanup.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("cleanup.proto", :syntax => :proto3) do + add_message "gitaly.ApplyBfgObjectMapStreamRequest" do +--- ruby/proto/gitaly/cleanup_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/cleanup_services_pb.rb +@@ -8,13 +8,13 @@ module Gitaly + module CleanupService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.CleanupService' + +- rpc :ApplyBfgObjectMapStream, stream(Gitaly::ApplyBfgObjectMapStreamRequest), stream(Gitaly::ApplyBfgObjectMapStreamResponse) ++ rpc :ApplyBfgObjectMapStream, stream(::Gitaly::ApplyBfgObjectMapStreamRequest), stream(::Gitaly::ApplyBfgObjectMapStreamResponse) + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/commit_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/commit_pb.rb +@@ -1,11 +1,11 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: commit.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' + require 'google/protobuf/timestamp_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("commit.proto", :syntax => :proto3) do + add_message "gitaly.ListCommitsRequest" do +--- ruby/proto/gitaly/commit_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/commit_services_pb.rb +@@ -8,7 +8,7 @@ module Gitaly + module CommitService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode +--- ruby/proto/gitaly/conflicts_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/conflicts_pb.rb +@@ -1,11 +1,11 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: conflicts.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' + require 'google/protobuf/timestamp_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("conflicts.proto", :syntax => :proto3) do + add_message "gitaly.ListConflictFilesRequest" do +--- ruby/proto/gitaly/conflicts_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/conflicts_services_pb.rb +@@ -8,17 +8,17 @@ module Gitaly + module ConflictsService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.ConflictsService' + +- rpc :ListConflictFiles, Gitaly::ListConflictFilesRequest, stream(Gitaly::ListConflictFilesResponse) ++ rpc :ListConflictFiles, ::Gitaly::ListConflictFilesRequest, stream(::Gitaly::ListConflictFilesResponse) + # ResolveConflicts tries to resolve a conflicting merge with a set of + # user-provided merge resolutions. If resolving the conflict succeeds, the + # result will be a new merge commit. +- rpc :ResolveConflicts, stream(Gitaly::ResolveConflictsRequest), Gitaly::ResolveConflictsResponse ++ rpc :ResolveConflicts, stream(::Gitaly::ResolveConflictsRequest), ::Gitaly::ResolveConflictsResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/diff_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/diff_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: diff.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("diff.proto", :syntax => :proto3) do + add_message "gitaly.CommitDiffRequest" do +--- ruby/proto/gitaly/diff_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/diff_services_pb.rb +@@ -8,21 +8,21 @@ module Gitaly + module DiffService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.DiffService' + + # Returns stream of CommitDiffResponse with patches chunked over messages +- rpc :CommitDiff, Gitaly::CommitDiffRequest, stream(Gitaly::CommitDiffResponse) ++ rpc :CommitDiff, ::Gitaly::CommitDiffRequest, stream(::Gitaly::CommitDiffResponse) + # Return a stream so we can divide the response in chunks of deltas +- rpc :CommitDelta, Gitaly::CommitDeltaRequest, stream(Gitaly::CommitDeltaResponse) +- rpc :RawDiff, Gitaly::RawDiffRequest, stream(Gitaly::RawDiffResponse) +- rpc :RawPatch, Gitaly::RawPatchRequest, stream(Gitaly::RawPatchResponse) +- rpc :DiffStats, Gitaly::DiffStatsRequest, stream(Gitaly::DiffStatsResponse) ++ rpc :CommitDelta, ::Gitaly::CommitDeltaRequest, stream(::Gitaly::CommitDeltaResponse) ++ rpc :RawDiff, ::Gitaly::RawDiffRequest, stream(::Gitaly::RawDiffResponse) ++ rpc :RawPatch, ::Gitaly::RawPatchRequest, stream(::Gitaly::RawPatchResponse) ++ rpc :DiffStats, ::Gitaly::DiffStatsRequest, stream(::Gitaly::DiffStatsResponse) + # Return a list of files changed along with the status of each file +- rpc :FindChangedPaths, Gitaly::FindChangedPathsRequest, stream(Gitaly::FindChangedPathsResponse) ++ rpc :FindChangedPaths, ::Gitaly::FindChangedPathsRequest, stream(::Gitaly::FindChangedPathsResponse) + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/hook_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/hook_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: hook.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("hook.proto", :syntax => :proto3) do + add_message "gitaly.PreReceiveHookRequest" do +--- ruby/proto/gitaly/hook_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/hook_services_pb.rb +@@ -8,23 +8,23 @@ module Gitaly + module HookService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.HookService' + +- rpc :PreReceiveHook, stream(Gitaly::PreReceiveHookRequest), stream(Gitaly::PreReceiveHookResponse) +- rpc :PostReceiveHook, stream(Gitaly::PostReceiveHookRequest), stream(Gitaly::PostReceiveHookResponse) +- rpc :UpdateHook, Gitaly::UpdateHookRequest, stream(Gitaly::UpdateHookResponse) +- rpc :ReferenceTransactionHook, stream(Gitaly::ReferenceTransactionHookRequest), stream(Gitaly::ReferenceTransactionHookResponse) ++ rpc :PreReceiveHook, stream(::Gitaly::PreReceiveHookRequest), stream(::Gitaly::PreReceiveHookResponse) ++ rpc :PostReceiveHook, stream(::Gitaly::PostReceiveHookRequest), stream(::Gitaly::PostReceiveHookResponse) ++ rpc :UpdateHook, ::Gitaly::UpdateHookRequest, stream(::Gitaly::UpdateHookResponse) ++ rpc :ReferenceTransactionHook, stream(::Gitaly::ReferenceTransactionHookRequest), stream(::Gitaly::ReferenceTransactionHookResponse) + # PackObjectsHook is meant to be called by git-upload-pack via the + # uploadpack.packObjectsHook mechanism. It generates a stream of packed + # Git objects. +- rpc :PackObjectsHook, stream(Gitaly::PackObjectsHookRequest), stream(Gitaly::PackObjectsHookResponse) ++ rpc :PackObjectsHook, stream(::Gitaly::PackObjectsHookRequest), stream(::Gitaly::PackObjectsHookResponse) + # PackObjectsHookWithSidechannel is an optimized version of PackObjectsHook that uses + # a unix socket side channel. +- rpc :PackObjectsHookWithSidechannel, Gitaly::PackObjectsHookWithSidechannelRequest, Gitaly::PackObjectsHookWithSidechannelResponse ++ rpc :PackObjectsHookWithSidechannel, ::Gitaly::PackObjectsHookWithSidechannelRequest, ::Gitaly::PackObjectsHookWithSidechannelResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/internal_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/internal_pb.rb +@@ -1,9 +1,9 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: internal.proto + ++require 'lint_pb' + require 'google/protobuf' + +-require 'lint_pb' + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("internal.proto", :syntax => :proto3) do + add_message "gitaly.WalkReposRequest" do +--- ruby/proto/gitaly/internal_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/internal_services_pb.rb +@@ -10,7 +10,7 @@ module Gitaly + # only reachable by Praefect or other Gitalies + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode +@@ -18,7 +18,7 @@ module Gitaly + + # WalkRepos walks the storage and streams back all known git repos on the + # requested storage +- rpc :WalkRepos, Gitaly::WalkReposRequest, stream(Gitaly::WalkReposResponse) ++ rpc :WalkRepos, ::Gitaly::WalkReposRequest, stream(::Gitaly::WalkReposResponse) + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/lint_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/lint_pb.rb +@@ -1,6 +1,7 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: lint.proto + ++require 'google/protobuf/descriptor_pb' + require 'google/protobuf' + + Google::Protobuf::DescriptorPool.generated_pool.build do +--- ruby/proto/gitaly/namespace_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/namespace_pb.rb +@@ -1,9 +1,9 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: namespace.proto + ++require 'lint_pb' + require 'google/protobuf' + +-require 'lint_pb' + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("namespace.proto", :syntax => :proto3) do + add_message "gitaly.AddNamespaceRequest" do +--- ruby/proto/gitaly/namespace_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/namespace_services_pb.rb +@@ -8,16 +8,16 @@ module Gitaly + module NamespaceService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.NamespaceService' + +- rpc :AddNamespace, Gitaly::AddNamespaceRequest, Gitaly::AddNamespaceResponse +- rpc :RemoveNamespace, Gitaly::RemoveNamespaceRequest, Gitaly::RemoveNamespaceResponse +- rpc :RenameNamespace, Gitaly::RenameNamespaceRequest, Gitaly::RenameNamespaceResponse +- rpc :NamespaceExists, Gitaly::NamespaceExistsRequest, Gitaly::NamespaceExistsResponse ++ rpc :AddNamespace, ::Gitaly::AddNamespaceRequest, ::Gitaly::AddNamespaceResponse ++ rpc :RemoveNamespace, ::Gitaly::RemoveNamespaceRequest, ::Gitaly::RemoveNamespaceResponse ++ rpc :RenameNamespace, ::Gitaly::RenameNamespaceRequest, ::Gitaly::RenameNamespaceResponse ++ rpc :NamespaceExists, ::Gitaly::NamespaceExistsRequest, ::Gitaly::NamespaceExistsResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/objectpool_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/objectpool_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: objectpool.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("objectpool.proto", :syntax => :proto3) do + add_message "gitaly.CreateObjectPoolRequest" do +--- ruby/proto/gitaly/operations_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/operations_pb.rb +@@ -1,12 +1,12 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: operations.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' + require 'errors_pb' + require 'google/protobuf/timestamp_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("operations.proto", :syntax => :proto3) do + add_message "gitaly.UserCreateBranchRequest" do +--- ruby/proto/gitaly/operations_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/operations_services_pb.rb +@@ -12,23 +12,23 @@ module Gitaly + # '/allowed' endpoint. + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.OperationService' + +- rpc :UserCreateBranch, Gitaly::UserCreateBranchRequest, Gitaly::UserCreateBranchResponse +- rpc :UserUpdateBranch, Gitaly::UserUpdateBranchRequest, Gitaly::UserUpdateBranchResponse +- rpc :UserDeleteBranch, Gitaly::UserDeleteBranchRequest, Gitaly::UserDeleteBranchResponse ++ rpc :UserCreateBranch, ::Gitaly::UserCreateBranchRequest, ::Gitaly::UserCreateBranchResponse ++ rpc :UserUpdateBranch, ::Gitaly::UserUpdateBranchRequest, ::Gitaly::UserUpdateBranchResponse ++ rpc :UserDeleteBranch, ::Gitaly::UserDeleteBranchRequest, ::Gitaly::UserDeleteBranchResponse + # UserCreateTag creates a new tag. +- rpc :UserCreateTag, Gitaly::UserCreateTagRequest, Gitaly::UserCreateTagResponse +- rpc :UserDeleteTag, Gitaly::UserDeleteTagRequest, Gitaly::UserDeleteTagResponse ++ rpc :UserCreateTag, ::Gitaly::UserCreateTagRequest, ::Gitaly::UserCreateTagResponse ++ rpc :UserDeleteTag, ::Gitaly::UserDeleteTagRequest, ::Gitaly::UserDeleteTagResponse + # UserMergeRef creates a merge commit and updates target_ref to point to that + # new commit. The first parent of the merge commit (the main line) is taken + # from first_parent_ref. The second parent is specified by its commit ID in source_sha. + # If target_ref already exists it will be overwritten. +- rpc :UserMergeToRef, Gitaly::UserMergeToRefRequest, Gitaly::UserMergeToRefResponse ++ rpc :UserMergeToRef, ::Gitaly::UserMergeToRefRequest, ::Gitaly::UserMergeToRefResponse + # UserMergeBranch tries to merge the given commit into the target branch. + # The merge commit is created with the given user as author/committer and + # the given message. +@@ -38,20 +38,20 @@ module Gitaly + # requested merge, which will result in a response with the created merge + # commit ID. Only if a second message with `apply = true` is sent will the + # merge be applied. +- rpc :UserMergeBranch, stream(Gitaly::UserMergeBranchRequest), stream(Gitaly::UserMergeBranchResponse) ++ rpc :UserMergeBranch, stream(::Gitaly::UserMergeBranchRequest), stream(::Gitaly::UserMergeBranchResponse) + # UserFFBranch tries to perform a fast-forward merge of the given branch to + # the given commit. If the merge is not a fast-forward merge, the request + # will fail. The RPC will return an empty response in case updating the + # reference fails e.g. because of a race. +- rpc :UserFFBranch, Gitaly::UserFFBranchRequest, Gitaly::UserFFBranchResponse ++ rpc :UserFFBranch, ::Gitaly::UserFFBranchRequest, ::Gitaly::UserFFBranchResponse + # UserCherryPick tries to perform a cherry-pick of a given commit onto a + # branch. +- rpc :UserCherryPick, Gitaly::UserCherryPickRequest, Gitaly::UserCherryPickResponse ++ rpc :UserCherryPick, ::Gitaly::UserCherryPickRequest, ::Gitaly::UserCherryPickResponse + # UserCommitFiles builds a commit from a stream of actions and updates the target branch to point to it. + # UserCommitFilesRequest with a UserCommitFilesRequestHeader must be sent as the first message of the stream. + # Following that, a variable number of actions can be sent to build a new commit. Each action consists of + # a header followed by content if used by the action. +- rpc :UserCommitFiles, stream(Gitaly::UserCommitFilesRequest), Gitaly::UserCommitFilesResponse ++ rpc :UserCommitFiles, stream(::Gitaly::UserCommitFilesRequest), ::Gitaly::UserCommitFilesResponse + # UserRebaseConfirmable rebases the given remote branch onto a target + # branch. The remote branch may be part of another repository. + # +@@ -60,15 +60,15 @@ module Gitaly + # requested rebase, which will result in a response with the created rebase + # commit ID. Only if a second message with `apply = true` is sent will the + # rebase be applied. +- rpc :UserRebaseConfirmable, stream(Gitaly::UserRebaseConfirmableRequest), stream(Gitaly::UserRebaseConfirmableResponse) ++ rpc :UserRebaseConfirmable, stream(::Gitaly::UserRebaseConfirmableRequest), stream(::Gitaly::UserRebaseConfirmableResponse) + # UserRevert tries to perform a revert of a given commit onto a branch. +- rpc :UserRevert, Gitaly::UserRevertRequest, Gitaly::UserRevertResponse ++ rpc :UserRevert, ::Gitaly::UserRevertRequest, ::Gitaly::UserRevertResponse + # UserSquash squashes a range of commits into a single commit. +- rpc :UserSquash, Gitaly::UserSquashRequest, Gitaly::UserSquashResponse ++ rpc :UserSquash, ::Gitaly::UserSquashRequest, ::Gitaly::UserSquashResponse + # UserApplyPatch applies patches to a given branch. +- rpc :UserApplyPatch, stream(Gitaly::UserApplyPatchRequest), Gitaly::UserApplyPatchResponse ++ rpc :UserApplyPatch, stream(::Gitaly::UserApplyPatchRequest), ::Gitaly::UserApplyPatchResponse + # UserUpdateSubmodule updates a submodule to point to a new commit. +- rpc :UserUpdateSubmodule, Gitaly::UserUpdateSubmoduleRequest, Gitaly::UserUpdateSubmoduleResponse ++ rpc :UserUpdateSubmodule, ::Gitaly::UserUpdateSubmoduleRequest, ::Gitaly::UserUpdateSubmoduleResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/praefect_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/praefect_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: praefect.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("praefect.proto", :syntax => :proto3) do + add_message "gitaly.SetReplicationFactorRequest" do +--- ruby/proto/gitaly/praefect_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/praefect_services_pb.rb +@@ -8,19 +8,19 @@ module Gitaly + module PraefectInfoService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.PraefectInfoService' + +- rpc :RepositoryReplicas, Gitaly::RepositoryReplicasRequest, Gitaly::RepositoryReplicasResponse ++ rpc :RepositoryReplicas, ::Gitaly::RepositoryReplicasRequest, ::Gitaly::RepositoryReplicasResponse + # DatalossCheck checks for unavailable repositories. +- rpc :DatalossCheck, Gitaly::DatalossCheckRequest, Gitaly::DatalossCheckResponse ++ rpc :DatalossCheck, ::Gitaly::DatalossCheckRequest, ::Gitaly::DatalossCheckResponse + # SetAuthoritativeStorage sets the authoritative storage for a repository on a given virtual storage. + # This causes the current version of the repository on the authoritative storage to be considered the + # latest and overwrite any other version on the virtual storage. +- rpc :SetAuthoritativeStorage, Gitaly::SetAuthoritativeStorageRequest, Gitaly::SetAuthoritativeStorageResponse ++ rpc :SetAuthoritativeStorage, ::Gitaly::SetAuthoritativeStorageRequest, ::Gitaly::SetAuthoritativeStorageResponse + # SetReplicationFactor assigns or unassigns host nodes from the repository to meet the desired replication factor. + # SetReplicationFactor returns an error when trying to set a replication factor that exceeds the storage node count + # in the virtual storage. An error is also returned when trying to set a replication factor below one. The primary node +@@ -29,7 +29,7 @@ module Gitaly + # This might cause the actual replication factor to be higher than desired if the replication factor is set during an upgrade + # from a Praefect node that does not yet know about a new node. As assignments of unconfigured storages are ignored, replication + # factor of repositories assigned to a storage node removed from the cluster is effectively decreased. +- rpc :SetReplicationFactor, Gitaly::SetReplicationFactorRequest, Gitaly::SetReplicationFactorResponse ++ rpc :SetReplicationFactor, ::Gitaly::SetReplicationFactorRequest, ::Gitaly::SetReplicationFactorResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/remote_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/remote_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: remote.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("remote.proto", :syntax => :proto3) do + add_message "gitaly.UpdateRemoteMirrorRequest" do +--- ruby/proto/gitaly/remote_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/remote_services_pb.rb +@@ -8,7 +8,7 @@ module Gitaly + module RemoteService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode +@@ -19,14 +19,14 @@ module Gitaly + # references to the mirror. Created and modified references are updated, removed references are + # deleted from the mirror. UpdateRemoteMirror updates all tags. Branches are updated if they match + # the patterns specified in the requests. +- rpc :UpdateRemoteMirror, stream(Gitaly::UpdateRemoteMirrorRequest), Gitaly::UpdateRemoteMirrorResponse +- rpc :FindRemoteRepository, Gitaly::FindRemoteRepositoryRequest, Gitaly::FindRemoteRepositoryResponse ++ rpc :UpdateRemoteMirror, stream(::Gitaly::UpdateRemoteMirrorRequest), ::Gitaly::UpdateRemoteMirrorResponse ++ rpc :FindRemoteRepository, ::Gitaly::FindRemoteRepositoryRequest, ::Gitaly::FindRemoteRepositoryResponse + # FindRemoteRootRef tries to find the root reference of a remote + # repository. The root reference is the default branch as pointed to by + # the remotes HEAD reference. Returns an InvalidArgument error if the + # specified remote does not exist and a NotFound error in case no HEAD + # branch was found. +- rpc :FindRemoteRootRef, Gitaly::FindRemoteRootRefRequest, Gitaly::FindRemoteRootRefResponse ++ rpc :FindRemoteRootRef, ::Gitaly::FindRemoteRootRefRequest, ::Gitaly::FindRemoteRootRefResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/repository-service_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/repository-service_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: repository-service.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("repository-service.proto", :syntax => :proto3) do + add_message "gitaly.RepositoryExistsRequest" do +--- ruby/proto/gitaly/server_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/server_pb.rb +@@ -1,9 +1,9 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: server.proto + ++require 'lint_pb' + require 'google/protobuf' + +-require 'lint_pb' + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("server.proto", :syntax => :proto3) do + add_message "gitaly.ServerInfoRequest" do +--- ruby/proto/gitaly/server_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/server_services_pb.rb +@@ -8,14 +8,14 @@ module Gitaly + module ServerService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.ServerService' + +- rpc :ServerInfo, Gitaly::ServerInfoRequest, Gitaly::ServerInfoResponse +- rpc :DiskStatistics, Gitaly::DiskStatisticsRequest, Gitaly::DiskStatisticsResponse ++ rpc :ServerInfo, ::Gitaly::ServerInfoRequest, ::Gitaly::ServerInfoResponse ++ rpc :DiskStatistics, ::Gitaly::DiskStatisticsRequest, ::Gitaly::DiskStatisticsResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/shared_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/shared_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: shared.proto + +-require 'google/protobuf' +- + require 'google/protobuf/timestamp_pb' + require 'lint_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("shared.proto", :syntax => :proto3) do + add_message "gitaly.Repository" do +--- ruby/proto/gitaly/smarthttp_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/smarthttp_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: smarthttp.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("smarthttp.proto", :syntax => :proto3) do + add_message "gitaly.InfoRefsRequest" do +--- ruby/proto/gitaly/smarthttp_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/smarthttp_services_pb.rb +@@ -8,7 +8,7 @@ module Gitaly + module SmartHTTPService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode +@@ -17,17 +17,17 @@ module Gitaly + # The response body for GET /info/refs?service=git-upload-pack + # Will be invoked when the user executes a `git fetch`, meaning the server + # will upload the packs to that user. The user doesn't upload new objects. +- rpc :InfoRefsUploadPack, Gitaly::InfoRefsRequest, stream(Gitaly::InfoRefsResponse) ++ rpc :InfoRefsUploadPack, ::Gitaly::InfoRefsRequest, stream(::Gitaly::InfoRefsResponse) + # The response body for GET /info/refs?service=git-receive-pack + # Will be invoked when the user executes a `git push`, but only advertises + # references to the user. +- rpc :InfoRefsReceivePack, Gitaly::InfoRefsRequest, stream(Gitaly::InfoRefsResponse) ++ rpc :InfoRefsReceivePack, ::Gitaly::InfoRefsRequest, stream(::Gitaly::InfoRefsResponse) + # Request and response body for POST /upload-pack +- rpc :PostUploadPack, stream(Gitaly::PostUploadPackRequest), stream(Gitaly::PostUploadPackResponse) ++ rpc :PostUploadPack, stream(::Gitaly::PostUploadPackRequest), stream(::Gitaly::PostUploadPackResponse) + # Request and response body for POST /upload-pack using sidechannel protocol +- rpc :PostUploadPackWithSidechannel, Gitaly::PostUploadPackWithSidechannelRequest, Gitaly::PostUploadPackWithSidechannelResponse ++ rpc :PostUploadPackWithSidechannel, ::Gitaly::PostUploadPackWithSidechannelRequest, ::Gitaly::PostUploadPackWithSidechannelResponse + # Request and response body for POST /receive-pack +- rpc :PostReceivePack, stream(Gitaly::PostReceivePackRequest), stream(Gitaly::PostReceivePackResponse) ++ rpc :PostReceivePack, stream(::Gitaly::PostReceivePackRequest), stream(::Gitaly::PostReceivePackResponse) + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/ssh_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/ssh_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: ssh.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("ssh.proto", :syntax => :proto3) do + add_message "gitaly.SSHUploadPackRequest" do +--- ruby/proto/gitaly/ssh_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/ssh_services_pb.rb +@@ -8,18 +8,18 @@ module Gitaly + module SSHService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.SSHService' + + # To forward 'git upload-pack' to Gitaly for SSH sessions +- rpc :SSHUploadPack, stream(Gitaly::SSHUploadPackRequest), stream(Gitaly::SSHUploadPackResponse) ++ rpc :SSHUploadPack, stream(::Gitaly::SSHUploadPackRequest), stream(::Gitaly::SSHUploadPackResponse) + # To forward 'git receive-pack' to Gitaly for SSH sessions +- rpc :SSHReceivePack, stream(Gitaly::SSHReceivePackRequest), stream(Gitaly::SSHReceivePackResponse) ++ rpc :SSHReceivePack, stream(::Gitaly::SSHReceivePackRequest), stream(::Gitaly::SSHReceivePackResponse) + # To forward 'git upload-archive' to Gitaly for SSH sessions +- rpc :SSHUploadArchive, stream(Gitaly::SSHUploadArchiveRequest), stream(Gitaly::SSHUploadArchiveResponse) ++ rpc :SSHUploadArchive, stream(::Gitaly::SSHUploadArchiveRequest), stream(::Gitaly::SSHUploadArchiveResponse) + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/transaction_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/transaction_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: transaction.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("transaction.proto", :syntax => :proto3) do + add_message "gitaly.VoteTransactionRequest" do +--- ruby/proto/gitaly/transaction_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/transaction_services_pb.rb +@@ -8,14 +8,14 @@ module Gitaly + module RefTransaction + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.RefTransaction' + +- rpc :VoteTransaction, Gitaly::VoteTransactionRequest, Gitaly::VoteTransactionResponse +- rpc :StopTransaction, Gitaly::StopTransactionRequest, Gitaly::StopTransactionResponse ++ rpc :VoteTransaction, ::Gitaly::VoteTransactionRequest, ::Gitaly::VoteTransactionResponse ++ rpc :StopTransaction, ::Gitaly::StopTransactionRequest, ::Gitaly::StopTransactionResponse + end + + Stub = Service.rpc_stub_class +--- ruby/proto/gitaly/wiki_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/wiki_pb.rb +@@ -1,10 +1,10 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! + # source: wiki.proto + +-require 'google/protobuf' +- + require 'lint_pb' + require 'shared_pb' ++require 'google/protobuf' ++ + Google::Protobuf::DescriptorPool.generated_pool.build do + add_file("wiki.proto", :syntax => :proto3) do + add_message "gitaly.WikiCommitDetails" do +--- ruby/proto/gitaly/wiki_services_pb.rb.orig 2021-11-08 11:56:42 UTC ++++ ruby/proto/gitaly/wiki_services_pb.rb +@@ -8,18 +8,18 @@ module Gitaly + module WikiService + class Service + +- include GRPC::GenericService ++ include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.WikiService' + +- rpc :WikiWritePage, stream(Gitaly::WikiWritePageRequest), Gitaly::WikiWritePageResponse +- rpc :WikiUpdatePage, stream(Gitaly::WikiUpdatePageRequest), Gitaly::WikiUpdatePageResponse ++ rpc :WikiWritePage, stream(::Gitaly::WikiWritePageRequest), ::Gitaly::WikiWritePageResponse ++ rpc :WikiUpdatePage, stream(::Gitaly::WikiUpdatePageRequest), ::Gitaly::WikiUpdatePageResponse + # WikiFindPage returns a stream because the page's raw_data field may be arbitrarily large. +- rpc :WikiFindPage, Gitaly::WikiFindPageRequest, stream(Gitaly::WikiFindPageResponse) +- rpc :WikiGetAllPages, Gitaly::WikiGetAllPagesRequest, stream(Gitaly::WikiGetAllPagesResponse) +- rpc :WikiListPages, Gitaly::WikiListPagesRequest, stream(Gitaly::WikiListPagesResponse) ++ rpc :WikiFindPage, ::Gitaly::WikiFindPageRequest, stream(::Gitaly::WikiFindPageResponse) ++ rpc :WikiGetAllPages, ::Gitaly::WikiGetAllPagesRequest, stream(::Gitaly::WikiGetAllPagesResponse) ++ rpc :WikiListPages, ::Gitaly::WikiListPagesRequest, stream(::Gitaly::WikiListPagesResponse) + end + + Stub = Service.rpc_stub_class diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 46224f7de0fa..eb82b8e37ad9 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,12 +1,21 @@ ---- ruby/Gemfile.orig 2021-11-08 11:56:42 UTC -+++ ruby/Gemfile -@@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.21.1' +--- ruby/Gemfile.orig 2021-11-08 12:56:42.000000000 +0100 ++++ ruby/Gemfile 2021-11-20 11:54:40.948647000 +0100 +@@ -7,7 +7,7 @@ + gem 'rdoc', '~> 6.0' + gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false + gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false +-gem 'grpc', '~> 1.30.2' ++gem 'grpc', '~> 1.42.0.pre1' + gem 'sentry-raven', '~> 3.0', require: false + gem 'faraday', '~> 1.0' + gem 'rbtrace', require: false +@@ -19,15 +19,5 @@ # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' - + -gem 'google-protobuf', '~> 3.17.0' -+gem 'google-protobuf', '~> 3.17.3' - ++gem 'google-protobuf', '~> 3.19.0' + -group :development, :test do - gem 'rubocop', '~> 0.69', require: false - gem 'rspec', require: false diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile index 7d89487cf758..d31771299d12 100644 --- a/devel/rubygem-gitlab-labkit/Makefile +++ b/devel/rubygem-gitlab-labkit/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-labkit PORTVERSION= 0.21.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-actionpack61>=5<7:www/rubygem-actionpack61 \ rubygem-activesupport61>=5<7:devel/rubygem-activesupport61 \ - rubygem-grpc130>=1.30<2:net/rubygem-grpc130 \ + rubygem-grpc142>=1.30<2:net/rubygem-grpc142 \ rubygem-jaeger-client>=1.1<2:devel/rubygem-jaeger-client \ rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing \ rubygem-pg_query>=2.1<3:databases/rubygem-pg_query \ diff --git a/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec b/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec new file mode 100644 index 000000000000..f8fc2a338f4f --- /dev/null +++ b/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec @@ -0,0 +1,29 @@ +--- gitlab-labkit.gemspec.orig 2021-11-22 11:14:49 UTC ++++ gitlab-labkit.gemspec +@@ -24,7 +24,7 @@ Gem::Specification.new do |s| + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q<actionpack>.freeze, [">= 5.0.0", "< 7.0.0"]) + s.add_runtime_dependency(%q<activesupport>.freeze, [">= 5.0.0", "< 7.0.0"]) +- s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.30"]) ++ s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.42.0.pre1"]) + s.add_runtime_dependency(%q<jaeger-client>.freeze, ["~> 1.1"]) + s.add_runtime_dependency(%q<opentracing>.freeze, ["~> 0.4"]) + s.add_runtime_dependency(%q<pg_query>.freeze, ["~> 2.1"]) +@@ -47,7 +47,7 @@ Gem::Specification.new do |s| + else + s.add_dependency(%q<actionpack>.freeze, [">= 5.0.0", "< 7.0.0"]) + s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0", "< 7.0.0"]) +- s.add_dependency(%q<grpc>.freeze, ["~> 1.30"]) ++ s.add_dependency(%q<grpc>.freeze, ["~> 1.42.0.pre1"]) + s.add_dependency(%q<jaeger-client>.freeze, ["~> 1.1"]) + s.add_dependency(%q<opentracing>.freeze, ["~> 0.4"]) + s.add_dependency(%q<pg_query>.freeze, ["~> 2.1"]) +@@ -71,7 +71,7 @@ Gem::Specification.new do |s| + else + s.add_dependency(%q<actionpack>.freeze, [">= 5.0.0", "< 7.0.0"]) + s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0", "< 7.0.0"]) +- s.add_dependency(%q<grpc>.freeze, ["~> 1.30"]) ++ s.add_dependency(%q<grpc>.freeze, ["~> 1.42.0.pre1"]) + s.add_dependency(%q<jaeger-client>.freeze, ["~> 1.1"]) + s.add_dependency(%q<opentracing>.freeze, ["~> 0.4"]) + s.add_dependency(%q<pg_query>.freeze, ["~> 2.1"]) diff --git a/net/Makefile b/net/Makefile index c99fdf916c76..8ada717b8b6c 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1296,6 +1296,7 @@ SUBDIR += rubygem-grpc SUBDIR += rubygem-grpc124 SUBDIR += rubygem-grpc130 + SUBDIR += rubygem-grpc142 SUBDIR += rubygem-hangouts-chat SUBDIR += rubygem-http-parser SUBDIR += rubygem-http_parser.rb diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index 2f8aad4157eb..1030fa291b89 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly PORTVERSION= 14.3.0.pre.rc2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net rubygems MASTER_SITES= RG @@ -9,7 +9,7 @@ COMMENT= Auto-generated gRPC client for gitaly LICENSE= MIT -RUN_DEPENDS= rubygem-grpc130>=1.0<2.0:net/rubygem-grpc130 \ +RUN_DEPENDS= rubygem-grpc142>=1.0<2.0:net/rubygem-grpc142 \ *** 361 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111221518.1AMFIBku058138>