From b6a759e5d6c7b09dd053c3319173edd8b6fdbb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 25 Dec 2020 11:23:55 +0100 Subject: [PATCH] Update to 1.34.0 Close: rhbz#1886969 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + golang-google-grpc.spec | 46 +++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 6f1f135..3f74f0c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /grpc-go-1.30.0.tar.gz /grpc-go-1.31.0.tar.gz /grpc-go-1.31.1.tar.gz +/grpc-go-1.34.0.tar.gz diff --git a/golang-google-grpc.spec b/golang-google-grpc.spec index 8ad1b4a..1ad5fa9 100644 --- a/golang-google-grpc.spec +++ b/golang-google-grpc.spec @@ -5,7 +5,7 @@ # https://github.com/grpc/grpc-go %global goipath google.golang.org/grpc %global forgeurl https://github.com/grpc/grpc-go -Version: 1.31.1 +Version: 1.34.0 %gometa @@ -34,31 +34,40 @@ URL: %{gourl} Source0: %{gosource} Source1: glide.yaml Source2: glide.lock -# Go 1.15: https://github.com/golang/go/issues/32479 -Patch0: 0001-Convert-int-to-string-using-rune.patch BuildRequires: golang(github.com/cncf/udpa/go/udpa/data/orca/v1) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/api/v2) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/api/v2/core) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint) -BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/api/v2/route) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/core/v3) -BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/listener/v3) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/route/v3) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/type) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/type/v3) BuildRequires: golang(github.com/golang/glog) -BuildRequires: golang(github.com/golang/mock/gomock) BuildRequires: golang(github.com/golang/protobuf/jsonpb) BuildRequires: golang(github.com/golang/protobuf/proto) BuildRequires: golang(github.com/golang/protobuf/protoc-gen-go/descriptor) BuildRequires: golang(github.com/golang/protobuf/ptypes) BuildRequires: golang(github.com/golang/protobuf/ptypes/any) BuildRequires: golang(github.com/golang/protobuf/ptypes/duration) -BuildRequires: golang(github.com/golang/protobuf/ptypes/struct) BuildRequires: golang(github.com/golang/protobuf/ptypes/timestamp) BuildRequires: golang(github.com/golang/protobuf/ptypes/wrappers) +BuildRequires: golang(github.com/google/cel-go/cel) +BuildRequires: golang(github.com/google/cel-go/checker/decls) +BuildRequires: golang(github.com/google/cel-go/common/types) +BuildRequires: golang(github.com/google/cel-go/interpreter) BuildRequires: golang(github.com/google/go-cmp/cmp) +BuildRequires: golang(github.com/google/uuid) BuildRequires: golang(golang.org/x/net/http2) BuildRequires: golang(golang.org/x/net/http2/hpack) BuildRequires: golang(golang.org/x/net/trace) @@ -67,16 +76,32 @@ BuildRequires: golang(golang.org/x/oauth2/google) BuildRequires: golang(golang.org/x/oauth2/jwt) BuildRequires: golang(golang.org/x/sys/unix) %if %{without bootstrap} +BuildRequires: golang(google.golang.org/genproto/googleapis/api/expr/v1alpha1) BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/code) BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/errdetails) BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status) +%endif BuildRequires: golang(google.golang.org/protobuf/compiler/protogen) +BuildRequires: golang(google.golang.org/protobuf/proto) +BuildRequires: golang(google.golang.org/protobuf/reflect/protoreflect) +BuildRequires: golang(google.golang.org/protobuf/runtime/protoiface) +BuildRequires: golang(google.golang.org/protobuf/runtime/protoimpl) BuildRequires: golang(google.golang.org/protobuf/types/descriptorpb) +BuildRequires: golang(google.golang.org/protobuf/types/known/anypb) +BuildRequires: golang(google.golang.org/protobuf/types/known/durationpb) +BuildRequires: golang(google.golang.org/protobuf/types/known/timestamppb) +BuildRequires: golang(google.golang.org/protobuf/types/known/wrapperspb) BuildRequires: golang(google.golang.org/protobuf/types/pluginpb) +%if %{without bootstrap} %if %{with check} # Tests +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/api/v2/route) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/listener/v2) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3) +BuildRequires: golang(github.com/golang/protobuf/ptypes/struct) +BuildRequires: golang(github.com/google/cel-go/common/types/ref) BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) %endif %endif @@ -88,7 +113,6 @@ BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) %prep %goprep -%patch0 -p1 cp %{S:1} %{S:2} . %install @@ -98,13 +122,17 @@ cp %{S:1} %{S:2} . %if %{with check} %check # balancer/grpclb: needs network -%gocheck -d balancer/grpclb -d credentials/alts +%gocheck -d balancer/grpclb -d credentials/alts -d security/advancedtls %endif %endif %gopkgfiles %changelog +* Wed Dec 23 09:07:13 CET 2020 Robert-André Mauchin - 1.34.0-1 +- Update to 1.34.0 +- Close: rhbz#1886969 + * Thu Sep 03 21:31:32 CEST 2020 Robert-André Mauchin - 1.31.1-1 - Update to 1.31.1 diff --git a/sources b/sources index 8669845..250143b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grpc-go-1.31.1.tar.gz) = 1f03ad1963dfddbe0521242ab07b5f080b65ff3ac605d04e1ac799ba44b768b9f129192fe0d21f0e107f0d1879db3c2add4de0246d6ce678f04cc3bbbc83fa25 +SHA512 (grpc-go-1.34.0.tar.gz) = 4e71741a97a575a0257bd4deb2b8f35c78f564c492c889a12c3ef8218e0aff33e881f85c05d25d48cefcf51990e4ef1a8861065a4847fe08044d468c5d9c6fa0