Date: Sat, 20 Nov 2021 03:49:57 +0300 From: Dima Panov <fluffy@FreeBSD.org> To: dev-commits-ports-all@FreeBSD.org, ports-committers@FreeBSD.org, dev-commits-ports-main@FreeBSD.org, Matthias Fechner <mfechner@FreeBSD.org> Subject: Re: git: 0aac4480b255 - main - www/gitlab-ce: Use grpc 1.30.2 Message-ID: <31de9806-664f-461c-9ffe-f1ab88898140@Canary> In-Reply-To: <202111191438.1AJEc8P1037635@gitrepo.freebsd.org> References: <202111191438.1AJEc8P1037635@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--61984636_643c9869_69d8 Content-Type: multipart/alternative; boundary="61984635_327b23c6_69d8" --61984635_327b23c6_69d8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Moin=21 Matthias, please be more careful at repocopy and testing. =46ixed bad extrapatch at 9c8c782d6aaa78b6e9e8d04b838e914fcf7a8b10 -- Dima. (desktop, kde, x11, office, ports-secteam)=40=46reeBSD team (fluffy=40=46reeBSD.org, https://t.me/dima=5Fpanov) > On =46riday, Nov 19, 2021 at 5:38 PM, Matthias =46echner <mfechner=40=46= reeBSD.org (mailto:mfechner=40=46reeBSD.org)> wrote: > The branch main has been updated by mfechner: > > URL: https://cgit.=46reeBSD.org/ports/commit/=3Fid=3D0aac4480b2555d806f= 449b77e755cf7cfd616707 > > commit 0aac4480b2555d806f449b77e755cf7cfd616707 > Author: Matthias =46echner <mfechner=40=46reeBSD.org> > AuthorDate: 2021-11-17 14:58:44 +0000 > Commit: Matthias =46echner <mfechner=40=46reeBSD.org> > 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=23note=5F734676746= > > 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=5Fbug.cgi=3Fid=3D259848 > --- > devel/Makefile =7C 1 + > devel/gitaly/Makefile =7C 4 +- > devel/gitaly/files/patch-2 =7C 792 --------------------- > devel/gitaly/files/patch-ruby=5FGemfile =7C 2 +- > devel/grpc130/Makefile =7C 58 ++ > devel/grpc130/distinfo =7C 3 + > devel/grpc130/files/extra-patch-CMakeLists.txt =7C 11 + > ...e=5Flib=5Fsecurity=5Fcredentials=5Fjwt=5Fjwt=5F=5Fverifier.cc =7C 11= + > .../patch-src=5Fcore=5Ftsi=5Falts=5Fcrypt=5Faes=5F=5Fgcm.cc =7C 11 + > .../patch-src=5Fcore=5Ftsi=5Fssl=5F=5Ftransport=5F=5Fsecurity.cc =7C 26= + > devel/grpc130/pkg-descr =7C 6 + > devel/grpc130/pkg-plist =7C 332 +++++++++ > devel/rubygem-gitlab-labkit/Makefile =7C 4 +- > net/rubygem-gitaly/Makefile =7C 4 +- > net/rubygem-grpc130/Makefile =7C 6 +- > net/rubygem-grpc130/files/patch-grpc.gemspec =7C 2 +- > net/rubygem-kas-grpc/Makefile =7C 3 +- > net/rubygem-spamcheck/Makefile =7C 3 +- > www/gitlab-ce/Makefile =7C 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 > =40=40 -924,6 +924,7 =40=40 > SUBDIR +=3D grcov > SUBDIR +=3D grex > SUBDIR +=3D grpc > + SUBDIR +=3D grpc130 > SUBDIR +=3D grpc134 > SUBDIR +=3D grv > SUBDIR +=3D 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 > =40=40 -1,6 +1,6 =40=40 > PORTNAME=3D gitaly > DISTVERSION=3D 14.4.2 > -PORTREVISION=3D 0 > +PORTREVISION=3D 2 > CATEGORIES=3D devel > > =23PATCH=5FSITES=3D https://gitlab.com/mfechner/gitaly/-/merge=5Freques= ts/ > =40=40 -23,7 +23,7 =40=40 MY=5FDEPENDS=3D git>=3D2.32.0:devel/git =5C > rubygem-rdoc>=3D6.3.2<7.0:devel/rubygem-rdoc =5C > rubygem-gitlab-gollum-lib>=3D4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab= -gollum-lib =5C > rubygem-gitlab-gollum-rugged=5Fadapter>=3D0.4.4.4.gitlab.1<0.4.5.0:www/= rubygem-gitlab-gollum-rugged=5Fadapter =5C > - rubygem-grpc>=3D1.30.2<2:net/rubygem-grpc =5C > + rubygem-grpc130>=3D1.30.2<2:net/rubygem-grpc130 =5C > rubygem-sentry-raven>=3D3.0<4:devel/rubygem-sentry-raven =5C > rubygem-faraday>=3D1.0.1<2:www/rubygem-faraday =5C > rubygem-rbtrace>=3D0.4.14:devel/rubygem-rbtrace =5C > 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 > =40=40 -1,792 +0,0 =40=40 > ---- ruby/Gemfile.lock.orig 2021-11-08 11:56:42 UTC > -+++ ruby/Gemfile.lock > -=40=40 -75,12 +75,12 =40=40 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 (=7E> 3.14) > -- grpc (1.30.2) > -- google-protobuf (=7E> 3.12) > -+ grpc (1.41.1) > -+ google-protobuf (=7E> 3.17) > - googleapis-common-protos-types (=7E> 1.0) > -- grpc-tools (1.30.2) > -+ grpc-tools (1.38.0) > - i18n (1.8.10) > - concurrent-ruby (=7E> 1.0) > - ice=5Fnine (0.11.2) > -=40=40 -225,8 +225,8 =40=40 DEPENDENCIES > - gitlab-labkit (=7E> 0.21.1) > - gitlab-markup (=7E> 1.7.1) > - google-protobuf (=7E> 3.17.0) > -- grpc (=7E> 1.30.2) > -- grpc-tools (=3D 1.30.2) > -+ grpc (=7E> 1.41.0) > -+ grpc-tools (=3D 1.38.0) > - licensee (=7E> 9.14.1) > - pry (=7E> 0.12.2) > - rbtrace > -=40=40 -239,4 +239,4 =40=40 DEPENDENCIES > - timecop > - > - BUNDLED WITH > -- 2.1.4 > -+ 2.2.15 > ---- ruby/proto/gitaly/blob=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:42= UTC > -+++ ruby/proto/gitaly/blob=5Fservices=5Fpb.rb > -=40=40 -8,7 +8,7 =40=40 module Gitaly > - module BlobService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > -=40=40 -17,29 +17,29 =40=40 module Gitaly > - =23 GetBlob returns the contents of a blob object referenced by its o= bject > - =23 ID. We use a stream to return a chunked arbitrarily large binary > - =23 response > -- rpc :GetBlob, Gitaly::GetBlobRequest, stream(Gitaly::GetBlobResponse= ) > -- rpc :GetBlobs, Gitaly::GetBlobsRequest, stream(Gitaly::GetBlobsRespo= nse) > -+ rpc :GetBlob, ::Gitaly::GetBlobRequest, stream(::Gitaly::GetBlobResp= onse) > -+ rpc :GetBlobs, ::Gitaly::GetBlobsRequest, stream(::Gitaly::GetBlobsR= esponse) > - =23 ListBlobs will list all blobs reachable from a given set of revis= ions by > - =23 doing a graph walk. It is not valid to pass revisions which do no= t resolve > - =23 to an existing object. > -- rpc :ListBlobs, Gitaly::ListBlobsRequest, stream(Gitaly::ListBlobsRe= sponse) > -+ rpc :ListBlobs, ::Gitaly::ListBlobsRequest, stream(::Gitaly::ListBlo= bsResponse) > - =23 ListAllBlobs retrieves all blobs pointers in the repository, incl= uding > - =23 those not reachable by any reference. > -- rpc :ListAllBlobs, Gitaly::ListAllBlobsRequest, stream(Gitaly::ListA= llBlobsResponse) > -+ rpc :ListAllBlobs, ::Gitaly::ListAllBlobsRequest, stream(::Gitaly::L= istAllBlobsResponse) > - =23 GetL=46SPointers retrieves L=46S pointers from a given set of obj= ect IDs. > - =23 This RPC filters all requested objects and only returns those whi= ch refer > - =23 to a valid L=46S pointer. > -- rpc :GetL=46SPointers, Gitaly::GetL=46SPointersRequest, stream(Gital= y::GetL=46SPointersResponse) > -+ rpc :GetL=46SPointers, ::Gitaly::GetL=46SPointersRequest, stream(::G= italy::GetL=46SPointersResponse) > - =23 ListL=46SPointers retrieves L=46S pointers reachable from a given= set of > - =23 revisions by doing a graph walk. This includes both normal revisi= ons like > - =23 an object ID or branch, but also the pseudo-revisions =22--all=22= and =22--not=22 > - =23 as documented in git-rev-parse(1). Revisions which don't directly= or > - =23 transitively reference any L=46S pointers are ignored. It is not = valid to > - =23 pass revisions which do not resolve to an existing object. > -- rpc :ListL=46SPointers, Gitaly::ListL=46SPointersRequest, stream(Git= aly::ListL=46SPointersResponse) > -+ rpc :ListL=46SPointers, ::Gitaly::ListL=46SPointersRequest, stream(:= :Gitaly::ListL=46SPointersResponse) > - =23 ListAllL=46SPointers retrieves all L=46S pointers in the reposito= ry, including > - =23 those not reachable by any reference. > -- rpc :ListAllL=46SPointers, Gitaly::ListAllL=46SPointersRequest, stre= am(Gitaly::ListAllL=46SPointersResponse) > -+ rpc :ListAllL=46SPointers, ::Gitaly::ListAllL=46SPointersRequest, st= ream(::Gitaly::ListAllL=46SPointersResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/cleanup=5Fservices=5Fpb.rb.orig 2021-11-08 11:56= :42 UTC > -+++ ruby/proto/gitaly/cleanup=5Fservices=5Fpb.rb > -=40=40 -8,13 +8,13 =40=40 module Gitaly > - module CleanupService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.CleanupService' > - > -- rpc :ApplyBfgObjectMapStream, stream(Gitaly::ApplyBfgObjectMapStream= Request), stream(Gitaly::ApplyBfgObjectMapStreamResponse) > -+ rpc :ApplyBfgObjectMapStream, stream(::Gitaly::ApplyBfgObjectMapStre= amRequest), stream(::Gitaly::ApplyBfgObjectMapStreamResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/commit=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:= 42 UTC > -+++ ruby/proto/gitaly/commit=5Fservices=5Fpb.rb > -=40=40 -8,7 +8,7 =40=40 module Gitaly > - module CommitService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > -=40=40 -18,32 +18,32 =40=40 module Gitaly > - =23 graph walk. This deprecates ListNewCommits, =46indAllCommits, =46= indCommits > - =23 (except =46ollow is not yet supported) and CommitsBetweenRequest.= Any > - =23 unknown revisions will cause the RPC to fail. > -- rpc :ListCommits, Gitaly::ListCommitsRequest, stream(Gitaly::ListCom= mitsResponse) > -+ rpc :ListCommits, ::Gitaly::ListCommitsRequest, stream(::Gitaly::Lis= tCommitsResponse) > - =23 ListAllCommits lists all commits present in the repository, inclu= ding > - =23 those not reachable by any reference. > -- rpc :ListAllCommits, Gitaly::ListAllCommitsRequest, stream(Gitaly::L= istAllCommitsResponse) > -- rpc :CommitIsAncestor, Gitaly::CommitIsAncestorRequest, Gitaly::Comm= itIsAncestorResponse > -- rpc :TreeEntry, Gitaly::TreeEntryRequest, stream(Gitaly::TreeEntryRe= sponse) > -- rpc :CommitsBetween, Gitaly::CommitsBetweenRequest, stream(Gitaly::C= ommitsBetweenResponse) > -- rpc :CountCommits, Gitaly::CountCommitsRequest, Gitaly::CountCommits= Response > -- rpc :CountDivergingCommits, Gitaly::CountDivergingCommitsRequest, Gi= taly::CountDivergingCommitsResponse > -- rpc :GetTreeEntries, Gitaly::GetTreeEntriesRequest, stream(Gitaly::G= etTreeEntriesResponse) > -- rpc :List=46iles, Gitaly::List=46ilesRequest, stream(Gitaly::List=46= ilesResponse) > -- rpc :=46indCommit, Gitaly::=46indCommitRequest, Gitaly::=46indCommit= Response > -- rpc :CommitStats, Gitaly::CommitStatsRequest, Gitaly::CommitStatsRes= ponse > -+ rpc :ListAllCommits, ::Gitaly::ListAllCommitsRequest, stream(::Gital= y::ListAllCommitsResponse) > -+ rpc :CommitIsAncestor, ::Gitaly::CommitIsAncestorRequest, ::Gitaly::= CommitIsAncestorResponse > -+ rpc :TreeEntry, ::Gitaly::TreeEntryRequest, stream(::Gitaly::TreeEnt= ryResponse) > -+ rpc :CommitsBetween, ::Gitaly::CommitsBetweenRequest, stream(::Gital= y::CommitsBetweenResponse) > -+ rpc :CountCommits, ::Gitaly::CountCommitsRequest, ::Gitaly::CountCom= mitsResponse > -+ rpc :CountDivergingCommits, ::Gitaly::CountDivergingCommitsRequest, = ::Gitaly::CountDivergingCommitsResponse > -+ rpc :GetTreeEntries, ::Gitaly::GetTreeEntriesRequest, stream(::Gital= y::GetTreeEntriesResponse) > -+ rpc :List=46iles, ::Gitaly::List=46ilesRequest, stream(::Gitaly::Lis= t=46ilesResponse) > -+ rpc :=46indCommit, ::Gitaly::=46indCommitRequest, ::Gitaly::=46indCo= mmitResponse > -+ rpc :CommitStats, ::Gitaly::CommitStatsRequest, ::Gitaly::CommitStat= sResponse > - =23 Use a stream to paginate the result set > -- rpc :=46indAllCommits, Gitaly::=46indAllCommitsRequest, stream(Gital= y::=46indAllCommitsResponse) > -- rpc :=46indCommits, Gitaly::=46indCommitsRequest, stream(Gitaly::=46= indCommitsResponse) > -- rpc :CommitLanguages, Gitaly::CommitLanguagesRequest, Gitaly::Commit= LanguagesResponse > -- rpc :RawBlame, Gitaly::RawBlameRequest, stream(Gitaly::RawBlameRespo= nse) > -- rpc :LastCommit=46orPath, Gitaly::LastCommit=46orPathRequest, Gitaly= ::LastCommit=46orPathResponse > -- rpc :ListLastCommits=46orTree, Gitaly::ListLastCommits=46orTreeReque= st, stream(Gitaly::ListLastCommits=46orTreeResponse) > -- rpc :CommitsByMessage, Gitaly::CommitsByMessageRequest, stream(Gital= y::CommitsByMessageResponse) > -- rpc :ListCommitsByOid, Gitaly::ListCommitsByOidRequest, stream(Gital= y::ListCommitsByOidResponse) > -- rpc :ListCommitsByRefName, Gitaly::ListCommitsByRefNameRequest, stre= am(Gitaly::ListCommitsByRefNameResponse) > -- rpc :=46ilterShasWithSignatures, stream(Gitaly::=46ilterShasWithSign= aturesRequest), stream(Gitaly::=46ilterShasWithSignaturesResponse) > -- rpc :GetCommitSignatures, Gitaly::GetCommitSignaturesRequest, stream= (Gitaly::GetCommitSignaturesResponse) > -- rpc :GetCommitMessages, Gitaly::GetCommitMessagesRequest, stream(Git= aly::GetCommitMessagesResponse) > -+ rpc :=46indAllCommits, ::Gitaly::=46indAllCommitsRequest, stream(::G= italy::=46indAllCommitsResponse) > -+ rpc :=46indCommits, ::Gitaly::=46indCommitsRequest, stream(::Gitaly:= :=46indCommitsResponse) > -+ rpc :CommitLanguages, ::Gitaly::CommitLanguagesRequest, ::Gitaly::Co= mmitLanguagesResponse > -+ rpc :RawBlame, ::Gitaly::RawBlameRequest, stream(::Gitaly::RawBlameR= esponse) > -+ rpc :LastCommit=46orPath, ::Gitaly::LastCommit=46orPathRequest, ::Gi= taly::LastCommit=46orPathResponse > -+ rpc :ListLastCommits=46orTree, ::Gitaly::ListLastCommits=46orTreeReq= uest, stream(::Gitaly::ListLastCommits=46orTreeResponse) > -+ rpc :CommitsByMessage, ::Gitaly::CommitsByMessageRequest, stream(::G= italy::CommitsByMessageResponse) > -+ rpc :ListCommitsByOid, ::Gitaly::ListCommitsByOidRequest, stream(::G= italy::ListCommitsByOidResponse) > -+ rpc :ListCommitsByRefName, ::Gitaly::ListCommitsByRefNameRequest, st= ream(::Gitaly::ListCommitsByRefNameResponse) > -+ rpc :=46ilterShasWithSignatures, stream(::Gitaly::=46ilterShasWithSi= gnaturesRequest), stream(::Gitaly::=46ilterShasWithSignaturesResponse) > -+ rpc :GetCommitSignatures, ::Gitaly::GetCommitSignaturesRequest, stre= am(::Gitaly::GetCommitSignaturesResponse) > -+ rpc :GetCommitMessages, ::Gitaly::GetCommitMessagesRequest, stream(:= :Gitaly::GetCommitMessagesResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/conflicts=5Fservices=5Fpb.rb.orig 2021-11-08 11:= 56:42 UTC > -+++ ruby/proto/gitaly/conflicts=5Fservices=5Fpb.rb > -=40=40 -8,17 +8,17 =40=40 module Gitaly > - module ConflictsService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.ConflictsService' > - > -- rpc :ListConflict=46iles, Gitaly::ListConflict=46ilesRequest, stream= (Gitaly::ListConflict=46ilesResponse) > -+ rpc :ListConflict=46iles, ::Gitaly::ListConflict=46ilesRequest, stre= am(::Gitaly::ListConflict=46ilesResponse) > - =23 ResolveConflicts tries to resolve a conflicting merge with a set = of > - =23 user-provided merge resolutions. If resolving the conflict succee= ds, the > - =23 result will be a new merge commit. > -- rpc :ResolveConflicts, stream(Gitaly::ResolveConflictsRequest), Gita= ly::ResolveConflictsResponse > -+ rpc :ResolveConflicts, stream(::Gitaly::ResolveConflictsRequest), ::= Gitaly::ResolveConflictsResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/diff=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:42= UTC > -+++ ruby/proto/gitaly/diff=5Fservices=5Fpb.rb > -=40=40 -8,21 +8,21 =40=40 module Gitaly > - module DiffService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.DiffService' > - > - =23 Returns stream of CommitDiffResponse with patches chunked over me= ssages > -- rpc :CommitDiff, Gitaly::CommitDiffRequest, stream(Gitaly::CommitDif= fResponse) > -+ rpc :CommitDiff, ::Gitaly::CommitDiffRequest, stream(::Gitaly::Commi= tDiffResponse) > - =23 Return a stream so we can divide the response in chunks of deltas= > -- rpc :CommitDelta, Gitaly::CommitDeltaRequest, stream(Gitaly::CommitD= eltaResponse) > -- rpc :RawDiff, Gitaly::RawDiffRequest, stream(Gitaly::RawDiffResponse= ) > -- rpc :RawPatch, Gitaly::RawPatchRequest, stream(Gitaly::RawPatchRespo= nse) > -- rpc :DiffStats, Gitaly::DiffStatsRequest, stream(Gitaly::DiffStatsRe= sponse) > -+ rpc :CommitDelta, ::Gitaly::CommitDeltaRequest, stream(::Gitaly::Com= mitDeltaResponse) > -+ rpc :RawDiff, ::Gitaly::RawDiffRequest, stream(::Gitaly::RawDiffResp= onse) > -+ rpc :RawPatch, ::Gitaly::RawPatchRequest, stream(::Gitaly::RawPatchR= esponse) > -+ rpc :DiffStats, ::Gitaly::DiffStatsRequest, stream(::Gitaly::DiffSta= tsResponse) > - =23 Return a list of files changed along with the status of each file= > -- rpc :=46indChangedPaths, Gitaly::=46indChangedPathsRequest, stream(G= italy::=46indChangedPathsResponse) > -+ rpc :=46indChangedPaths, ::Gitaly::=46indChangedPathsRequest, stream= (::Gitaly::=46indChangedPathsResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/hook=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:42= UTC > -+++ ruby/proto/gitaly/hook=5Fservices=5Fpb.rb > -=40=40 -8,23 +8,23 =40=40 module Gitaly > - module HookService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.HookService' > - > -- rpc :PreReceiveHook, stream(Gitaly::PreReceiveHookRequest), stream(G= italy::PreReceiveHookResponse) > -- rpc :PostReceiveHook, stream(Gitaly::PostReceiveHookRequest), stream= (Gitaly::PostReceiveHookResponse) > -- rpc :UpdateHook, Gitaly::UpdateHookRequest, stream(Gitaly::UpdateHoo= kResponse) > -- rpc :ReferenceTransactionHook, stream(Gitaly::ReferenceTransactionHo= okRequest), stream(Gitaly::ReferenceTransactionHookResponse) > -+ rpc :PreReceiveHook, stream(::Gitaly::PreReceiveHookRequest), stream= (::Gitaly::PreReceiveHookResponse) > -+ rpc :PostReceiveHook, stream(::Gitaly::PostReceiveHookRequest), stre= am(::Gitaly::PostReceiveHookResponse) > -+ rpc :UpdateHook, ::Gitaly::UpdateHookRequest, stream(::Gitaly::Updat= eHookResponse) > -+ rpc :ReferenceTransactionHook, stream(::Gitaly::ReferenceTransaction= HookRequest), stream(::Gitaly::ReferenceTransactionHookResponse) > - =23 PackObjectsHook is meant to be called by git-upload-pack via the > - =23 uploadpack.packObjectsHook mechanism. It generates a stream of pa= cked > - =23 Git objects. > -- rpc :PackObjectsHook, stream(Gitaly::PackObjectsHookRequest), stream= (Gitaly::PackObjectsHookResponse) > -+ rpc :PackObjectsHook, stream(::Gitaly::PackObjectsHookRequest), stre= am(::Gitaly::PackObjectsHookResponse) > - =23 PackObjectsHookWithSidechannel is an optimized version of PackObj= ectsHook that uses > - =23 a unix socket side channel. > -- rpc :PackObjectsHookWithSidechannel, Gitaly::PackObjectsHookWithSide= channelRequest, Gitaly::PackObjectsHookWithSidechannelResponse > -+ rpc :PackObjectsHookWithSidechannel, ::Gitaly::PackObjectsHookWithSi= dechannelRequest, ::Gitaly::PackObjectsHookWithSidechannelResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/internal=5Fservices=5Fpb.rb.orig 2021-11-08 11:5= 6:42 UTC > -+++ ruby/proto/gitaly/internal=5Fservices=5Fpb.rb > -=40=40 -10,7 +10,7 =40=40 module Gitaly > - =23 only reachable by Praefect or other Gitalies > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > -=40=40 -18,7 +18,7 =40=40 module Gitaly > - > - =23 WalkRepos walks the storage and streams back all known git repos = on the > - =23 requested storage > -- rpc :WalkRepos, Gitaly::WalkReposRequest, stream(Gitaly::WalkReposRe= sponse) > -+ rpc :WalkRepos, ::Gitaly::WalkReposRequest, stream(::Gitaly::WalkRep= osResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/namespace=5Fservices=5Fpb.rb.orig 2021-11-08 11:= 56:42 UTC > -+++ ruby/proto/gitaly/namespace=5Fservices=5Fpb.rb > -=40=40 -8,16 +8,16 =40=40 module Gitaly > - module NamespaceService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.NamespaceService' > - > -- rpc :AddNamespace, Gitaly::AddNamespaceRequest, Gitaly::AddNamespace= Response > -- rpc :RemoveNamespace, Gitaly::RemoveNamespaceRequest, Gitaly::Remove= NamespaceResponse > -- rpc :RenameNamespace, Gitaly::RenameNamespaceRequest, Gitaly::Rename= NamespaceResponse > -- rpc :NamespaceExists, Gitaly::NamespaceExistsRequest, Gitaly::Namesp= aceExistsResponse > -+ rpc :AddNamespace, ::Gitaly::AddNamespaceRequest, ::Gitaly::AddNames= paceResponse > -+ rpc :RemoveNamespace, ::Gitaly::RemoveNamespaceRequest, ::Gitaly::Re= moveNamespaceResponse > -+ rpc :RenameNamespace, ::Gitaly::RenameNamespaceRequest, ::Gitaly::Re= nameNamespaceResponse > -+ rpc :NamespaceExists, ::Gitaly::NamespaceExistsRequest, ::Gitaly::Na= mespaceExistsResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/objectpool=5Fservices=5Fpb.rb.orig 2021-11-08 11= :56:42 UTC > -+++ ruby/proto/gitaly/objectpool=5Fservices=5Fpb.rb > -=40=40 -8,16 +8,16 =40=40 module Gitaly > - module ObjectPoolService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.ObjectPoolService' > - > -- rpc :CreateObjectPool, Gitaly::CreateObjectPoolRequest, Gitaly::Crea= teObjectPoolResponse > -- rpc :DeleteObjectPool, Gitaly::DeleteObjectPoolRequest, Gitaly::Dele= teObjectPoolResponse > -+ rpc :CreateObjectPool, ::Gitaly::CreateObjectPoolRequest, ::Gitaly::= CreateObjectPoolResponse > -+ rpc :DeleteObjectPool, ::Gitaly::DeleteObjectPoolRequest, ::Gitaly::= DeleteObjectPoolResponse > - =23 Repositories are assumed to be stored on the same disk > -- rpc :LinkRepositoryToObjectPool, Gitaly::LinkRepositoryToObjectPoolR= equest, Gitaly::LinkRepositoryToObjectPoolResponse > -+ rpc :LinkRepositoryToObjectPool, ::Gitaly::LinkRepositoryToObjectPoo= lRequest, ::Gitaly::LinkRepositoryToObjectPoolResponse > - =23 UnlinkRepository=46romObjectPool does not unlink the repository f= rom the > - =23 object pool as you'd think, but all it really does is to remove t= he object > - =23 pool's remote pointing to the repository. And even this is a no-o= p given > -=40=40 -28,11 +28,11 =40=40 module Gitaly > - =23 > - =23 This function is never called by anyone and highly misleading. It= 's thus > - =23 deprecated and will be removed in v14.4. > -- rpc :UnlinkRepository=46romObjectPool, Gitaly::UnlinkRepository=46ro= mObjectPoolRequest, Gitaly::UnlinkRepository=46romObjectPoolResponse > -- rpc :ReduplicateRepository, Gitaly::ReduplicateRepositoryRequest, Gi= taly::ReduplicateRepositoryResponse > -- rpc :DisconnectGitAlternates, Gitaly::DisconnectGitAlternatesRequest= , Gitaly::DisconnectGitAlternatesResponse > -- rpc :=46etchIntoObjectPool, Gitaly::=46etchIntoObjectPoolRequest, Gi= taly::=46etchIntoObjectPoolResponse > -- rpc :GetObjectPool, Gitaly::GetObjectPoolRequest, Gitaly::GetObjectP= oolResponse > -+ rpc :UnlinkRepository=46romObjectPool, ::Gitaly::UnlinkRepository=46= romObjectPoolRequest, ::Gitaly::UnlinkRepository=46romObjectPoolResponse > -+ rpc :ReduplicateRepository, ::Gitaly::ReduplicateRepositoryRequest, = ::Gitaly::ReduplicateRepositoryResponse > -+ rpc :DisconnectGitAlternates, ::Gitaly::DisconnectGitAlternatesReque= st, ::Gitaly::DisconnectGitAlternatesResponse > -+ rpc :=46etchIntoObjectPool, ::Gitaly::=46etchIntoObjectPoolRequest, = ::Gitaly::=46etchIntoObjectPoolResponse > -+ rpc :GetObjectPool, ::Gitaly::GetObjectPoolRequest, ::Gitaly::GetObj= ectPoolResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/operations=5Fservices=5Fpb.rb.orig 2021-11-08 11= :56:42 UTC > -+++ ruby/proto/gitaly/operations=5Fservices=5Fpb.rb > -=40=40 -12,23 +12,23 =40=40 module Gitaly > - =23 '/allowed' endpoint. > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.OperationService' > - > -- rpc :UserCreateBranch, Gitaly::UserCreateBranchRequest, Gitaly::User= CreateBranchResponse > -- rpc :UserUpdateBranch, Gitaly::UserUpdateBranchRequest, Gitaly::User= UpdateBranchResponse > -- rpc :UserDeleteBranch, Gitaly::UserDeleteBranchRequest, Gitaly::User= DeleteBranchResponse > -+ rpc :UserCreateBranch, ::Gitaly::UserCreateBranchRequest, ::Gitaly::= UserCreateBranchResponse > -+ rpc :UserUpdateBranch, ::Gitaly::UserUpdateBranchRequest, ::Gitaly::= UserUpdateBranchResponse > -+ rpc :UserDeleteBranch, ::Gitaly::UserDeleteBranchRequest, ::Gitaly::= UserDeleteBranchResponse > - =23 UserCreateTag creates a new tag. > -- rpc :UserCreateTag, Gitaly::UserCreateTagRequest, Gitaly::UserCreate= TagResponse > -- rpc :UserDeleteTag, Gitaly::UserDeleteTagRequest, Gitaly::UserDelete= TagResponse > -+ rpc :UserCreateTag, ::Gitaly::UserCreateTagRequest, ::Gitaly::UserCr= eateTagResponse > -+ rpc :UserDeleteTag, ::Gitaly::UserDeleteTagRequest, ::Gitaly::UserDe= leteTagResponse > - =23 UserMergeRef creates a merge commit and updates target=5Fref to p= oint to that > - =23 new commit. The first parent of the merge commit (the main line) = is taken > - =23 from first=5Fparent=5Fref. The second parent is specified by its = commit ID in source=5Fsha. > - =23 If target=5Fref already exists it will be overwritten. > -- rpc :UserMergeToRef, Gitaly::UserMergeToRefRequest, Gitaly::UserMerg= eToRefResponse > -+ rpc :UserMergeToRef, ::Gitaly::UserMergeToRefRequest, ::Gitaly::User= MergeToRefResponse > - =23 UserMergeBranch tries to merge the given commit into the target b= ranch. > - =23 The merge commit is created with the given user as author/committ= er and > - =23 the given message. > -=40=40 -38,20 +38,20 =40=40 module Gitaly > - =23 requested merge, which will result in a response with the created= merge > - =23 commit ID. Only if a second message with =60apply =3D true=60 is = sent will the > - =23 merge be applied. > -- rpc :UserMergeBranch, stream(Gitaly::UserMergeBranchRequest), stream= (Gitaly::UserMergeBranchResponse) > -+ rpc :UserMergeBranch, stream(::Gitaly::UserMergeBranchRequest), stre= am(::Gitaly::UserMergeBranchResponse) > - =23 User=46=46Branch tries to perform a fast-forward merge of the giv= en branch to > - =23 the given commit. If the merge is not a fast-forward merge, the r= equest > - =23 will fail. The RPC will return an empty response in case updating= the > - =23 reference fails e.g. because of a race. > -- rpc :User=46=46Branch, Gitaly::User=46=46BranchRequest, Gitaly::User= =46=46BranchResponse > -+ rpc :User=46=46Branch, ::Gitaly::User=46=46BranchRequest, ::Gitaly::= User=46=46BranchResponse > - =23 UserCherryPick tries to perform a cherry-pick of a given commit o= nto a > - =23 branch. > -- rpc :UserCherryPick, Gitaly::UserCherryPickRequest, Gitaly::UserCher= ryPickResponse > -+ rpc :UserCherryPick, ::Gitaly::UserCherryPickRequest, ::Gitaly::User= CherryPickResponse > - =23 UserCommit=46iles builds a commit from a stream of actions and up= dates the target branch to point to it. > - =23 UserCommit=46ilesRequest with a UserCommit=46ilesRequestHeader mu= st be sent as the first message of the stream. > - =23 =46ollowing that, a variable number of actions can be sent to bui= ld a new commit. Each action consists of > - =23 a header followed by content if used by the action. > -- rpc :UserCommit=46iles, stream(Gitaly::UserCommit=46ilesRequest), Gi= taly::UserCommit=46ilesResponse > -+ rpc :UserCommit=46iles, stream(::Gitaly::UserCommit=46ilesRequest), = ::Gitaly::UserCommit=46ilesResponse > - =23 UserRebaseConfirmable rebases the given remote branch onto a targ= et > - =23 branch. The remote branch may be part of another repository. > - =23 > -=40=40 -60,15 +60,15 =40=40 module Gitaly > - =23 requested rebase, which will result in a response with the create= d rebase > - =23 commit ID. Only if a second message with =60apply =3D true=60 is = sent will the > - =23 rebase be applied. > -- rpc :UserRebaseConfirmable, stream(Gitaly::UserRebaseConfirmableRequ= est), stream(Gitaly::UserRebaseConfirmableResponse) > -+ rpc :UserRebaseConfirmable, stream(::Gitaly::UserRebaseConfirmableRe= quest), stream(::Gitaly::UserRebaseConfirmableResponse) > - =23 UserRevert tries to perform a revert of a given commit onto a bra= nch. > -- rpc :UserRevert, Gitaly::UserRevertRequest, Gitaly::UserRevertRespon= se > -+ rpc :UserRevert, ::Gitaly::UserRevertRequest, ::Gitaly::UserRevertRe= sponse > - =23 UserSquash squashes a range of commits into a single commit. > -- rpc :UserSquash, Gitaly::UserSquashRequest, Gitaly::UserSquashRespon= se > -+ rpc :UserSquash, ::Gitaly::UserSquashRequest, ::Gitaly::UserSquashRe= sponse > - =23 UserApplyPatch applies patches to a given branch. > -- rpc :UserApplyPatch, stream(Gitaly::UserApplyPatchRequest), Gitaly::= UserApplyPatchResponse > -+ rpc :UserApplyPatch, stream(::Gitaly::UserApplyPatchRequest), ::Gita= ly::UserApplyPatchResponse > - =23 UserUpdateSubmodule updates a submodule to point to a new commit.= > -- rpc :UserUpdateSubmodule, Gitaly::UserUpdateSubmoduleRequest, Gitaly= ::UserUpdateSubmoduleResponse > -+ rpc :UserUpdateSubmodule, ::Gitaly::UserUpdateSubmoduleRequest, ::Gi= taly::UserUpdateSubmoduleResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/praefect=5Fservices=5Fpb.rb.orig 2021-11-08 11:5= 6:42 UTC > -+++ ruby/proto/gitaly/praefect=5Fservices=5Fpb.rb > -=40=40 -8,19 +8,19 =40=40 module Gitaly > - module PraefectInfoService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.PraefectInfoService' > - > -- rpc :RepositoryReplicas, Gitaly::RepositoryReplicasRequest, Gitaly::= RepositoryReplicasResponse > -+ rpc :RepositoryReplicas, ::Gitaly::RepositoryReplicasRequest, ::Gita= ly::RepositoryReplicasResponse > - =23 DatalossCheck checks for unavailable repositories. > -- rpc :DatalossCheck, Gitaly::DatalossCheckRequest, Gitaly::DatalossCh= eckResponse > -+ rpc :DatalossCheck, ::Gitaly::DatalossCheckRequest, ::Gitaly::Datalo= ssCheckResponse > - =23 SetAuthoritativeStorage sets the authoritative storage for a repo= sitory on a given virtual storage. > - =23 This causes the current version of the repository on the authorit= ative storage to be considered the > - =23 latest and overwrite any other version on the virtual storage. > -- rpc :SetAuthoritativeStorage, Gitaly::SetAuthoritativeStorageRequest= , Gitaly::SetAuthoritativeStorageResponse > -+ rpc :SetAuthoritativeStorage, ::Gitaly::SetAuthoritativeStorageReque= st, ::Gitaly::SetAuthoritativeStorageResponse > - =23 SetReplication=46actor assigns or unassigns host nodes from the r= epository to meet the desired replication factor. > - =23 SetReplication=46actor returns an error when trying to set a repl= ication factor that exceeds the storage node count > - =23 in the virtual storage. An error is also returned when trying to = set a replication factor below one. The primary node > -=40=40 -29,7 +29,7 =40=40 module Gitaly > - =23 This might cause the actual replication factor to be higher than = desired if the replication factor is set during an upgrade > - =23 from a Praefect node that does not yet know about a new node. As = assignments of unconfigured storages are ignored, replication > - =23 factor of repositories assigned to a storage node removed from th= e cluster is effectively decreased. > -- rpc :SetReplication=46actor, Gitaly::SetReplication=46actorRequest, = Gitaly::SetReplication=46actorResponse > -+ rpc :SetReplication=46actor, ::Gitaly::SetReplication=46actorRequest= , ::Gitaly::SetReplication=46actorResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/ref=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:42 = UTC > -+++ ruby/proto/gitaly/ref=5Fservices=5Fpb.rb > -=40=40 -8,42 +8,42 =40=40 module Gitaly > - module RefService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.RefService' > - > -- rpc :=46indDefaultBranchName, Gitaly::=46indDefaultBranchNameRequest= , Gitaly::=46indDefaultBranchNameResponse > -- rpc :=46indAllBranchNames, Gitaly::=46indAllBranchNamesRequest, stre= am(Gitaly::=46indAllBranchNamesResponse) > -- rpc :=46indAllTagNames, Gitaly::=46indAllTagNamesRequest, stream(Git= aly::=46indAllTagNamesResponse) > -+ rpc :=46indDefaultBranchName, ::Gitaly::=46indDefaultBranchNameReque= st, ::Gitaly::=46indDefaultBranchNameResponse > -+ rpc :=46indAllBranchNames, ::Gitaly::=46indAllBranchNamesRequest, st= ream(::Gitaly::=46indAllBranchNamesResponse) > -+ rpc :=46indAllTagNames, ::Gitaly::=46indAllTagNamesRequest, stream(:= :Gitaly::=46indAllTagNamesResponse) > - =23 Return a stream so we can divide the response in chunks of branch= es > -- rpc :=46indLocalBranches, Gitaly::=46indLocalBranchesRequest, stream= (Gitaly::=46indLocalBranchesResponse) > -- rpc :=46indAllBranches, Gitaly::=46indAllBranchesRequest, stream(Git= aly::=46indAllBranchesResponse) > -+ rpc :=46indLocalBranches, ::Gitaly::=46indLocalBranchesRequest, stre= am(::Gitaly::=46indLocalBranchesResponse) > -+ rpc :=46indAllBranches, ::Gitaly::=46indAllBranchesRequest, stream(:= :Gitaly::=46indAllBranchesResponse) > - =23 Returns a stream of tags repository has. > -- rpc :=46indAllTags, Gitaly::=46indAllTagsRequest, stream(Gitaly::=46= indAllTagsResponse) > -- rpc :=46indTag, Gitaly::=46indTagRequest, Gitaly::=46indTagResponse > -- rpc :=46indAllRemoteBranches, Gitaly::=46indAllRemoteBranchesRequest= , stream(Gitaly::=46indAllRemoteBranchesResponse) > -- rpc :RefExists, Gitaly::RefExistsRequest, Gitaly::RefExistsResponse > -+ rpc :=46indAllTags, ::Gitaly::=46indAllTagsRequest, stream(::Gitaly:= :=46indAllTagsResponse) > -+ rpc :=46indTag, ::Gitaly::=46indTagRequest, ::Gitaly::=46indTagRespo= nse > -+ rpc :=46indAllRemoteBranches, ::Gitaly::=46indAllRemoteBranchesReque= st, stream(::Gitaly::=46indAllRemoteBranchesResponse) > -+ rpc :RefExists, ::Gitaly::RefExistsRequest, ::Gitaly::RefExistsRespo= nse > - =23 =46indBranch finds a branch by its unqualified name (like =22mast= er=22) and > - =23 returns the commit it currently points to. > -- rpc :=46indBranch, Gitaly::=46indBranchRequest, Gitaly::=46indBranch= Response > -- rpc :DeleteRefs, Gitaly::DeleteRefsRequest, Gitaly::DeleteRefsRespon= se > -- rpc :ListBranchNamesContainingCommit, Gitaly::ListBranchNamesContain= ingCommitRequest, stream(Gitaly::ListBranchNamesContainingCommitResponse)= > -- rpc :ListTagNamesContainingCommit, Gitaly::ListTagNamesContainingCom= mitRequest, stream(Gitaly::ListTagNamesContainingCommitResponse) > -+ rpc :=46indBranch, ::Gitaly::=46indBranchRequest, ::Gitaly::=46indBr= anchResponse > -+ rpc :DeleteRefs, ::Gitaly::DeleteRefsRequest, ::Gitaly::DeleteRefsRe= sponse > -+ rpc :ListBranchNamesContainingCommit, ::Gitaly::ListBranchNamesConta= iningCommitRequest, stream(::Gitaly::ListBranchNamesContainingCommitRespo= nse) > -+ rpc :ListTagNamesContainingCommit, ::Gitaly::ListTagNamesContainingC= ommitRequest, stream(::Gitaly::ListTagNamesContainingCommitResponse) > - =23 GetTagSignatures returns signatures for annotated tags resolved f= rom a set of revisions. Revisions > - =23 which don't resolve to an annotated tag are silently discarded. R= evisions which cannot be resolved > - =23 result in an error. Tags which are annotated but not signed will = return a TagSignature response > - =23 which has no signature, but its unsigned contents will still be r= eturned. > -- rpc :GetTagSignatures, Gitaly::GetTagSignaturesRequest, stream(Gital= y::GetTagSignaturesResponse) > -- rpc :GetTagMessages, Gitaly::GetTagMessagesRequest, stream(Gitaly::G= etTagMessagesResponse) > -+ rpc :GetTagSignatures, ::Gitaly::GetTagSignaturesRequest, stream(::G= italy::GetTagSignaturesResponse) > -+ rpc :GetTagMessages, ::Gitaly::GetTagMessagesRequest, stream(::Gital= y::GetTagMessagesResponse) > - =23 Returns commits that are only reachable from the ref passed > -- rpc :ListNewCommits, Gitaly::ListNewCommitsRequest, stream(Gitaly::L= istNewCommitsResponse) > -- rpc :PackRefs, Gitaly::PackRefsRequest, Gitaly::PackRefsResponse > -+ rpc :ListNewCommits, ::Gitaly::ListNewCommitsRequest, stream(::Gital= y::ListNewCommitsResponse) > -+ rpc :PackRefs, ::Gitaly::PackRefsRequest, ::Gitaly::PackRefsResponse= > - =23 ListRefs returns a stream of all references in the repository. By= default, pseudo-revisions like HEAD > - =23 will not be returned by this RPC. Any symbolic references will be= resolved to the object ID it is > - =23 pointing at. > -- rpc :ListRefs, Gitaly::ListRefsRequest, stream(Gitaly::ListRefsRespo= nse) > -+ rpc :ListRefs, ::Gitaly::ListRefsRequest, stream(::Gitaly::ListRefsR= esponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/remote=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:= 42 UTC > -+++ ruby/proto/gitaly/remote=5Fservices=5Fpb.rb > -=40=40 -8,7 +8,7 =40=40 module Gitaly > - module RemoteService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > -=40=40 -19,14 +19,14 =40=40 module Gitaly > - =23 references to the mirror. Created and modified references are upd= ated, removed references are > - =23 deleted from the mirror. UpdateRemoteMirror updates all tags. Bra= nches are updated if they match > - =23 the patterns specified in the requests. > -- rpc :UpdateRemoteMirror, stream(Gitaly::UpdateRemoteMirrorRequest), = Gitaly::UpdateRemoteMirrorResponse > -- rpc :=46indRemoteRepository, Gitaly::=46indRemoteRepositoryRequest, = Gitaly::=46indRemoteRepositoryResponse > -+ rpc :UpdateRemoteMirror, stream(::Gitaly::UpdateRemoteMirrorRequest)= , ::Gitaly::UpdateRemoteMirrorResponse > -+ rpc :=46indRemoteRepository, ::Gitaly::=46indRemoteRepositoryRequest= , ::Gitaly::=46indRemoteRepositoryResponse > - =23 =46indRemoteRootRef tries to find the root reference of a remote > - =23 repository. The root reference is the default branch as pointed t= o by > - =23 the remotes HEAD reference. Returns an InvalidArgument error if t= he > - =23 specified remote does not exist and a Not=46ound error in case no= HEAD > - =23 branch was found. > -- rpc :=46indRemoteRootRef, Gitaly::=46indRemoteRootRefRequest, Gitaly= ::=46indRemoteRootRefResponse > -+ rpc :=46indRemoteRootRef, ::Gitaly::=46indRemoteRootRefRequest, ::Gi= taly::=46indRemoteRootRefResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/repository-service=5Fservices=5Fpb.rb.orig 2021-= 11-08 11:56:42 UTC > -+++ ruby/proto/gitaly/repository-service=5Fservices=5Fpb.rb > -=40=40 -8,73 +8,73 =40=40 module Gitaly > - module RepositoryService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.RepositoryService' > - > -- rpc :RepositoryExists, Gitaly::RepositoryExistsRequest, Gitaly::Repo= sitoryExistsResponse > -- rpc :RepackIncremental, Gitaly::RepackIncrementalRequest, Gitaly::Re= packIncrementalResponse > -- rpc :Repack=46ull, Gitaly::Repack=46ullRequest, Gitaly::Repack=46ull= Response > -- rpc :MidxRepack, Gitaly::MidxRepackRequest, Gitaly::MidxRepackRespon= se > -- rpc :GarbageCollect, Gitaly::GarbageCollectRequest, Gitaly::GarbageC= ollectResponse > -- rpc :WriteCommitGraph, Gitaly::WriteCommitGraphRequest, Gitaly::Writ= eCommitGraphResponse > -- rpc :RepositorySize, Gitaly::RepositorySizeRequest, Gitaly::Reposito= rySizeResponse > -- rpc :ApplyGitattributes, Gitaly::ApplyGitattributesRequest, Gitaly::= ApplyGitattributesResponse > -+ rpc :RepositoryExists, ::Gitaly::RepositoryExistsRequest, ::Gitaly::= RepositoryExistsResponse > -+ rpc :RepackIncremental, ::Gitaly::RepackIncrementalRequest, ::Gitaly= ::RepackIncrementalResponse > -+ rpc :Repack=46ull, ::Gitaly::Repack=46ullRequest, ::Gitaly::Repack=46= ullResponse > -+ rpc :MidxRepack, ::Gitaly::MidxRepackRequest, ::Gitaly::MidxRepackRe= sponse > -+ rpc :GarbageCollect, ::Gitaly::GarbageCollectRequest, ::Gitaly::Garb= ageCollectResponse > -+ rpc :WriteCommitGraph, ::Gitaly::WriteCommitGraphRequest, ::Gitaly::= WriteCommitGraphResponse > -+ rpc :RepositorySize, ::Gitaly::RepositorySizeRequest, ::Gitaly::Repo= sitorySizeResponse > -+ rpc :ApplyGitattributes, ::Gitaly::ApplyGitattributesRequest, ::Gita= ly::ApplyGitattributesResponse > - =23 =46etchRemote fetches references from a remote repository into th= e local > - =23 repository. > -- rpc :=46etchRemote, Gitaly::=46etchRemoteRequest, Gitaly::=46etchRem= oteResponse > -- rpc :CreateRepository, Gitaly::CreateRepositoryRequest, Gitaly::Crea= teRepositoryResponse > -- rpc :GetArchive, Gitaly::GetArchiveRequest, stream(Gitaly::GetArchiv= eResponse) > -- rpc :HasLocalBranches, Gitaly::HasLocalBranchesRequest, Gitaly::HasL= ocalBranchesResponse > -+ rpc :=46etchRemote, ::Gitaly::=46etchRemoteRequest, ::Gitaly::=46etc= hRemoteResponse > -+ rpc :CreateRepository, ::Gitaly::CreateRepositoryRequest, ::Gitaly::= CreateRepositoryResponse > -+ rpc :GetArchive, ::Gitaly::GetArchiveRequest, stream(::Gitaly::GetAr= chiveResponse) > -+ rpc :HasLocalBranches, ::Gitaly::HasLocalBranchesRequest, ::Gitaly::= HasLocalBranchesResponse > - =23 =46etchSourceBranch fetches a branch from a second (potentially r= emote) > - =23 repository into the given repository. > -- rpc :=46etchSourceBranch, Gitaly::=46etchSourceBranchRequest, Gitaly= ::=46etchSourceBranchResponse > -- rpc :=46sck, Gitaly::=46sckRequest, Gitaly::=46sckResponse > -- rpc :WriteRef, Gitaly::WriteRefRequest, Gitaly::WriteRefResponse > -- rpc :=46indMergeBase, Gitaly::=46indMergeBaseRequest, Gitaly::=46ind= MergeBaseResponse > -- rpc :Create=46ork, Gitaly::Create=46orkRequest, Gitaly::Create=46ork= Response > -- rpc :CreateRepository=46romURL, Gitaly::CreateRepository=46romURLReq= uest, Gitaly::CreateRepository=46romURLResponse > -+ rpc :=46etchSourceBranch, ::Gitaly::=46etchSourceBranchRequest, ::Gi= taly::=46etchSourceBranchResponse > -+ rpc :=46sck, ::Gitaly::=46sckRequest, ::Gitaly::=46sckResponse > -+ rpc :WriteRef, ::Gitaly::WriteRefRequest, ::Gitaly::WriteRefResponse= > -+ rpc :=46indMergeBase, ::Gitaly::=46indMergeBaseRequest, ::Gitaly::=46= indMergeBaseResponse > -+ rpc :Create=46ork, ::Gitaly::Create=46orkRequest, ::Gitaly::Create=46= orkResponse > -+ rpc :CreateRepository=46romURL, ::Gitaly::CreateRepository=46romURLR= equest, ::Gitaly::CreateRepository=46romURLResponse > - =23 CreateBundle creates a bundle from all refs > -- rpc :CreateBundle, Gitaly::CreateBundleRequest, stream(Gitaly::Creat= eBundleResponse) > -+ rpc :CreateBundle, ::Gitaly::CreateBundleRequest, stream(::Gitaly::C= reateBundleResponse) > - =23 CreateBundle=46romRefList creates a bundle from a stream of ref p= atterns. > - =23 When the bundle would be empty the =46ailedPrecondition error cod= e is returned. > -- rpc :CreateBundle=46romRefList, stream(Gitaly::CreateBundle=46romRef= ListRequest), stream(Gitaly::CreateBundle=46romRefListResponse) > -+ rpc :CreateBundle=46romRefList, stream(::Gitaly::CreateBundle=46romR= efListRequest), stream(::Gitaly::CreateBundle=46romRefListResponse) > - =23 =46etchBundle fetches references from a bundle into the local rep= ository. > - =23 Refs will be mirrored to the target repository with the refspec > - =23 =22+refs/*:refs/*=22 and refs that do not exist in the bundle wil= l be removed. > -- rpc :=46etchBundle, stream(Gitaly::=46etchBundleRequest), Gitaly::=46= etchBundleResponse > -- rpc :CreateRepository=46romBundle, stream(Gitaly::CreateRepository=46= romBundleRequest), Gitaly::CreateRepository=46romBundleResponse > -+ rpc :=46etchBundle, stream(::Gitaly::=46etchBundleRequest), ::Gitaly= ::=46etchBundleResponse > -+ rpc :CreateRepository=46romBundle, stream(::Gitaly::CreateRepository= =46romBundleRequest), ::Gitaly::CreateRepository=46romBundleResponse > - =23 GetConfig reads the target repository's gitconfig and streams its= contents > - =23 back. Returns a Not=46ound error in case no gitconfig was found. > -- rpc :GetConfig, Gitaly::GetConfigRequest, stream(Gitaly::GetConfigRe= sponse) > -- rpc :=46indLicense, Gitaly::=46indLicenseRequest, Gitaly::=46indLice= nseResponse > -- rpc :GetInfoAttributes, Gitaly::GetInfoAttributesRequest, stream(Git= aly::GetInfoAttributesResponse) > -- rpc :CalculateChecksum, Gitaly::CalculateChecksumRequest, Gitaly::Ca= lculateChecksumResponse > -- rpc :Cleanup, Gitaly::CleanupRequest, Gitaly::CleanupResponse > -- rpc :GetSnapshot, Gitaly::GetSnapshotRequest, stream(Gitaly::GetSnap= shotResponse) > -- rpc :CreateRepository=46romSnapshot, Gitaly::CreateRepository=46romS= napshotRequest, Gitaly::CreateRepository=46romSnapshotResponse > -- rpc :GetRawChanges, Gitaly::GetRawChangesRequest, stream(Gitaly::Get= RawChangesResponse) > -- rpc :Search=46ilesByContent, Gitaly::Search=46ilesByContentRequest, = stream(Gitaly::Search=46ilesByContentResponse) > -- rpc :Search=46ilesByName, Gitaly::Search=46ilesByNameRequest, stream= (Gitaly::Search=46ilesByNameResponse) > -- rpc :RestoreCustomHooks, stream(Gitaly::RestoreCustomHooksRequest), = Gitaly::RestoreCustomHooksResponse > -- rpc :BackupCustomHooks, Gitaly::BackupCustomHooksRequest, stream(Git= aly::BackupCustomHooksResponse) > -- rpc :GetObjectDirectorySize, Gitaly::GetObjectDirectorySizeRequest, = Gitaly::GetObjectDirectorySizeResponse > -- rpc :Clone=46romPool, Gitaly::Clone=46romPoolRequest, Gitaly::Clone=46= romPoolResponse > -- rpc :Clone=46romPoolInternal, Gitaly::Clone=46romPoolInternalRequest= , Gitaly::Clone=46romPoolInternalResponse > -+ rpc :GetConfig, ::Gitaly::GetConfigRequest, stream(::Gitaly::GetConf= igResponse) > -+ rpc :=46indLicense, ::Gitaly::=46indLicenseRequest, ::Gitaly::=46ind= LicenseResponse > -+ 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::Get= SnapshotResponse) > -+ rpc :CreateRepository=46romSnapshot, ::Gitaly::CreateRepository=46ro= mSnapshotRequest, ::Gitaly::CreateRepository=46romSnapshotResponse > -+ rpc :GetRawChanges, ::Gitaly::GetRawChangesRequest, stream(::Gitaly:= :GetRawChangesResponse) > -+ rpc :Search=46ilesByContent, ::Gitaly::Search=46ilesByContentRequest= , stream(::Gitaly::Search=46ilesByContentResponse) > -+ rpc :Search=46ilesByName, ::Gitaly::Search=46ilesByNameRequest, stre= am(::Gitaly::Search=46ilesByNameResponse) > -+ rpc :RestoreCustomHooks, stream(::Gitaly::RestoreCustomHooksRequest)= , ::Gitaly::RestoreCustomHooksResponse > -+ rpc :BackupCustomHooks, ::Gitaly::BackupCustomHooksRequest, stream(:= :Gitaly::BackupCustomHooksResponse) > -+ rpc :GetObjectDirectorySize, ::Gitaly::GetObjectDirectorySizeRequest= , ::Gitaly::GetObjectDirectorySizeResponse > -+ rpc :Clone=46romPool, ::Gitaly::Clone=46romPoolRequest, ::Gitaly::Cl= one=46romPoolResponse > -+ rpc :Clone=46romPoolInternal, ::Gitaly::Clone=46romPoolInternalReque= st, ::Gitaly::Clone=46romPoolInternalResponse > - =23 RemoveRepository will move the repository to =60+gitaly/tmp/<rela= tive=5Fpath>=5Fremoved=60 and > - =23 eventually remove it. This ensures that even on networked filesys= tems the > - =23 data is actually removed even if there's someone still handling t= he data. > -- rpc :RemoveRepository, Gitaly::RemoveRepositoryRequest, Gitaly::Remo= veRepositoryResponse > -- rpc :RenameRepository, Gitaly::RenameRepositoryRequest, Gitaly::Rena= meRepositoryResponse > -- 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, ::Gi= taly::ReplicateRepositoryResponse > -+ rpc :OptimizeRepository, ::Gitaly::OptimizeRepositoryRequest, ::Gita= ly::OptimizeRepositoryResponse > - =23 Set=46ullPath writes the =22gitlab.fullpath=22 configuration into= the > - =23 repository's gitconfig. This is mainly to help debugging purposes= in case > - =23 an admin inspects the repository's gitconfig such that he can eas= ily see > - =23 what the repository name is. > -- rpc :Set=46ullPath, Gitaly::Set=46ullPathRequest, Gitaly::Set=46ullP= athResponse > -+ rpc :Set=46ullPath, ::Gitaly::Set=46ullPathRequest, ::Gitaly::Set=46= ullPathResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/server=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:= 42 UTC > -+++ ruby/proto/gitaly/server=5Fservices=5Fpb.rb > -=40=40 -8,14 +8,14 =40=40 module Gitaly > - module ServerService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.ServerService' > - > -- rpc :ServerInfo, Gitaly::ServerInfoRequest, Gitaly::ServerInfoRespon= se > -- rpc :DiskStatistics, Gitaly::DiskStatisticsRequest, Gitaly::DiskStat= isticsResponse > -+ rpc :ServerInfo, ::Gitaly::ServerInfoRequest, ::Gitaly::ServerInfoRe= sponse > -+ rpc :DiskStatistics, ::Gitaly::DiskStatisticsRequest, ::Gitaly::Disk= StatisticsResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/smarthttp=5Fservices=5Fpb.rb.orig 2021-11-08 11:= 56:42 UTC > -+++ ruby/proto/gitaly/smarthttp=5Fservices=5Fpb.rb > -=40=40 -8,7 +8,7 =40=40 module Gitaly > - module SmartHTTPService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > -=40=40 -17,17 +17,17 =40=40 module Gitaly > - =23 The response body for GET /info/refs=3Fservice=3Dgit-upload-pack > - =23 Will be invoked when the user executes a =60git fetch=60, meaning= the server > - =23 will upload the packs to that user. The user doesn't upload new o= bjects. > -- rpc :InfoRefsUploadPack, Gitaly::InfoRefsRequest, stream(Gitaly::Inf= oRefsResponse) > -+ rpc :InfoRefsUploadPack, ::Gitaly::InfoRefsRequest, stream(::Gitaly:= :InfoRefsResponse) > - =23 The response body for GET /info/refs=3Fservice=3Dgit-receive-pack= > - =23 Will be invoked when the user executes a =60git push=60, but only= advertises > - =23 references to the user. > -- rpc :InfoRefsReceivePack, Gitaly::InfoRefsRequest, stream(Gitaly::In= foRefsResponse) > -+ rpc :InfoRefsReceivePack, ::Gitaly::InfoRefsRequest, stream(::Gitaly= ::InfoRefsResponse) > - =23 Request and response body for POST /upload-pack > -- rpc :PostUploadPack, stream(Gitaly::PostUploadPackRequest), stream(G= italy::PostUploadPackResponse) > -+ rpc :PostUploadPack, stream(::Gitaly::PostUploadPackRequest), stream= (::Gitaly::PostUploadPackResponse) > - =23 Request and response body for POST /upload-pack using sidechannel= protocol > -- rpc :PostUploadPackWithSidechannel, Gitaly::PostUploadPackWithSidech= annelRequest, Gitaly::PostUploadPackWithSidechannelResponse > -+ rpc :PostUploadPackWithSidechannel, ::Gitaly::PostUploadPackWithSide= channelRequest, ::Gitaly::PostUploadPackWithSidechannelResponse > - =23 Request and response body for POST /receive-pack > -- rpc :PostReceivePack, stream(Gitaly::PostReceivePackRequest), stream= (Gitaly::PostReceivePackResponse) > -+ rpc :PostReceivePack, stream(::Gitaly::PostReceivePackRequest), stre= am(::Gitaly::PostReceivePackResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/ssh=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:42 = UTC > -+++ ruby/proto/gitaly/ssh=5Fservices=5Fpb.rb > -=40=40 -8,18 +8,18 =40=40 module Gitaly > - module SSHService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.SSHService' > - > - =23 To forward 'git upload-pack' to Gitaly for SSH sessions > -- rpc :SSHUploadPack, stream(Gitaly::SSHUploadPackRequest), stream(Git= aly::SSHUploadPackResponse) > -+ rpc :SSHUploadPack, stream(::Gitaly::SSHUploadPackRequest), stream(:= :Gitaly::SSHUploadPackResponse) > - =23 To forward 'git receive-pack' to Gitaly for SSH sessions > -- rpc :SSHReceivePack, stream(Gitaly::SSHReceivePackRequest), stream(G= italy::SSHReceivePackResponse) > -+ rpc :SSHReceivePack, stream(::Gitaly::SSHReceivePackRequest), stream= (::Gitaly::SSHReceivePackResponse) > - =23 To forward 'git upload-archive' to Gitaly for SSH sessions > -- rpc :SSHUploadArchive, stream(Gitaly::SSHUploadArchiveRequest), stre= am(Gitaly::SSHUploadArchiveResponse) > -+ rpc :SSHUploadArchive, stream(::Gitaly::SSHUploadArchiveRequest), st= ream(::Gitaly::SSHUploadArchiveResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/transaction=5Fservices=5Fpb.rb.orig 2021-11-08 1= 1:56:42 UTC > -+++ ruby/proto/gitaly/transaction=5Fservices=5Fpb.rb > -=40=40 -8,14 +8,14 =40=40 module Gitaly > - module RefTransaction > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.RefTransaction' > - > -- rpc :VoteTransaction, Gitaly::VoteTransactionRequest, Gitaly::VoteTr= ansactionResponse > -- rpc :StopTransaction, Gitaly::StopTransactionRequest, Gitaly::StopTr= ansactionResponse > -+ rpc :VoteTransaction, ::Gitaly::VoteTransactionRequest, ::Gitaly::Vo= teTransactionResponse > -+ rpc :StopTransaction, ::Gitaly::StopTransactionRequest, ::Gitaly::St= opTransactionResponse > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > ---- ruby/proto/gitaly/wiki=5Fservices=5Fpb.rb.orig 2021-11-08 11:56:42= UTC > -+++ ruby/proto/gitaly/wiki=5Fservices=5Fpb.rb > -=40=40 -8,18 +8,18 =40=40 module Gitaly > - module WikiService > - class Service > - > -- include GRPC::GenericService > -+ include ::GRPC::GenericService > - > - self.marshal=5Fclass=5Fmethod =3D :encode > - self.unmarshal=5Fclass=5Fmethod =3D :decode > - self.service=5Fname =3D 'gitaly.WikiService' > - > -- rpc :WikiWritePage, stream(Gitaly::WikiWritePageRequest), Gitaly::Wi= kiWritePageResponse > -- rpc :WikiUpdatePage, stream(Gitaly::WikiUpdatePageRequest), Gitaly::= WikiUpdatePageResponse > -+ rpc :WikiWritePage, stream(::Gitaly::WikiWritePageRequest), ::Gitaly= ::WikiWritePageResponse > -+ rpc :WikiUpdatePage, stream(::Gitaly::WikiUpdatePageRequest), ::Gita= ly::WikiUpdatePageResponse > - =23 Wiki=46indPage returns a stream because the page's raw=5Fdata fie= ld may be arbitrarily large. > -- rpc :Wiki=46indPage, Gitaly::Wiki=46indPageRequest, stream(Gitaly::W= iki=46indPageResponse) > -- rpc :WikiGetAllPages, Gitaly::WikiGetAllPagesRequest, stream(Gitaly:= :WikiGetAllPagesResponse) > -- rpc :WikiListPages, Gitaly::WikiListPagesRequest, stream(Gitaly::Wik= iListPagesResponse) > -+ rpc :Wiki=46indPage, ::Gitaly::Wiki=46indPageRequest, stream(::Gital= y::Wiki=46indPageResponse) > -+ rpc :WikiGetAllPages, ::Gitaly::WikiGetAllPagesRequest, stream(::Git= aly::WikiGetAllPagesResponse) > -+ rpc :WikiListPages, ::Gitaly::WikiListPagesRequest, stream(::Gitaly:= :WikiListPagesResponse) > - end > - > - Stub =3D Service.rpc=5Fstub=5Fclass > diff --git a/devel/gitaly/files/patch-ruby=5FGemfile b/devel/gitaly/fil= es/patch-ruby=5FGemfile > index 231c2569c123..46224f7de0fa 100644 > --- a/devel/gitaly/files/patch-ruby=5FGemfile > +++ b/devel/gitaly/files/patch-ruby=5FGemfile > =40=40 -1,4 +1,4 =40=40 > ---- ruby/Gemfile.orig 2021-10-21 21:58:10 UTC > +--- ruby/Gemfile.orig 2021-11-08 11:56:42 UTC > +++ ruby/Gemfile > =40=40 -19,15 +19,5 =40=40 gem 'gitlab-labkit', '=7E> 0.21.1' > =23 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 > =40=40 -0,0 +1,58 =40=40 > +=23 Created by: vanilla=40 > + > +PORTNAME=3D grpc > +PORTVERSION=3D 1.30.2 > +DISTVERSIONPRE=46IX=3D v > +CATEGORIES=3D devel > +PKGNAMESU=46=46IX=3D 130 > + > +MAINTAINER=3D mfechner=40=46reeBSD.org > +COMMENT=3D HTTP/2-based RPC framework > + > +LICENSE=3D BSD3CLAUSE > +LICENSE=5F=46ILE=3D =24=7BWRKSRC=7D/LICENSE > + > +LIB=5FDEPENDS=3D libabsl=5Fbase.so:devel/abseil =5C > + libbenchmark.so:devel/benchmark =5C > + libcares.so:dns/c-ares =5C > + libgflags.so:devel/gflags =5C > + libprotobuf.so:devel/protobuf =5C > + libre2.so:devel/re2 > + > +USES=3D cmake compiler:c++17-lang cpe localbase:ldflags pkgconfig ssl > + > +USE=5FGITHUB=3D yes > + > +CMAKE=5FARGS=3D -DCMAKE=5FCXX=5FSTANDARD=3D17 =5C > + -DgRPC=5FABSL=5FPROVIDER=3Dpackage =5C > + -DgRPC=5FBENCHMARK=5FPROVIDER=3Dpackage =5C > + -DgRPC=5FCARES=5FPROVIDER=3Dpackage =5C > + -DgRPC=5FG=46LAGS=5FPROVIDER=3Dpackage =5C > + -DgRPC=5FPROTOBU=46=5FPROVIDER=3Dpackage =5C > + -DgRPC=5FRE2=5FPROVIDER=3Dpackage =5C > + -DgRPC=5FSSL=5FPROVIDER=3Dpackage =5C > + -DgRPC=5FZLIB=5FPROVIDER=3Dpackage > +CMAKE=5FON=3D BUILD=5FSHARED=5FLIBS > +USE=5FLDCON=46IG=3D yes > +STRIP=3D > + > +PLIST=5FSUB=3D PORTVERSION=3D=24=7BPORTVERSION=7D > + > +.include <bsd.port.pre.mk> > + > +=23 Remove openssl from grpc.pc because we do not ship openssl.pc in b= ase system > +.if =24=7BSSL=5FDE=46AULT=7D =3D=3D base > +EXTRA=5FPATCHES+=3D =24=7BPATCHDIR=7D/extra-patch-CMakeLists.txt > +.endif > + > +post-patch: > +=23 Clean up bundled libraries > + =40=24=7BRM=7D -r =24=7BWRKSRC=7D/third=5Fparty/abseil-cpp/ > + =40=24=7BRM=7D -r =24=7BWRKSRC=7D/third=5Fparty/benchmark/ > + =40=24=7BRM=7D -r =24=7BWRKSRC=7D/third=5Fparty/boringssl-with-bazel/= > + =40=24=7BRM=7D -r =24=7BWRKSRC=7D/third=5Fparty/cares/ > + =40=24=7BRM=7D -r =24=7BWRKSRC=7D/third=5Fparty/protobuf/ > + =40=24=7BRM=7D -r =24=7BWRKSRC=7D/third=5Fparty/re2/ > + =40=24=7BRM=7D -r =24=7BWRKSRC=7D/third=5Fparty/zlib/ > + > +.include <bsd.port.post.mk> > diff --git a/devel/grpc130/distinfo b/devel/grpc130/distinfo > new file mode 100644 > index 000000000000..e22ab8d698ba > --- /dev/null > +++ b/devel/grpc130/distinfo > =40=40 -0,0 +1,3 =40=40 > +TIMESTAMP =3D 1637134735 > +SHA256 (grpc-grpc-v1.30.2=5FGH0.tar.gz) =3D ba74b97a2f1b4e22ec5fb69d63= 9d849d2069fb58ea7d6579a31f800af6fe3b6c > +SIZE (grpc-grpc-v1.30.2=5FGH0.tar.gz) =3D 6978015 > diff --git a/devel/grpc130/files/extra-patch-CMakeLists.txt b/devel/grp= c130/files/extra-patch-CMakeLists.txt > new file mode 100644 > index 000000000000..794b40b630cb > --- /dev/null > +++ b/devel/grpc130/files/extra-patch-CMakeLists.txt > =40=40 -0,0 +1,11 =40=40 > +--- CMakeLists.txt.orig 2021-09-25 02:33:41 UTC > ++++ CMakeLists.txt > +=40=40 -17664,7 +17664,7 =40=40 generate=5Fpkgconfig( > + =22gRPC=22 > + =22high performance general RPC framework=22 > + =22=24=7BgRPC=5FCORE=5FVERSION=7D=22 > +- =22gpr openssl absl=5Fbase absl=5Fbind=5Ffront absl=5Fcord absl=5Fco= re=5Fheaders absl=5Fflat=5Fhash=5Fmap absl=5Finlined=5Fvector absl=5Fmemo= ry absl=5Foptional absl=5Fstatus absl=5Fstatusor absl=5Fstr=5Fformat absl= =5Fstrings absl=5Fsynchronization absl=5Ftime absl=5Fvariant=22 > ++ =22gpr absl=5Fbase absl=5Fbind=5Ffront absl=5Fcord absl=5Fcore=5Fhea= ders absl=5Fflat=5Fhash=5Fmap absl=5Finlined=5Fvector absl=5Fmemory absl=5F= optional absl=5Fstatus absl=5Fstatusor absl=5Fstr=5Fformat absl=5Fstrings= absl=5Fsynchronization absl=5Ftime absl=5Fvariant=22 > + =22-lgrpc -laddress=5Fsorting -lre2 -lupb -lcares -lz=22 > + =22=22 > + =22grpc.pc=22) > diff --git a/devel/grpc130/files/patch-src=5Fcore=5Flib=5Fsecurity=5Fcr= edentials=5Fjwt=5Fjwt=5F=5Fverifier.cc b/devel/grpc130/files/patch-src=5F= core=5Flib=5Fsecurity=5Fcredentials=5Fjwt=5Fjwt=5F=5Fverifier.cc > new file mode 100644 > index 000000000000..d68a3c9ce37f > --- /dev/null > +++ b/devel/grpc130/files/patch-src=5Fcore=5Flib=5Fsecurity=5Fcredentia= ls=5Fjwt=5Fjwt=5F=5Fverifier.cc > =40=40 -0,0 +1,11 =40=40 > +--- src/core/lib/security/credentials/jwt/jwt=5Fverifier.cc.orig 2020-= 12-01 19:24:28 UTC > ++++ src/core/lib/security/credentials/jwt/jwt=5Fverifier.cc > +=40=40 -472,7 +472,7 =40=40 static BIGNUM* bignum=5Ffrom=5Fbase64(cons= t char* b64) =7B > + return result; > + =7D > + > +-=23if OPENSSL=5FVERSION=5FNUMBER < 0x10100000L > ++=23if OPENSSL=5FVERSION=5FNUMBER < 0x10100000L =7C=7C (defined(LIBRES= SL=5FVERSION=5FNUMBER) && LIBRESSL=5FVERSION=5FNUMBER < 0x20700000L) > *** 535 LINES SKIPPED *** --61984635_327b23c6_69d8-- --61984636_643c9869_69d8 Content-Type: application/pgp-signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: Canary PGP V3 iQJVBAABCgA/OBxEaW1hIFBhbm92IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxm bHVmZnlARnJlZUJTRC5PUkc+BQJhmEY1AAoJEPuLoJ3VOY8pDMIP/2uUWmUw68R5 qwTpL7xoElYN61S0FT5ff12qCIVaKOMtJsLCWgtxQkVWwyvxeG2yd9XovhtaMG4Z FoP1nYJ5nmvCkY/yCv2Y9sIaLvBPWpqgZed05cT2EnGF8S6HRiuUJAfr0TUYEBdZ TOwP6NFC6vZcWUrtgByBjKTWAtRZvSvAomM/pY4YaymplKTejTHEQIfkHlYWgzGM Er1U8bIh1lND5uAh4larXsTZNzZjs4O/gGKgYHb/8nfjCSlLpb38WvKREc3XI01W peq5PAoYDvPVzIA4wSUEajH7ktA1pup6o+TwrRTsTJrfD51g8T30LbJMAQ3+Vjl0 5MFQXgla0aeIuYMa7Q3fiW4tPwVP2cglCIc6H+Nlix8JDhoSzSWlHV+9pkUxBcfS EFhgJSSvFf2rPOjgoTS0woMZ7/VZ0pMg7km7+pXQv+a3R1PHSPI89DvcZiZqxqVI tZkTaTF9fSdbv9Rexg3/KvdTYJ4y8cupLCKDIEWwpTuX3G+V6ghoXM+gw+LcSDaP tkCvTxgzGhqcQCSyRK0rJkK2g8JPkOlV5z1fm6Fo/iiQ7vm3Igg+xISbtVjAJ5Kg nBRbfktRkI5oYWeG0QDHKVZPkmuHhSzWsktjTLGFiTtVOXG24juh8JT9q9rqFTpz 7pyu4uAWEC4woW4K6LDtaYKZt2F9oiFP =4opx -----END PGP SIGNATURE----- --61984636_643c9869_69d8--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?31de9806-664f-461c-9ffe-f1ab88898140>