From nobody Fri Nov 19 14:38:08 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BA41518A7EFD; Fri, 19 Nov 2021 14:38:08 +0000 (UTC) (envelope-from git@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 4HwfR44W2wz4sXL; Fri, 19 Nov 2021 14:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7726920D3; Fri, 19 Nov 2021 14:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AJEc80v037636; Fri, 19 Nov 2021 14:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AJEc8P1037635; Fri, 19 Nov 2021 14:38:08 GMT (envelope-from git) Date: Fri, 19 Nov 2021 14:38:08 GMT Message-Id: <202111191438.1AJEc8P1037635@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 0aac4480b255 - main - www/gitlab-ce: Use grpc 1.30.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0aac4480b2555d806f449b77e755cf7cfd616707 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0aac4480b2555d806f449b77e755cf7cfd616707 commit 0aac4480b2555d806f449b77e755cf7cfd616707 Author: Matthias Fechner AuthorDate: 2021-11-17 14:58:44 +0000 Commit: Matthias Fechner CommitDate: 2021-11-19 14:37:42 +0000 www/gitlab-ce: Use grpc 1.30.2 We currently see problems and gitlab suggested to use grpc 1.30.2: https://gitlab.com/gitlab-org/gitlab/-/issues/345693#note_734676746 Newer version of grpc and google-protobuf have known bugs. The open bug that license files cannot not be handled is tracked here: https://gitlab.com/gitlab-org/gitlab/-/issues/345693 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848 --- devel/Makefile | 1 + devel/gitaly/Makefile | 4 +- devel/gitaly/files/patch-2 | 792 --------------------- devel/gitaly/files/patch-ruby_Gemfile | 2 +- devel/grpc130/Makefile | 58 ++ devel/grpc130/distinfo | 3 + devel/grpc130/files/extra-patch-CMakeLists.txt | 11 + ...e_lib_security_credentials_jwt_jwt__verifier.cc | 11 + .../patch-src_core_tsi_alts_crypt_aes__gcm.cc | 11 + .../patch-src_core_tsi_ssl__transport__security.cc | 26 + devel/grpc130/pkg-descr | 6 + devel/grpc130/pkg-plist | 332 +++++++++ devel/rubygem-gitlab-labkit/Makefile | 4 +- net/rubygem-gitaly/Makefile | 4 +- net/rubygem-grpc130/Makefile | 6 +- net/rubygem-grpc130/files/patch-grpc.gemspec | 2 +- net/rubygem-kas-grpc/Makefile | 3 +- net/rubygem-spamcheck/Makefile | 3 +- www/gitlab-ce/Makefile | 2 +- 19 files changed, 475 insertions(+), 806 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index 1ad7a7638ab2..a1dd2e3f0daa 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -924,6 +924,7 @@ SUBDIR += grcov SUBDIR += grex SUBDIR += grpc + SUBDIR += grpc130 SUBDIR += grpc134 SUBDIR += grv SUBDIR += gsettings-desktop-schemas diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 36614306fced..87a813144c2b 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly DISTVERSION= 14.4.2 -PORTREVISION= 0 +PORTREVISION= 2 CATEGORIES= devel #PATCH_SITES= https://gitlab.com/mfechner/gitaly/-/merge_requests/ @@ -23,7 +23,7 @@ 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-grpc>=1.30.2<2:net/rubygem-grpc \ + rubygem-grpc130>=1.30.2<2:net/rubygem-grpc130 \ 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 \ diff --git a/devel/gitaly/files/patch-2 b/devel/gitaly/files/patch-2 deleted file mode 100644 index 081227b6f049..000000000000 --- a/devel/gitaly/files/patch-2 +++ /dev/null @@ -1,792 +0,0 @@ ---- ruby/Gemfile.lock.orig 2021-11-08 11:56:42 UTC -+++ ruby/Gemfile.lock -@@ -75,12 +75,12 @@ GEM - redis (> 3.0.0, < 5.0.0) - gitlab-markup (1.7.1) - google-protobuf (3.17.3) -- googleapis-common-protos-types (1.1.0) -+ googleapis-common-protos-types (1.3.0) - google-protobuf (~> 3.14) -- grpc (1.30.2) -- google-protobuf (~> 3.12) -+ grpc (1.41.1) -+ google-protobuf (~> 3.17) - googleapis-common-protos-types (~> 1.0) -- grpc-tools (1.30.2) -+ grpc-tools (1.38.0) - i18n (1.8.10) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) -@@ -225,8 +225,8 @@ DEPENDENCIES - gitlab-labkit (~> 0.21.1) - gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.17.0) -- grpc (~> 1.30.2) -- grpc-tools (= 1.30.2) -+ grpc (~> 1.41.0) -+ grpc-tools (= 1.38.0) - licensee (~> 9.14.1) - pry (~> 0.12.2) - rbtrace -@@ -239,4 +239,4 @@ DEPENDENCIES - timecop - - BUNDLED WITH -- 2.1.4 -+ 2.2.15 ---- 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_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_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 -@@ -18,32 +18,32 @@ module Gitaly - # graph walk. This deprecates ListNewCommits, FindAllCommits, FindCommits - # (except Follow is not yet supported) and CommitsBetweenRequest. Any - # unknown revisions will cause the RPC to fail. -- rpc :ListCommits, Gitaly::ListCommitsRequest, stream(Gitaly::ListCommitsResponse) -+ rpc :ListCommits, ::Gitaly::ListCommitsRequest, stream(::Gitaly::ListCommitsResponse) - # ListAllCommits lists all commits present in the repository, including - # those not reachable by any reference. -- rpc :ListAllCommits, Gitaly::ListAllCommitsRequest, stream(Gitaly::ListAllCommitsResponse) -- rpc :CommitIsAncestor, Gitaly::CommitIsAncestorRequest, Gitaly::CommitIsAncestorResponse -- rpc :TreeEntry, Gitaly::TreeEntryRequest, stream(Gitaly::TreeEntryResponse) -- rpc :CommitsBetween, Gitaly::CommitsBetweenRequest, stream(Gitaly::CommitsBetweenResponse) -- rpc :CountCommits, Gitaly::CountCommitsRequest, Gitaly::CountCommitsResponse -- rpc :CountDivergingCommits, Gitaly::CountDivergingCommitsRequest, Gitaly::CountDivergingCommitsResponse -- rpc :GetTreeEntries, Gitaly::GetTreeEntriesRequest, stream(Gitaly::GetTreeEntriesResponse) -- rpc :ListFiles, Gitaly::ListFilesRequest, stream(Gitaly::ListFilesResponse) -- rpc :FindCommit, Gitaly::FindCommitRequest, Gitaly::FindCommitResponse -- rpc :CommitStats, Gitaly::CommitStatsRequest, Gitaly::CommitStatsResponse -+ rpc :ListAllCommits, ::Gitaly::ListAllCommitsRequest, stream(::Gitaly::ListAllCommitsResponse) -+ rpc :CommitIsAncestor, ::Gitaly::CommitIsAncestorRequest, ::Gitaly::CommitIsAncestorResponse -+ rpc :TreeEntry, ::Gitaly::TreeEntryRequest, stream(::Gitaly::TreeEntryResponse) -+ rpc :CommitsBetween, ::Gitaly::CommitsBetweenRequest, stream(::Gitaly::CommitsBetweenResponse) -+ rpc :CountCommits, ::Gitaly::CountCommitsRequest, ::Gitaly::CountCommitsResponse -+ rpc :CountDivergingCommits, ::Gitaly::CountDivergingCommitsRequest, ::Gitaly::CountDivergingCommitsResponse -+ rpc :GetTreeEntries, ::Gitaly::GetTreeEntriesRequest, stream(::Gitaly::GetTreeEntriesResponse) -+ rpc :ListFiles, ::Gitaly::ListFilesRequest, stream(::Gitaly::ListFilesResponse) -+ rpc :FindCommit, ::Gitaly::FindCommitRequest, ::Gitaly::FindCommitResponse -+ rpc :CommitStats, ::Gitaly::CommitStatsRequest, ::Gitaly::CommitStatsResponse - # Use a stream to paginate the result set -- rpc :FindAllCommits, Gitaly::FindAllCommitsRequest, stream(Gitaly::FindAllCommitsResponse) -- rpc :FindCommits, Gitaly::FindCommitsRequest, stream(Gitaly::FindCommitsResponse) -- rpc :CommitLanguages, Gitaly::CommitLanguagesRequest, Gitaly::CommitLanguagesResponse -- rpc :RawBlame, Gitaly::RawBlameRequest, stream(Gitaly::RawBlameResponse) -- rpc :LastCommitForPath, Gitaly::LastCommitForPathRequest, Gitaly::LastCommitForPathResponse -- rpc :ListLastCommitsForTree, Gitaly::ListLastCommitsForTreeRequest, stream(Gitaly::ListLastCommitsForTreeResponse) -- rpc :CommitsByMessage, Gitaly::CommitsByMessageRequest, stream(Gitaly::CommitsByMessageResponse) -- rpc :ListCommitsByOid, Gitaly::ListCommitsByOidRequest, stream(Gitaly::ListCommitsByOidResponse) -- rpc :ListCommitsByRefName, Gitaly::ListCommitsByRefNameRequest, stream(Gitaly::ListCommitsByRefNameResponse) -- rpc :FilterShasWithSignatures, stream(Gitaly::FilterShasWithSignaturesRequest), stream(Gitaly::FilterShasWithSignaturesResponse) -- rpc :GetCommitSignatures, Gitaly::GetCommitSignaturesRequest, stream(Gitaly::GetCommitSignaturesResponse) -- rpc :GetCommitMessages, Gitaly::GetCommitMessagesRequest, stream(Gitaly::GetCommitMessagesResponse) -+ rpc :FindAllCommits, ::Gitaly::FindAllCommitsRequest, stream(::Gitaly::FindAllCommitsResponse) -+ rpc :FindCommits, ::Gitaly::FindCommitsRequest, stream(::Gitaly::FindCommitsResponse) -+ rpc :CommitLanguages, ::Gitaly::CommitLanguagesRequest, ::Gitaly::CommitLanguagesResponse -+ rpc :RawBlame, ::Gitaly::RawBlameRequest, stream(::Gitaly::RawBlameResponse) -+ rpc :LastCommitForPath, ::Gitaly::LastCommitForPathRequest, ::Gitaly::LastCommitForPathResponse -+ rpc :ListLastCommitsForTree, ::Gitaly::ListLastCommitsForTreeRequest, stream(::Gitaly::ListLastCommitsForTreeResponse) -+ rpc :CommitsByMessage, ::Gitaly::CommitsByMessageRequest, stream(::Gitaly::CommitsByMessageResponse) -+ rpc :ListCommitsByOid, ::Gitaly::ListCommitsByOidRequest, stream(::Gitaly::ListCommitsByOidResponse) -+ rpc :ListCommitsByRefName, ::Gitaly::ListCommitsByRefNameRequest, stream(::Gitaly::ListCommitsByRefNameResponse) -+ rpc :FilterShasWithSignatures, stream(::Gitaly::FilterShasWithSignaturesRequest), stream(::Gitaly::FilterShasWithSignaturesResponse) -+ rpc :GetCommitSignatures, ::Gitaly::GetCommitSignaturesRequest, stream(::Gitaly::GetCommitSignaturesResponse) -+ rpc :GetCommitMessages, ::Gitaly::GetCommitMessagesRequest, stream(::Gitaly::GetCommitMessagesResponse) - end - - Stub = Service.rpc_stub_class ---- 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_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_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_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/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_services_pb.rb.orig 2021-11-08 11:56:42 UTC -+++ ruby/proto/gitaly/objectpool_services_pb.rb -@@ -8,16 +8,16 @@ module Gitaly - module ObjectPoolService - class Service - -- include GRPC::GenericService -+ include ::GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'gitaly.ObjectPoolService' - -- rpc :CreateObjectPool, Gitaly::CreateObjectPoolRequest, Gitaly::CreateObjectPoolResponse -- rpc :DeleteObjectPool, Gitaly::DeleteObjectPoolRequest, Gitaly::DeleteObjectPoolResponse -+ rpc :CreateObjectPool, ::Gitaly::CreateObjectPoolRequest, ::Gitaly::CreateObjectPoolResponse -+ rpc :DeleteObjectPool, ::Gitaly::DeleteObjectPoolRequest, ::Gitaly::DeleteObjectPoolResponse - # Repositories are assumed to be stored on the same disk -- rpc :LinkRepositoryToObjectPool, Gitaly::LinkRepositoryToObjectPoolRequest, Gitaly::LinkRepositoryToObjectPoolResponse -+ rpc :LinkRepositoryToObjectPool, ::Gitaly::LinkRepositoryToObjectPoolRequest, ::Gitaly::LinkRepositoryToObjectPoolResponse - # UnlinkRepositoryFromObjectPool does not unlink the repository from the - # object pool as you'd think, but all it really does is to remove the object - # pool's remote pointing to the repository. And even this is a no-op given -@@ -28,11 +28,11 @@ module Gitaly - # - # This function is never called by anyone and highly misleading. It's thus - # deprecated and will be removed in v14.4. -- rpc :UnlinkRepositoryFromObjectPool, Gitaly::UnlinkRepositoryFromObjectPoolRequest, Gitaly::UnlinkRepositoryFromObjectPoolResponse -- rpc :ReduplicateRepository, Gitaly::ReduplicateRepositoryRequest, Gitaly::ReduplicateRepositoryResponse -- rpc :DisconnectGitAlternates, Gitaly::DisconnectGitAlternatesRequest, Gitaly::DisconnectGitAlternatesResponse -- rpc :FetchIntoObjectPool, Gitaly::FetchIntoObjectPoolRequest, Gitaly::FetchIntoObjectPoolResponse -- rpc :GetObjectPool, Gitaly::GetObjectPoolRequest, Gitaly::GetObjectPoolResponse -+ rpc :UnlinkRepositoryFromObjectPool, ::Gitaly::UnlinkRepositoryFromObjectPoolRequest, ::Gitaly::UnlinkRepositoryFromObjectPoolResponse -+ rpc :ReduplicateRepository, ::Gitaly::ReduplicateRepositoryRequest, ::Gitaly::ReduplicateRepositoryResponse -+ rpc :DisconnectGitAlternates, ::Gitaly::DisconnectGitAlternatesRequest, ::Gitaly::DisconnectGitAlternatesResponse -+ rpc :FetchIntoObjectPool, ::Gitaly::FetchIntoObjectPoolRequest, ::Gitaly::FetchIntoObjectPoolResponse -+ rpc :GetObjectPool, ::Gitaly::GetObjectPoolRequest, ::Gitaly::GetObjectPoolResponse - end - - Stub = Service.rpc_stub_class ---- 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_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/ref_services_pb.rb.orig 2021-11-08 11:56:42 UTC -+++ ruby/proto/gitaly/ref_services_pb.rb -@@ -8,42 +8,42 @@ module Gitaly - module RefService - class Service - -- include GRPC::GenericService -+ include ::GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'gitaly.RefService' - -- rpc :FindDefaultBranchName, Gitaly::FindDefaultBranchNameRequest, Gitaly::FindDefaultBranchNameResponse -- rpc :FindAllBranchNames, Gitaly::FindAllBranchNamesRequest, stream(Gitaly::FindAllBranchNamesResponse) -- rpc :FindAllTagNames, Gitaly::FindAllTagNamesRequest, stream(Gitaly::FindAllTagNamesResponse) -+ rpc :FindDefaultBranchName, ::Gitaly::FindDefaultBranchNameRequest, ::Gitaly::FindDefaultBranchNameResponse -+ rpc :FindAllBranchNames, ::Gitaly::FindAllBranchNamesRequest, stream(::Gitaly::FindAllBranchNamesResponse) -+ rpc :FindAllTagNames, ::Gitaly::FindAllTagNamesRequest, stream(::Gitaly::FindAllTagNamesResponse) - # Return a stream so we can divide the response in chunks of branches -- rpc :FindLocalBranches, Gitaly::FindLocalBranchesRequest, stream(Gitaly::FindLocalBranchesResponse) -- rpc :FindAllBranches, Gitaly::FindAllBranchesRequest, stream(Gitaly::FindAllBranchesResponse) -+ rpc :FindLocalBranches, ::Gitaly::FindLocalBranchesRequest, stream(::Gitaly::FindLocalBranchesResponse) -+ rpc :FindAllBranches, ::Gitaly::FindAllBranchesRequest, stream(::Gitaly::FindAllBranchesResponse) - # Returns a stream of tags repository has. -- rpc :FindAllTags, Gitaly::FindAllTagsRequest, stream(Gitaly::FindAllTagsResponse) -- rpc :FindTag, Gitaly::FindTagRequest, Gitaly::FindTagResponse -- rpc :FindAllRemoteBranches, Gitaly::FindAllRemoteBranchesRequest, stream(Gitaly::FindAllRemoteBranchesResponse) -- rpc :RefExists, Gitaly::RefExistsRequest, Gitaly::RefExistsResponse -+ rpc :FindAllTags, ::Gitaly::FindAllTagsRequest, stream(::Gitaly::FindAllTagsResponse) -+ rpc :FindTag, ::Gitaly::FindTagRequest, ::Gitaly::FindTagResponse -+ rpc :FindAllRemoteBranches, ::Gitaly::FindAllRemoteBranchesRequest, stream(::Gitaly::FindAllRemoteBranchesResponse) -+ rpc :RefExists, ::Gitaly::RefExistsRequest, ::Gitaly::RefExistsResponse - # FindBranch finds a branch by its unqualified name (like "master") and - # returns the commit it currently points to. -- rpc :FindBranch, Gitaly::FindBranchRequest, Gitaly::FindBranchResponse -- rpc :DeleteRefs, Gitaly::DeleteRefsRequest, Gitaly::DeleteRefsResponse -- rpc :ListBranchNamesContainingCommit, Gitaly::ListBranchNamesContainingCommitRequest, stream(Gitaly::ListBranchNamesContainingCommitResponse) -- rpc :ListTagNamesContainingCommit, Gitaly::ListTagNamesContainingCommitRequest, stream(Gitaly::ListTagNamesContainingCommitResponse) -+ rpc :FindBranch, ::Gitaly::FindBranchRequest, ::Gitaly::FindBranchResponse -+ rpc :DeleteRefs, ::Gitaly::DeleteRefsRequest, ::Gitaly::DeleteRefsResponse -+ rpc :ListBranchNamesContainingCommit, ::Gitaly::ListBranchNamesContainingCommitRequest, stream(::Gitaly::ListBranchNamesContainingCommitResponse) -+ rpc :ListTagNamesContainingCommit, ::Gitaly::ListTagNamesContainingCommitRequest, stream(::Gitaly::ListTagNamesContainingCommitResponse) - # GetTagSignatures returns signatures for annotated tags resolved from a set of revisions. Revisions - # which don't resolve to an annotated tag are silently discarded. Revisions which cannot be resolved - # result in an error. Tags which are annotated but not signed will return a TagSignature response - # which has no signature, but its unsigned contents will still be returned. -- rpc :GetTagSignatures, Gitaly::GetTagSignaturesRequest, stream(Gitaly::GetTagSignaturesResponse) -- rpc :GetTagMessages, Gitaly::GetTagMessagesRequest, stream(Gitaly::GetTagMessagesResponse) -+ rpc :GetTagSignatures, ::Gitaly::GetTagSignaturesRequest, stream(::Gitaly::GetTagSignaturesResponse) -+ rpc :GetTagMessages, ::Gitaly::GetTagMessagesRequest, stream(::Gitaly::GetTagMessagesResponse) - # Returns commits that are only reachable from the ref passed -- rpc :ListNewCommits, Gitaly::ListNewCommitsRequest, stream(Gitaly::ListNewCommitsResponse) -- rpc :PackRefs, Gitaly::PackRefsRequest, Gitaly::PackRefsResponse -+ rpc :ListNewCommits, ::Gitaly::ListNewCommitsRequest, stream(::Gitaly::ListNewCommitsResponse) -+ rpc :PackRefs, ::Gitaly::PackRefsRequest, ::Gitaly::PackRefsResponse - # ListRefs returns a stream of all references in the repository. By default, pseudo-revisions like HEAD - # will not be returned by this RPC. Any symbolic references will be resolved to the object ID it is - # pointing at. -- rpc :ListRefs, Gitaly::ListRefsRequest, stream(Gitaly::ListRefsResponse) -+ rpc :ListRefs, ::Gitaly::ListRefsRequest, stream(::Gitaly::ListRefsResponse) - end - - Stub = Service.rpc_stub_class ---- 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_services_pb.rb.orig 2021-11-08 11:56:42 UTC -+++ ruby/proto/gitaly/repository-service_services_pb.rb -@@ -8,73 +8,73 @@ module Gitaly - module RepositoryService - class Service - -- include GRPC::GenericService -+ include ::GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'gitaly.RepositoryService' - -- rpc :RepositoryExists, Gitaly::RepositoryExistsRequest, Gitaly::RepositoryExistsResponse -- rpc :RepackIncremental, Gitaly::RepackIncrementalRequest, Gitaly::RepackIncrementalResponse -- rpc :RepackFull, Gitaly::RepackFullRequest, Gitaly::RepackFullResponse -- rpc :MidxRepack, Gitaly::MidxRepackRequest, Gitaly::MidxRepackResponse -- rpc :GarbageCollect, Gitaly::GarbageCollectRequest, Gitaly::GarbageCollectResponse -- rpc :WriteCommitGraph, Gitaly::WriteCommitGraphRequest, Gitaly::WriteCommitGraphResponse -- rpc :RepositorySize, Gitaly::RepositorySizeRequest, Gitaly::RepositorySizeResponse -- rpc :ApplyGitattributes, Gitaly::ApplyGitattributesRequest, Gitaly::ApplyGitattributesResponse -+ rpc :RepositoryExists, ::Gitaly::RepositoryExistsRequest, ::Gitaly::RepositoryExistsResponse -+ rpc :RepackIncremental, ::Gitaly::RepackIncrementalRequest, ::Gitaly::RepackIncrementalResponse -+ rpc :RepackFull, ::Gitaly::RepackFullRequest, ::Gitaly::RepackFullResponse -+ rpc :MidxRepack, ::Gitaly::MidxRepackRequest, ::Gitaly::MidxRepackResponse -+ rpc :GarbageCollect, ::Gitaly::GarbageCollectRequest, ::Gitaly::GarbageCollectResponse -+ rpc :WriteCommitGraph, ::Gitaly::WriteCommitGraphRequest, ::Gitaly::WriteCommitGraphResponse -+ rpc :RepositorySize, ::Gitaly::RepositorySizeRequest, ::Gitaly::RepositorySizeResponse -+ rpc :ApplyGitattributes, ::Gitaly::ApplyGitattributesRequest, ::Gitaly::ApplyGitattributesResponse - # FetchRemote fetches references from a remote repository into the local - # repository. -- rpc :FetchRemote, Gitaly::FetchRemoteRequest, Gitaly::FetchRemoteResponse -- rpc :CreateRepository, Gitaly::CreateRepositoryRequest, Gitaly::CreateRepositoryResponse -- rpc :GetArchive, Gitaly::GetArchiveRequest, stream(Gitaly::GetArchiveResponse) -- rpc :HasLocalBranches, Gitaly::HasLocalBranchesRequest, Gitaly::HasLocalBranchesResponse -+ rpc :FetchRemote, ::Gitaly::FetchRemoteRequest, ::Gitaly::FetchRemoteResponse -+ rpc :CreateRepository, ::Gitaly::CreateRepositoryRequest, ::Gitaly::CreateRepositoryResponse -+ rpc :GetArchive, ::Gitaly::GetArchiveRequest, stream(::Gitaly::GetArchiveResponse) -+ rpc :HasLocalBranches, ::Gitaly::HasLocalBranchesRequest, ::Gitaly::HasLocalBranchesResponse - # FetchSourceBranch fetches a branch from a second (potentially remote) - # repository into the given repository. -- rpc :FetchSourceBranch, Gitaly::FetchSourceBranchRequest, Gitaly::FetchSourceBranchResponse -- rpc :Fsck, Gitaly::FsckRequest, Gitaly::FsckResponse -- rpc :WriteRef, Gitaly::WriteRefRequest, Gitaly::WriteRefResponse -- rpc :FindMergeBase, Gitaly::FindMergeBaseRequest, Gitaly::FindMergeBaseResponse -- rpc :CreateFork, Gitaly::CreateForkRequest, Gitaly::CreateForkResponse -- rpc :CreateRepositoryFromURL, Gitaly::CreateRepositoryFromURLRequest, Gitaly::CreateRepositoryFromURLResponse -+ rpc :FetchSourceBranch, ::Gitaly::FetchSourceBranchRequest, ::Gitaly::FetchSourceBranchResponse -+ rpc :Fsck, ::Gitaly::FsckRequest, ::Gitaly::FsckResponse -+ rpc :WriteRef, ::Gitaly::WriteRefRequest, ::Gitaly::WriteRefResponse -+ rpc :FindMergeBase, ::Gitaly::FindMergeBaseRequest, ::Gitaly::FindMergeBaseResponse -+ rpc :CreateFork, ::Gitaly::CreateForkRequest, ::Gitaly::CreateForkResponse -+ rpc :CreateRepositoryFromURL, ::Gitaly::CreateRepositoryFromURLRequest, ::Gitaly::CreateRepositoryFromURLResponse - # CreateBundle creates a bundle from all refs -- rpc :CreateBundle, Gitaly::CreateBundleRequest, stream(Gitaly::CreateBundleResponse) -+ rpc :CreateBundle, ::Gitaly::CreateBundleRequest, stream(::Gitaly::CreateBundleResponse) - # CreateBundleFromRefList creates a bundle from a stream of ref patterns. - # When the bundle would be empty the FailedPrecondition error code is returned. -- rpc :CreateBundleFromRefList, stream(Gitaly::CreateBundleFromRefListRequest), stream(Gitaly::CreateBundleFromRefListResponse) -+ rpc :CreateBundleFromRefList, stream(::Gitaly::CreateBundleFromRefListRequest), stream(::Gitaly::CreateBundleFromRefListResponse) - # FetchBundle fetches references from a bundle into the local repository. - # Refs will be mirrored to the target repository with the refspec - # "+refs/*:refs/*" and refs that do not exist in the bundle will be removed. -- rpc :FetchBundle, stream(Gitaly::FetchBundleRequest), Gitaly::FetchBundleResponse -- rpc :CreateRepositoryFromBundle, stream(Gitaly::CreateRepositoryFromBundleRequest), Gitaly::CreateRepositoryFromBundleResponse -+ rpc :FetchBundle, stream(::Gitaly::FetchBundleRequest), ::Gitaly::FetchBundleResponse -+ rpc :CreateRepositoryFromBundle, stream(::Gitaly::CreateRepositoryFromBundleRequest), ::Gitaly::CreateRepositoryFromBundleResponse - # GetConfig reads the target repository's gitconfig and streams its contents - # back. Returns a NotFound error in case no gitconfig was found. -- rpc :GetConfig, Gitaly::GetConfigRequest, stream(Gitaly::GetConfigResponse) -- rpc :FindLicense, Gitaly::FindLicenseRequest, Gitaly::FindLicenseResponse -- rpc :GetInfoAttributes, Gitaly::GetInfoAttributesRequest, stream(Gitaly::GetInfoAttributesResponse) -- rpc :CalculateChecksum, Gitaly::CalculateChecksumRequest, Gitaly::CalculateChecksumResponse -- rpc :Cleanup, Gitaly::CleanupRequest, Gitaly::CleanupResponse -- rpc :GetSnapshot, Gitaly::GetSnapshotRequest, stream(Gitaly::GetSnapshotResponse) -- rpc :CreateRepositoryFromSnapshot, Gitaly::CreateRepositoryFromSnapshotRequest, Gitaly::CreateRepositoryFromSnapshotResponse -- rpc :GetRawChanges, Gitaly::GetRawChangesRequest, stream(Gitaly::GetRawChangesResponse) -- rpc :SearchFilesByContent, Gitaly::SearchFilesByContentRequest, stream(Gitaly::SearchFilesByContentResponse) -- rpc :SearchFilesByName, Gitaly::SearchFilesByNameRequest, stream(Gitaly::SearchFilesByNameResponse) -- rpc :RestoreCustomHooks, stream(Gitaly::RestoreCustomHooksRequest), Gitaly::RestoreCustomHooksResponse -- rpc :BackupCustomHooks, Gitaly::BackupCustomHooksRequest, stream(Gitaly::BackupCustomHooksResponse) -- rpc :GetObjectDirectorySize, Gitaly::GetObjectDirectorySizeRequest, Gitaly::GetObjectDirectorySizeResponse -- rpc :CloneFromPool, Gitaly::CloneFromPoolRequest, Gitaly::CloneFromPoolResponse -- rpc :CloneFromPoolInternal, Gitaly::CloneFromPoolInternalRequest, Gitaly::CloneFromPoolInternalResponse -+ rpc :GetConfig, ::Gitaly::GetConfigRequest, stream(::Gitaly::GetConfigResponse) -+ rpc :FindLicense, ::Gitaly::FindLicenseRequest, ::Gitaly::FindLicenseResponse -+ rpc :GetInfoAttributes, ::Gitaly::GetInfoAttributesRequest, stream(::Gitaly::GetInfoAttributesResponse) -+ rpc :CalculateChecksum, ::Gitaly::CalculateChecksumRequest, ::Gitaly::CalculateChecksumResponse -+ rpc :Cleanup, ::Gitaly::CleanupRequest, ::Gitaly::CleanupResponse -+ rpc :GetSnapshot, ::Gitaly::GetSnapshotRequest, stream(::Gitaly::GetSnapshotResponse) -+ rpc :CreateRepositoryFromSnapshot, ::Gitaly::CreateRepositoryFromSnapshotRequest, ::Gitaly::CreateRepositoryFromSnapshotResponse -+ rpc :GetRawChanges, ::Gitaly::GetRawChangesRequest, stream(::Gitaly::GetRawChangesResponse) -+ rpc :SearchFilesByContent, ::Gitaly::SearchFilesByContentRequest, stream(::Gitaly::SearchFilesByContentResponse) -+ rpc :SearchFilesByName, ::Gitaly::SearchFilesByNameRequest, stream(::Gitaly::SearchFilesByNameResponse) -+ rpc :RestoreCustomHooks, stream(::Gitaly::RestoreCustomHooksRequest), ::Gitaly::RestoreCustomHooksResponse -+ rpc :BackupCustomHooks, ::Gitaly::BackupCustomHooksRequest, stream(::Gitaly::BackupCustomHooksResponse) -+ rpc :GetObjectDirectorySize, ::Gitaly::GetObjectDirectorySizeRequest, ::Gitaly::GetObjectDirectorySizeResponse -+ rpc :CloneFromPool, ::Gitaly::CloneFromPoolRequest, ::Gitaly::CloneFromPoolResponse -+ rpc :CloneFromPoolInternal, ::Gitaly::CloneFromPoolInternalRequest, ::Gitaly::CloneFromPoolInternalResponse - # RemoveRepository will move the repository to `+gitaly/tmp/_removed` and - # eventually remove it. This ensures that even on networked filesystems the - # data is actually removed even if there's someone still handling the data. -- rpc :RemoveRepository, Gitaly::RemoveRepositoryRequest, Gitaly::RemoveRepositoryResponse -- rpc :RenameRepository, Gitaly::RenameRepositoryRequest, Gitaly::RenameRepositoryResponse -- rpc :ReplicateRepository, Gitaly::ReplicateRepositoryRequest, Gitaly::ReplicateRepositoryResponse -- rpc :OptimizeRepository, Gitaly::OptimizeRepositoryRequest, Gitaly::OptimizeRepositoryResponse -+ rpc :RemoveRepository, ::Gitaly::RemoveRepositoryRequest, ::Gitaly::RemoveRepositoryResponse -+ rpc :RenameRepository, ::Gitaly::RenameRepositoryRequest, ::Gitaly::RenameRepositoryResponse -+ rpc :ReplicateRepository, ::Gitaly::ReplicateRepositoryRequest, ::Gitaly::ReplicateRepositoryResponse -+ rpc :OptimizeRepository, ::Gitaly::OptimizeRepositoryRequest, ::Gitaly::OptimizeRepositoryResponse - # SetFullPath writes the "gitlab.fullpath" configuration into the - # repository's gitconfig. This is mainly to help debugging purposes in case - # an admin inspects the repository's gitconfig such that he can easily see - # what the repository name is. -- rpc :SetFullPath, Gitaly::SetFullPathRequest, Gitaly::SetFullPathResponse -+ rpc :SetFullPath, ::Gitaly::SetFullPathRequest, ::Gitaly::SetFullPathResponse - end - - Stub = Service.rpc_stub_class ---- 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/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_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_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_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 231c2569c123..46224f7de0fa 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,4 +1,4 @@ ---- ruby/Gemfile.orig 2021-10-21 21:58:10 UTC +--- ruby/Gemfile.orig 2021-11-08 11:56:42 UTC +++ ruby/Gemfile @@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.21.1' # This version needs to be in sync with GitLab CE/EE diff --git a/devel/grpc130/Makefile b/devel/grpc130/Makefile new file mode 100644 index 000000000000..40ca73fb11ec --- /dev/null +++ b/devel/grpc130/Makefile @@ -0,0 +1,58 @@ +# Created by: vanilla@ + +PORTNAME= grpc +PORTVERSION= 1.30.2 +DISTVERSIONPREFIX= v +CATEGORIES= devel +PKGNAMESUFFIX= 130 + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= HTTP/2-based RPC framework + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libabsl_base.so:devel/abseil \ + libbenchmark.so:devel/benchmark \ + libcares.so:dns/c-ares \ + libgflags.so:devel/gflags \ + libprotobuf.so:devel/protobuf \ + libre2.so:devel/re2 + +USES= cmake compiler:c++17-lang cpe localbase:ldflags pkgconfig ssl + +USE_GITHUB= yes + +CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \ + -DgRPC_ABSL_PROVIDER=package \ + -DgRPC_BENCHMARK_PROVIDER=package \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_GFLAGS_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package +CMAKE_ON= BUILD_SHARED_LIBS +USE_LDCONFIG= yes +STRIP= + +PLIST_SUB= PORTVERSION=${PORTVERSION} + +.include + +# Remove openssl from grpc.pc because we do not ship openssl.pc in base system +.if ${SSL_DEFAULT} == base +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-CMakeLists.txt +.endif + +post-patch: +# Clean up bundled libraries + @${RM} -r ${WRKSRC}/third_party/abseil-cpp/ + @${RM} -r ${WRKSRC}/third_party/benchmark/ + @${RM} -r ${WRKSRC}/third_party/boringssl-with-bazel/ + @${RM} -r ${WRKSRC}/third_party/cares/ + @${RM} -r ${WRKSRC}/third_party/protobuf/ + @${RM} -r ${WRKSRC}/third_party/re2/ + @${RM} -r ${WRKSRC}/third_party/zlib/ + +.include diff --git a/devel/grpc130/distinfo b/devel/grpc130/distinfo new file mode 100644 index 000000000000..e22ab8d698ba --- /dev/null +++ b/devel/grpc130/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1637134735 +SHA256 (grpc-grpc-v1.30.2_GH0.tar.gz) = ba74b97a2f1b4e22ec5fb69d639d849d2069fb58ea7d6579a31f800af6fe3b6c +SIZE (grpc-grpc-v1.30.2_GH0.tar.gz) = 6978015 diff --git a/devel/grpc130/files/extra-patch-CMakeLists.txt b/devel/grpc130/files/extra-patch-CMakeLists.txt new file mode 100644 index 000000000000..794b40b630cb --- /dev/null +++ b/devel/grpc130/files/extra-patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2021-09-25 02:33:41 UTC ++++ CMakeLists.txt +@@ -17664,7 +17664,7 @@ generate_pkgconfig( + "gRPC" + "high performance general RPC framework" + "${gRPC_CORE_VERSION}" +- "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant" ++ "gpr absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant" + "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" + "" + "grpc.pc") diff --git a/devel/grpc130/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc b/devel/grpc130/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc new file mode 100644 index 000000000000..d68a3c9ce37f --- /dev/null +++ b/devel/grpc130/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc @@ -0,0 +1,11 @@ +--- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2020-12-01 19:24:28 UTC ++++ src/core/lib/security/credentials/jwt/jwt_verifier.cc +@@ -472,7 +472,7 @@ static BIGNUM* bignum_from_base64(const char* b64) { + return result; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) *** 535 LINES SKIPPED ***