From 6ba9603bd24e2168ffef06e4b180aaf688c4dbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 3 Sep 2020 21:42:10 +0200 Subject: [PATCH] Update to 1.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 3 ++ 0001-Convert-int-to-string-using-rune.patch | 31 +++++++++++++++ golang-google-grpc.spec | 42 ++++++++++++++------- sources | 2 +- 4 files changed, 63 insertions(+), 15 deletions(-) create mode 100644 0001-Convert-int-to-string-using-rune.patch diff --git a/.gitignore b/.gitignore index 863bc0f..6f1f135 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /grpc-go-1.21.1.tar.gz /grpc-go-1.24.0.tar.gz +/grpc-go-1.30.0.tar.gz +/grpc-go-1.31.0.tar.gz +/grpc-go-1.31.1.tar.gz diff --git a/0001-Convert-int-to-string-using-rune.patch b/0001-Convert-int-to-string-using-rune.patch new file mode 100644 index 0000000..4e8ce25 --- /dev/null +++ b/0001-Convert-int-to-string-using-rune.patch @@ -0,0 +1,31 @@ +From 4ef7e90db5dbfb287dd3db7bf97e53f37e70f791 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Sun, 9 Aug 2020 18:48:59 +0200 +Subject: [PATCH] Convert int to string using rune() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See https://github.com/golang/go/issues/32479 + +Signed-off-by: Robert-André Mauchin +--- + internal/transport/http_util_test.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/internal/transport/http_util_test.go b/internal/transport/http_util_test.go +index 80b1c094..bcf70e42 100644 +--- a/internal/transport/http_util_test.go ++++ b/internal/transport/http_util_test.go +@@ -142,7 +142,7 @@ func (s) TestDecodeEncodeGrpcMessage(t *testing.T) { + } + } + +-const binaryValue = string(128) ++const binaryValue = string(rune(128)) + + func (s) TestEncodeMetadataHeader(t *testing.T) { + for _, test := range []struct { +-- +2.26.2 + diff --git a/golang-google-grpc.spec b/golang-google-grpc.spec index 12d1a52..8ad1b4a 100644 --- a/golang-google-grpc.spec +++ b/golang-google-grpc.spec @@ -5,20 +5,15 @@ # https://github.com/grpc/grpc-go %global goipath google.golang.org/grpc %global forgeurl https://github.com/grpc/grpc-go -Version: 1.24.0 +Version: 1.31.1 %gometa -# Remove in F33: -%global godevelheader %{expand: -Obsoletes: golang-github-grpc-grpc-go-devel < 1.18.0-3 -} - %global goipaths0 google.golang.org/grpc -%global goipathsex0 google.golang.org/grpc/status google.golang.org/grpc/test google.golang.org/grpc/internal/transport google.golang.org/grpc/xds/internal/proto/envoy/api/v2 +%global goipathsex0 google.golang.org/grpc/status google.golang.org/grpc/test google.golang.org/grpc/internal/transport %if %{without bootstrap} -%global goipaths1 google.golang.org/grpc/status google.golang.org/grpc/test google.golang.org/grpc/internal/transport google.golang.org/grpc/xds/internal/proto/envoy/api/v2 +%global goipaths1 google.golang.org/grpc/status google.golang.org/grpc/test google.golang.org/grpc/internal/transport %endif %global common_description %{expand: @@ -30,7 +25,7 @@ The Go language implementation of GRPC, http/2 based rpc.} %global gosupfiles glide.lock glide.yaml Name: %{goname} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Go language implementation of GRPC # Upstream license specification: Apache-2.0 @@ -39,19 +34,31 @@ 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/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/service/discovery/v2) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/type) 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/empty) 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(golang.org/x/net/context) +BuildRequires: golang(github.com/google/go-cmp/cmp) BuildRequires: golang(golang.org/x/net/http2) BuildRequires: golang(golang.org/x/net/http2/hpack) BuildRequires: golang(golang.org/x/net/trace) @@ -60,14 +67,17 @@ 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/annotations) +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) +BuildRequires: golang(google.golang.org/protobuf/compiler/protogen) +BuildRequires: golang(google.golang.org/protobuf/types/descriptorpb) +BuildRequires: golang(google.golang.org/protobuf/types/pluginpb) %if %{with check} # Tests -BuildRequires: golang(github.com/google/go-cmp/cmp) -BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/code) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/listener/v2) +BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) %endif %endif @@ -78,6 +88,7 @@ BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/code) %prep %goprep +%patch0 -p1 cp %{S:1} %{S:2} . %install @@ -94,6 +105,9 @@ cp %{S:1} %{S:2} . %gopkgfiles %changelog +* Thu Sep 03 21:31:32 CEST 2020 Robert-André Mauchin - 1.31.1-1 +- Update to 1.31.1 + * Sat Aug 01 2020 Fedora Release Engineering - 1.24.0-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2979a7a..8669845 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grpc-go-1.24.0.tar.gz) = 479dbb72eaaec6fd6e48006b9b2ae636b5fd08b1fe5aeeed18c40d794b1ee4d4fe473b3d2cc77fe5ceaa1ddd00221a64d940d8fb228612c9ed3c83c7d1b4c756 +SHA512 (grpc-go-1.31.1.tar.gz) = 1f03ad1963dfddbe0521242ab07b5f080b65ff3ac605d04e1ac799ba44b768b9f129192fe0d21f0e107f0d1879db3c2add4de0246d6ce678f04cc3bbbc83fa25