From 4b3a6b1b9c38c9863077f60db19756376f35bdb6 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Sep 23 2017 09:16:27 +0000 Subject: Update to 3.2.5 - resolves: #1448611 --- diff --git a/.gitignore b/.gitignore index 34c4958..5feee54 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/etcd-0f4a535.tar.gz +/etcd-d0d1a87.tar.gz diff --git a/change-import-path.patch b/change-import-path.patch deleted file mode 100644 index 220bb36..0000000 --- a/change-import-path.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 71992717744ac018f5551289ca5bb2f0aafe477d Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Mon, 23 Jan 2017 12:54:00 +0100 -Subject: [PATCH] change import path - ---- - tools/benchmark/cmd/lease.go | 2 +- - tools/benchmark/cmd/put.go | 2 +- - tools/benchmark/cmd/range.go | 2 +- - tools/benchmark/cmd/root.go | 2 +- - tools/benchmark/cmd/stm.go | 2 +- - tools/benchmark/cmd/watch.go | 2 +- - tools/benchmark/cmd/watch_get.go | 2 +- - tools/benchmark/cmd/watch_latency.go | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go -index 4c21f9f..b057105 100644 ---- a/tools/benchmark/cmd/lease.go -+++ b/tools/benchmark/cmd/lease.go -@@ -23,7 +23,7 @@ import ( - - "github.com/spf13/cobra" - "golang.org/x/net/context" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - var leaseKeepaliveCmd = &cobra.Command{ -diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go -index 57d8564..6896af2 100644 ---- a/tools/benchmark/cmd/put.go -+++ b/tools/benchmark/cmd/put.go -@@ -28,7 +28,7 @@ import ( - "github.com/spf13/cobra" - "golang.org/x/net/context" - "golang.org/x/time/rate" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - // putCmd represents the put command -diff --git a/tools/benchmark/cmd/range.go b/tools/benchmark/cmd/range.go -index 1a83d22..cf1eb31 100644 ---- a/tools/benchmark/cmd/range.go -+++ b/tools/benchmark/cmd/range.go -@@ -26,7 +26,7 @@ import ( - "github.com/spf13/cobra" - "golang.org/x/net/context" - "golang.org/x/time/rate" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - // rangeCmd represents the range command -diff --git a/tools/benchmark/cmd/root.go b/tools/benchmark/cmd/root.go -index e37e87c..2659966 100644 ---- a/tools/benchmark/cmd/root.go -+++ b/tools/benchmark/cmd/root.go -@@ -21,7 +21,7 @@ import ( - "github.com/coreos/etcd/pkg/transport" - - "github.com/spf13/cobra" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - // This represents the base command when called without any subcommands -diff --git a/tools/benchmark/cmd/stm.go b/tools/benchmark/cmd/stm.go -index 7f98ed1..b816ad2 100644 ---- a/tools/benchmark/cmd/stm.go -+++ b/tools/benchmark/cmd/stm.go -@@ -27,7 +27,7 @@ import ( - - "github.com/spf13/cobra" - "golang.org/x/net/context" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - // stmCmd represents the STM benchmark command -diff --git a/tools/benchmark/cmd/watch.go b/tools/benchmark/cmd/watch.go -index b73e4f2..c60af37 100644 ---- a/tools/benchmark/cmd/watch.go -+++ b/tools/benchmark/cmd/watch.go -@@ -27,7 +27,7 @@ import ( - - "github.com/spf13/cobra" - "golang.org/x/net/context" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - // watchCmd represents the watch command -diff --git a/tools/benchmark/cmd/watch_get.go b/tools/benchmark/cmd/watch_get.go -index 3eb4a1b..1c0fd16 100644 ---- a/tools/benchmark/cmd/watch_get.go -+++ b/tools/benchmark/cmd/watch_get.go -@@ -24,7 +24,7 @@ import ( - - "github.com/spf13/cobra" - "golang.org/x/net/context" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - // watchGetCmd represents the watch command -diff --git a/tools/benchmark/cmd/watch_latency.go b/tools/benchmark/cmd/watch_latency.go -index 0f1f5db..a2cb806 100644 ---- a/tools/benchmark/cmd/watch_latency.go -+++ b/tools/benchmark/cmd/watch_latency.go -@@ -25,7 +25,7 @@ import ( - "github.com/spf13/cobra" - "golang.org/x/net/context" - "golang.org/x/time/rate" -- "gopkg.in/cheggaaa/pb.v1" -+ "github.com/cheggaaa/pb" - ) - - // watchLatencyCmd represents the watch latency command --- -2.7.4 - diff --git a/etcd.spec b/etcd.spec index 6339821..bbea3cf 100644 --- a/etcd.spec +++ b/etcd.spec @@ -31,20 +31,18 @@ # https://github.com/coreos/etcd %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 0f4a535c2fb7a2920e13e2e19b9eaf6b2e9285e5 +%global commit d0d1a87aa96ae14914751d42264262cb69eda170 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo} -Version: 3.1.9 -Release: 3%{?dist} +Version: 3.2.5 +Release: 1%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: %{name}.service Source2: %{name}.conf -Patch2: change-import-path.patch -Patch3: run-etcd-on-ppc64le-by-default.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x @@ -60,16 +58,17 @@ BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/daemon) BuildRequires: golang(github.com/coreos/go-systemd/util) BuildRequires: golang(github.com/coreos/pkg/capnslog) +BuildRequires: golang(github.com/dgrijalva/jwt-go) BuildRequires: golang(github.com/dustin/go-humanize) BuildRequires: golang(github.com/ghodss/yaml) BuildRequires: golang(github.com/gogo/protobuf/proto) +BuildRequires: golang(github.com/golang/groupcache/lru) BuildRequires: golang(github.com/golang/protobuf/proto) BuildRequires: golang(github.com/google/btree) BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus) BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/runtime) BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/utilities) BuildRequires: golang(github.com/jonboulle/clockwork) -BuildRequires: golang(github.com/karlseguin/ccache) BuildRequires: golang(github.com/kr/pty) BuildRequires: golang(github.com/olekukonko/tablewriter) BuildRequires: golang(github.com/prometheus/client_golang/prometheus) @@ -81,6 +80,7 @@ BuildRequires: golang(github.com/xiang90/probing) BuildRequires: golang(golang.org/x/crypto/bcrypt) BuildRequires: golang(golang.org/x/net/context) BuildRequires: golang(golang.org/x/net/http2) +BuildRequires: golang(golang.org/x/net/trace) BuildRequires: golang(golang.org/x/time/rate) BuildRequires: golang(google.golang.org/grpc) BuildRequires: golang(google.golang.org/grpc/codes) @@ -88,6 +88,7 @@ BuildRequires: golang(google.golang.org/grpc/credentials) BuildRequires: golang(google.golang.org/grpc/grpclog) BuildRequires: golang(google.golang.org/grpc/metadata) BuildRequires: golang(google.golang.org/grpc/naming) +BuildRequires: golang(google.golang.org/grpc/peer) BuildRequires: golang(google.golang.org/grpc/transport) %endif @@ -299,8 +300,7 @@ providing packages with %{import_path} prefix. mkdir -p Godeps/_workspace/src mv cmd/vendor/* Godeps/_workspace/src/. -%patch2 -p1 -%patch3 -p1 +sed -i 's/"gopkg\.in\/cheggaaa\/pb\.v1/"github\.com\/cheggaaa\/pb/g' $(find . -name '*.go') %build mkdir -p src/github.com/coreos @@ -437,6 +437,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog +* Tue Aug 15 2017 Jan Chaloupka - 3.2.5-1 +- Update to 3.2.5 + resolves: #1448611 + * Wed Aug 02 2017 Fedora Release Engineering - 3.1.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 002dcb2..759d174 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etcd-0f4a535.tar.gz) = e2d7fbe624789c52d842c54780c68732f4e46a660b686f63b3a986b036aecbf467f5f6c4c95a8e3fb96b077629caf09978b0eccea25f9f70cfcdb2a72604ba00 +SHA512 (etcd-d0d1a87.tar.gz) = c0219b089c2fae8c5a69543d211a033ff2c881b489005dedf0902f1b3145dd84f3b2d5c8273afbaf9d787f3e29cc49e0fe61c041b148d61b8ed672285f765e6a