[etcd/f20] Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
by Jan Chaloupka
commit bfce6fcd55269508e6f39ea3a496d8fe6d078a6f
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Feb 20 12:08:11 2015 +0100
Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
.gitignore | 2 +-
etcd.spec | 26 ++++++++++++++++++--------
sources | 2 +-
3 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa3a1f..5f01d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/v2.0.1.tar.gz
+/v2.0.3.tar.gz
diff --git a/etcd.spec b/etcd.spec
index 180c907..21ce879 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,15 +1,17 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%global _dwz_low_mem_die_limit 0
+#%global _dwz_low_mem_die_limit 0
+%global debug_package %{nil}
%global provider github
%global provider_tld com
%global project coreos
%global repo etcd
+%global commit 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
Name: %{repo}
-Version: 2.0.1
-Release: 0.2%{?dist}
+Version: 2.0.3
+Release: 0.1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -102,10 +104,13 @@ ln -s ../../../ src/github.com/coreos/etcd
export GOPATH=$(pwd):%{gopath}:$GOPATH
# *** ERROR: No build ID note found in /.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
-function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
-gobuild -o bin/etcd %{import_path}
-gobuild -o bin/etcdctl %{import_path}/etcdctl
-gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+#function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
+#gobuild -o bin/etcd %{import_path}
+#gobuild -o bin/etcdctl %{import_path}/etcdctl
+#gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+go build -v -x -o bin/etcd %{import_path}
+go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -145,7 +150,7 @@ go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
go test %{import_path}/pkg/ioutil
-go test %{import_path}/pkg/transport
+#go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
go test %{import_path}/proxy
@@ -184,6 +189,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Feb 20 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.3-0.1
+- Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
+ remove debug info until 1196571 is resolved
+ related: #1191441
+
* Wed Feb 18 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.1-0.2
- Update configuration and service file
Fix depricated ErrWrongType after update of gogo/protobuf
diff --git a/sources b/sources
index 5c97401..68388d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c71e54f50553d6f7858e065f27d9578 v2.0.1.tar.gz
+074158742a7242b650988e5f70937362 v2.0.3.tar.gz
9 years, 3 months
[etcd/f20] Update configuration and service file - related: #1191441
by Jan Chaloupka
commit 647c7367e1ef5d1dca67b5129a4fd1f83056b494
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 18 15:40:23 2015 +0100
Update configuration and service file
- related: #1191441
...ricated-ErrWrongType-with-its-local-defin.patch | 693 +++++++++++++++++++++
etcd.conf | 68 +-
etcd.service | 2 +-
etcd.spec | 17 +-
4 files changed, 742 insertions(+), 38 deletions(-)
---
diff --git a/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch b/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
new file mode 100644
index 0000000..275e6ae
--- /dev/null
+++ b/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
@@ -0,0 +1,693 @@
+From 62d30d1b956bbc7f4249e3b42c6f8b3e5db26789 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup(a)redhat.com>
+Date: Fri, 20 Feb 2015 11:04:20 +0100
+Subject: [PATCH] Replace depricated ErrWrongType with its local definition
+
+---
+ etcdserver/etcdserverpb/etcdserver.pb.go | 39 ++++++++++---------
+ migrate/etcd4pb/log_entry.pb.go | 10 +++--
+ raft/raftpb/raft.pb.go | 64 ++++++++++++++++++--------------
+ snap/snappb/snap.pb.go | 6 ++-
+ wal/walpb/record.pb.go | 13 ++++---
+ 5 files changed, 75 insertions(+), 57 deletions(-)
+
+diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/etcdserver/etcdserverpb/etcdserver.pb.go
+index 2e8afc0..42eb0c2 100644
+--- a/etcdserver/etcdserverpb/etcdserver.pb.go
++++ b/etcdserver/etcdserverpb/etcdserver.pb.go
+@@ -22,6 +22,7 @@ import math "math"
+
+ import io "io"
+ import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
++import errors "errors"
+
+ // Reference proto, json, and math imports to suppress error if they are not otherwise used.
+ var _ = proto.Marshal
+@@ -67,6 +68,7 @@ func init() {
+ func (m *Request) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -85,7 +87,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -100,7 +102,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -122,7 +124,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 3:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -144,7 +146,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 4:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -166,7 +168,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 5:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -183,7 +185,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.Dir = bool(v != 0)
+ case 6:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -205,7 +207,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 7:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -220,7 +222,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ }
+ case 8:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -238,7 +240,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.PrevExist = &b
+ case 9:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -253,7 +255,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ }
+ case 10:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -270,7 +272,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.Wait = bool(v != 0)
+ case 11:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -285,7 +287,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ }
+ case 12:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -302,7 +304,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.Recursive = bool(v != 0)
+ case 13:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -319,7 +321,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.Sorted = bool(v != 0)
+ case 14:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -336,7 +338,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.Quorum = bool(v != 0)
+ case 15:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -351,7 +353,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ }
+ case 16:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -392,6 +394,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ func (m *Metadata) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -410,7 +413,7 @@ func (m *Metadata) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -425,7 +428,7 @@ func (m *Metadata) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+diff --git a/migrate/etcd4pb/log_entry.pb.go b/migrate/etcd4pb/log_entry.pb.go
+index c969241..0ccc80d 100644
+--- a/migrate/etcd4pb/log_entry.pb.go
++++ b/migrate/etcd4pb/log_entry.pb.go
+@@ -12,6 +12,7 @@ import math "math"
+
+ import io "io"
+ import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
++import errors "errors"
+
+ import fmt "fmt"
+ import strings "strings"
+@@ -76,6 +77,7 @@ func init() {
+ func (m *LogEntry) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -94,7 +96,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -111,7 +113,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
+ m.Index = &v
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -128,7 +130,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
+ m.Term = &v
+ case 3:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -151,7 +153,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
+ index = postIndex
+ case 4:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+diff --git a/raft/raftpb/raft.pb.go b/raft/raftpb/raft.pb.go
+index 88a08fd..ec40c14 100644
+--- a/raft/raftpb/raft.pb.go
++++ b/raft/raftpb/raft.pb.go
+@@ -27,6 +27,7 @@ import math "math"
+
+ import io "io"
+ import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
++import errors "errors"
+
+ // Reference proto, json, and math imports to suppress error if they are not otherwise used.
+ var _ = proto.Marshal
+@@ -251,6 +252,7 @@ func init() {
+ func (m *Entry) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -269,7 +271,7 @@ func (m *Entry) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -284,7 +286,7 @@ func (m *Entry) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -299,7 +301,7 @@ func (m *Entry) Unmarshal(data []byte) error {
+ }
+ case 3:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -314,7 +316,7 @@ func (m *Entry) Unmarshal(data []byte) error {
+ }
+ case 4:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+@@ -360,6 +362,7 @@ func (m *Entry) Unmarshal(data []byte) error {
+ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -378,7 +381,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+@@ -402,7 +405,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
+ index = postIndex
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -417,7 +420,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
+ }
+ case 3:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -456,6 +459,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
+ func (m *Snapshot) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -474,7 +478,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+@@ -496,7 +500,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
+ index = postIndex
+ case 2:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+@@ -544,6 +548,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
+ func (m *Message) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -562,7 +567,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -577,7 +582,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -592,7 +597,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ }
+ case 3:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -607,7 +612,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ }
+ case 4:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -622,7 +627,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ }
+ case 5:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -637,7 +642,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ }
+ case 6:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -652,7 +657,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ }
+ case 7:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+@@ -675,7 +680,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ index = postIndex
+ case 8:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -690,7 +695,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ }
+ case 9:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+@@ -714,7 +719,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ index = postIndex
+ case 10:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -731,7 +736,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ m.Reject = bool(v != 0)
+ case 11:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -770,6 +775,7 @@ func (m *Message) Unmarshal(data []byte) error {
+ func (m *HardState) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -788,7 +794,7 @@ func (m *HardState) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -803,7 +809,7 @@ func (m *HardState) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -818,7 +824,7 @@ func (m *HardState) Unmarshal(data []byte) error {
+ }
+ case 3:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -857,6 +863,7 @@ func (m *HardState) Unmarshal(data []byte) error {
+ func (m *ConfState) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -875,7 +882,7 @@ func (m *ConfState) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -916,6 +923,7 @@ func (m *ConfState) Unmarshal(data []byte) error {
+ func (m *ConfChange) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -934,7 +942,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -949,7 +957,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -964,7 +972,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
+ }
+ case 3:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -979,7 +987,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
+ }
+ case 4:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+diff --git a/snap/snappb/snap.pb.go b/snap/snappb/snap.pb.go
+index 1bc8927..8a5b7d2 100644
+--- a/snap/snappb/snap.pb.go
++++ b/snap/snappb/snap.pb.go
+@@ -21,6 +21,7 @@ import math "math"
+
+ import io "io"
+ import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
++import errors "errors"
+
+ // Reference proto, json, and math imports to suppress error if they are not otherwise used.
+ var _ = proto.Marshal
+@@ -42,6 +43,7 @@ func init() {
+ func (m *Snapshot) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -60,7 +62,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -75,7 +77,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+diff --git a/wal/walpb/record.pb.go b/wal/walpb/record.pb.go
+index e556f51..2877b6e 100644
+--- a/wal/walpb/record.pb.go
++++ b/wal/walpb/record.pb.go
+@@ -22,6 +22,7 @@ import math "math"
+
+ import io "io"
+ import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
++import errors "errors"
+
+ // Reference proto, json, and math imports to suppress error if they are not otherwise used.
+ var _ = proto.Marshal
+@@ -54,6 +55,7 @@ func init() {
+ func (m *Record) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -72,7 +74,7 @@ func (m *Record) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -87,7 +89,7 @@ func (m *Record) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -102,7 +104,7 @@ func (m *Record) Unmarshal(data []byte) error {
+ }
+ case 3:
+ if wireType != 2 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+@@ -148,6 +150,7 @@ func (m *Record) Unmarshal(data []byte) error {
+ func (m *Snapshot) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
+ for index < l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -166,7 +169,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+@@ -181,7 +184,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 0 {
+- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index >= l {
+--
+1.9.3
+
diff --git a/etcd.conf b/etcd.conf
index 4d5d50e..37a53ea 100644
--- a/etcd.conf
+++ b/etcd.conf
@@ -1,34 +1,34 @@
-# This configuration file is written in [TOML](https://github.com/mojombo/toml)
-
-# addr = "127.0.0.1:4001"
-# bind_addr = "127.0.0.1:4001"
-# ca_file = ""
-# cert_file = ""
-# cors = []
-# cpu_profile_file = ""
-data_dir = "/var/lib/etcd/default.etcd"
-# discovery = "http://etcd.local:4001/v2/keys/_etcd/registry/examplecluster"
-# http_read_timeout = 10
-# http_write_timeout = 10
-# key_file = ""
-# peers = []
-# peers_file = ""
-# max_cluster_size = 9
-# max_result_buffer = 1024
-# max_retry_attempts = 3
-name = "default"
-# snapshot = false
-# verbose = false
-# very_verbose = false
-
-# [peer]
-# addr = "127.0.0.1:7001"
-# bind_addr = "127.0.0.1:7001"
-# ca_file = ""
-# cert_file = ""
-# key_file = ""
-
-# [cluster]
-# active_size = 9
-# remove_delay = 1800.0
-# sync_interval = 5.0
+# [member]
+ETCD_NAME=default
+ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
+#ETCD_SNAPSHOT_COUNTER="10000"
+#ETCD_HEARTBEAT_INTERVAL="100"
+#ETCD_ELECTION_TIMEOUT="1000"
+#ETCD_LISTEN_PEER_URLS="http://localhost:2380,http://localhost:7001"
+#ETCD_LISTEN_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
+#ETCD_MAX_SNAPSHOTS="5"
+#ETCD_MAX_WALS="5"
+#ETCD_CORS=""
+#
+#[cluster]
+#ETCD_INITIAL_ADVERTISE_PEER_URLS="http://localhost:2380,http://localhost:7001"
+# if you use different ETCD_NAME (e.g. test), set ETCD_INITIAL_CLUSTER value for this name, i.e. "test=http://..."
+#ETCD_INITIAL_CLUSTER="default=http://localhost:2380,default=http://localhost:7001"
+#ETCD_INITIAL_CLUSTER_STATE="new"
+#ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster"
+#ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
+#ETCD_DISCOVERY=""
+#ETCD_DISCOVERY_SRV=""
+#ETCD_DISCOVERY_FALLBACK="proxy"
+#ETCD_DISCOVERY_PROXY=""
+#
+#[proxy]
+#ETCD_PROXY="off"
+#
+#[security]
+#ETCD_CA_FILE=""
+#ETCD_CERT_FILE=""
+#ETCD_KEY_FILE=""
+#ETCD_PEER_CA_FILE=""
+#ETCD_PEER_CERT_FILE=""
+#ETCD_PEER_KEY_FILE=""
diff --git a/etcd.service b/etcd.service
index 85c5953..55c1bba 100644
--- a/etcd.service
+++ b/etcd.service
@@ -6,7 +6,7 @@ After=network.target
Type=simple
# etc logs to the journal directly, suppress double logging
StandardOutput=null
-WorkingDirectory=/var/lib/etcd/`$hostname`.etcd
+EnvironmentFile=-/etc/etcd/etcd.conf
User=etcd
ExecStart=/usr/bin/etcd
diff --git a/etcd.spec b/etcd.spec
index 5040198..180c907 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -9,16 +9,19 @@
Name: %{repo}
Version: 2.0.1
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
+
+Patch0: etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
+
ExclusiveArch: %{ix86} x86_64 %{arm}
BuildRequires: golang >= 1.3.3
-BuildRequires: golang(code.google.com/p/gogoprotobuf)
+BuildRequires: golang(code.google.com/p/gogoprotobuf/proto)
BuildRequires: golang(github.com/codegangsta/cli)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(golang.org/x/net/context)
@@ -35,7 +38,7 @@ A highly-available key value store for shared configuration.
%package devel
BuildRequires: golang >= 1.2.1-3
-BuildRequires: golang(code.google.com/p/gogoprotobuf)
+BuildRequires: golang(code.google.com/p/gogoprotobuf/proto)
BuildRequires: golang(github.com/codegangsta/cli)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(golang.org/x/net/context)
@@ -90,6 +93,8 @@ find . -name "*.go" \
-print |\
xargs sed -i 's/github.com\/coreos\/etcd\/Godeps\/_workspace\/src\///g'
+%patch0 -p1
+
%build
# Make link for etcd itself
mkdir -p src/github.com/coreos
@@ -111,6 +116,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
+
# And create /var/lib/etcd
install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
@@ -178,6 +184,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Wed Feb 18 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.1-0.2
+- Update configuration and service file
+ Fix depricated ErrWrongType after update of gogo/protobuf
+ related: #1191441
+
* Wed Feb 11 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.1-0.1
- Update to 2.0.1
resolves: #1191441
9 years, 3 months
[etcd/f20] Update to 2.0.1 - resolves: #1191441
by Jan Chaloupka
commit 68d7c9c33ea939a98399b1786cd4f374d6b5d479
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 11 13:00:46 2015 +0100
Update to 2.0.1
- resolves: #1191441
.gitignore | 2 +-
etcd.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06bc6b5..eaa3a1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/v2.0.0.tar.gz
+/v2.0.1.tar.gz
diff --git a/etcd.spec b/etcd.spec
index e8858f8..5040198 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,8 +8,8 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
Name: %{repo}
-Version: 2.0.0
-Release: 0.5%{?dist}
+Version: 2.0.1
+Release: 0.1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -178,6 +178,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Wed Feb 11 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.1-0.1
+- Update to 2.0.1
+ resolves: #1191441
+
* Mon Feb 09 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.5
- Add missing debug info to binaries (patch from Jan Kratochvil)
resolves: #1184257
diff --git a/sources b/sources
index c57d792..5c97401 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9da6b748a6582763f4f9dcb89cec60e v2.0.0.tar.gz
+4c71e54f50553d6f7858e065f27d9578 v2.0.1.tar.gz
9 years, 3 months
[etcd/f20] Add missing debug info to binaries (patch from Jan Kratochvil) - resolves: #1184257
by Jan Chaloupka
commit 6859cad2b33e00df90832a4d530b429280c81386
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 9 10:12:35 2015 +0100
Add missing debug info to binaries (patch from Jan Kratochvil)
- resolves: #1184257
etcd.spec | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/etcd.spec b/etcd.spec
index ae2ef6f..e8858f8 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,4 +1,5 @@
-%global debug_package %{nil}
+# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
+%global _dwz_low_mem_die_limit 0
%global provider github
%global provider_tld com
%global project coreos
@@ -8,13 +9,14 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
+ExclusiveArch: %{ix86} x86_64 %{arm}
BuildRequires: golang >= 1.3.3
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/codegangsta/cli)
@@ -94,9 +96,11 @@ mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
export GOPATH=$(pwd):%{gopath}:$GOPATH
-go build -v -x -o bin/etcd %{import_path}
-go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+# *** ERROR: No build ID note found in /.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
+function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
+gobuild -o bin/etcd %{import_path}
+gobuild -o bin/etcdctl %{import_path}/etcdctl
+gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -174,6 +178,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Mon Feb 09 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.5
+- Add missing debug info to binaries (patch from Jan Kratochvil)
+ resolves: #1184257
+
* Fri Jan 30 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.4
- Update to etcd-2.0.0
- use gopath as the last directory to search for source code
9 years, 3 months
[etcd/f20] Update to etcd-2.0.0 - related: #1176138
by Jan Chaloupka
commit 6cafb68943e45a26e26b46082cf8ed7da2b4a9e1
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jan 30 15:42:04 2015 +0100
Update to etcd-2.0.0
- related: #1176138
.gitignore | 3 +--
etcd.spec | 21 +++++++++++++--------
sources | 2 +-
3 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80bc215..06bc6b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/etcd-0.4.6.tar.gz
-/v2.0.0-rc.1.tar.gz
+/v2.0.0.tar.gz
diff --git a/etcd.spec b/etcd.spec
index e063fb3..ae2ef6f 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,11 +8,11 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.3.rc1%{?dist}
+Release: 0.4%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
-Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
+Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
BuildRequires: golang >= 1.3.3
@@ -80,7 +80,7 @@ golang development libraries for etcd, a highly-available key value store for
shared configuration.
%prep
-%setup -qn %{name}-%{version}-rc.1
+%setup -qn %{name}-%{version}
rm -rf Godeps/_workspace/src/github.com/{codegangsta,coreos,stretchr,jonboulle}
rm -rf Godeps/_workspace/src/{code.google.com,bitbucket.org,golang.org}
@@ -93,10 +93,10 @@ find . -name "*.go" \
mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
-export GOPATH=%{gopath}:$(pwd):$(pwd)/Godeps/_workspace:$GOPATH
+export GOPATH=$(pwd):%{gopath}:$GOPATH
go build -v -x -o bin/etcd %{import_path}
go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/migrate/cmd/%{name}-migrate
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -121,20 +121,20 @@ do
done
%check
-export GOPATH=%{gopath}:%{buildroot}%{gopath}:$(pwd)/Godeps/_workspace
+export GOPATH=%{buildroot}%{gopath}:%{gopath}
go test %{import_path}/client
go test %{import_path}/discovery
go test %{import_path}/error
go test %{import_path}/etcdctl/command
go test %{import_path}/etcdmain
-go test %{import_path}/etcdserver
+#go test %{import_path}/etcdserver
#go test %{import_path}/etcdserver/etcdhttp
#go test %{import_path}/etcdserver/etcdhttp/httptypes
#go test %{import_path}/integration
go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
-go test %{import_path}/pkg/ioutils
+go test %{import_path}/pkg/ioutil
go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
@@ -174,6 +174,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Jan 30 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.4
+- Update to etcd-2.0.0
+- use gopath as the last directory to search for source code
+ related: #1176138
+
* Mon Jan 26 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.3.rc1
- default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit byt eparis)
related: #1176138
diff --git a/sources b/sources
index 316191f..c57d792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b34a42260e32e32913d137cd60ec80ca v2.0.0-rc.1.tar.gz
+c9da6b748a6582763f4f9dcb89cec60e v2.0.0.tar.gz
9 years, 3 months
[etcd/f20] default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit byt eparis) - related: #1
by Jan Chaloupka
commit 76b8f494d34ab91533ff800e7d28d9ac85a7c8f0
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Jan 26 13:53:26 2015 +0100
default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit byt eparis)
- related: #1176138
etcd.conf | 4 ++--
etcd.spec | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/etcd.conf b/etcd.conf
index 1b43f65..4d5d50e 100644
--- a/etcd.conf
+++ b/etcd.conf
@@ -6,7 +6,7 @@
# cert_file = ""
# cors = []
# cpu_profile_file = ""
-# data_dir = "."
+data_dir = "/var/lib/etcd/default.etcd"
# discovery = "http://etcd.local:4001/v2/keys/_etcd/registry/examplecluster"
# http_read_timeout = 10
# http_write_timeout = 10
@@ -16,7 +16,7 @@
# max_cluster_size = 9
# max_result_buffer = 1024
# max_retry_attempts = 3
-# name = "default-name"
+name = "default"
# snapshot = false
# verbose = false
# very_verbose = false
diff --git a/etcd.spec b/etcd.spec
index 30caad5..e063fb3 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,7 +8,7 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.2.rc1%{?dist}
+Release: 0.3.rc1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -104,7 +104,8 @@ install -D -p -m 0755 bin/%{name} %{buildroot}%{_bindir}/%{name}
install -D -p -m 0755 bin/%{name}ctl %{buildroot}%{_bindir}/%{name}ctl
install -D -p -m 0755 bin/%{name}-migrate %{buildroot}%{_bindir}/%{name}-migrate
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
+install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
# And create /var/lib/etcd
install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
@@ -173,6 +174,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Mon Jan 26 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.3.rc1
+- default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit byt eparis)
+ related: #1176138
+ fix /etc/etcd/etcd.conf path
+
* Tue Jan 20 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.2.rc1
- Update of BuildRequires/Requires, Provides and test
Add BuildRequire on jonboulle/clockwork
9 years, 3 months
[etcd/f20] Update of BuildRequires/Requires, Provides and test Add BuildRequire on jonboulle/clockwork - relate
by Jan Chaloupka
commit 2dedfd5c028f5932b68e3392f63df6251f631ccc
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Jan 20 14:33:18 2015 +0100
Update of BuildRequires/Requires, Provides and test
Add BuildRequire on jonboulle/clockwork
- related: #1176138
etcd.spec | 101 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 56 insertions(+), 45 deletions(-)
---
diff --git a/etcd.spec b/etcd.spec
index 87805e5..30caad5 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,7 +8,7 @@
Name: %{repo}
Version: 2.0.0
-Release: 1.rc1%{?dist}
+Release: 0.2.rc1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -16,17 +16,12 @@ Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
BuildRequires: golang >= 1.3.3
-BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
-BuildRequires: golang(github.com/BurntSushi/toml)
BuildRequires: golang(github.com/codegangsta/cli)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
-BuildRequires: golang(github.com/coreos/go-log/log)
-BuildRequires: golang(github.com/coreos/go-systemd)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(github.com/rcrowley/go-metrics)
BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(github.com/jonboulle/clockwork)
+BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: systemd
Requires(pre): shadow-utils
Requires(post): systemd
@@ -38,40 +33,46 @@ A highly-available key value store for shared configuration.
%package devel
BuildRequires: golang >= 1.2.1-3
-BuildRequires: golang(bitbucket.org/kardianos/osext)
-BuildRequires: golang(code.google.com/p/gogoprotobuf)
-BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/coreos/go-log/log)
-BuildRequires: golang(github.com/coreos/go-systemd)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(github.com/rcrowley/go-metrics)
+BuildRequires: golang(code.google.com/p/gogoprotobuf)
+BuildRequires: golang(github.com/codegangsta/cli)
+BuildRequires: golang(github.com/coreos/go-etcd/etcd)
+BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(github.com/jonboulle/clockwork)
BuildRequires: golang(github.com/stretchr/testify/assert)
Requires: golang >= 1.2.1-3
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/client) = %{version}-%{release}
-Provides: golang(%{import_path}/discovery) = %{version}-%{release}
-Provides: golang(%{import_path}/error) = %{version}-%{release}
-Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
-Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
-Provides: golang(%{import_path}/migrate) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/cors) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/crc) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/fileutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/flags) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/pbutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/testutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/transport) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/types) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/wait) = %{version}-%{release}
-Provides: golang(%{import_path}/proxy) = %{version}-%{release}
-Provides: golang(%{import_path}/raft) = %{version}-%{release}
-Provides: golang(%{import_path}/rafthttp) = %{version}-%{release}
-Provides: golang(%{import_path}/snap) = %{version}-%{release}
-Provides: golang(%{import_path}/store) = %{version}-%{release}
-Provides: golang(%{import_path}/wal) = %{version}-%{release}
-Summary: etcd golang devel libraries
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/client) = %{version}-%{release}
+Provides: golang(%{import_path}/discovery) = %{version}-%{release}
+Provides: golang(%{import_path}/error) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdctl) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdctl/command) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/etcdhttp) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/etcdhttp/httptypes) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/etcdserverpb) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/stats) = %{version}-%{release}
+Provides: golang(%{import_path}/migrate) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cors) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/crc) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/fileutil) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/flags) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/pbutil) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/testutil) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/transport) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/types) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/wait) = %{version}-%{release}
+Provides: golang(%{import_path}/proxy) = %{version}-%{release}
+Provides: golang(%{import_path}/raft) = %{version}-%{release}
+Provides: golang(%{import_path}/raft/raftpb) = %{version}-%{release}
+Provides: golang(%{import_path}/rafthttp) = %{version}-%{release}
+Provides: golang(%{import_path}/snap) = %{version}-%{release}
+Provides: golang(%{import_path}/snap/snappb) = %{version}-%{release}
+Provides: golang(%{import_path}/store) = %{version}-%{release}
+Provides: golang(%{import_path}/wal) = %{version}-%{release}
+Provides: golang(%{import_path}/wal/walpb) = %{version}-%{release}
+Summary: etcd golang devel libraries
ExclusiveArch: %{ix86} x86_64 %{arm}
%description devel
@@ -80,8 +81,8 @@ shared configuration.
%prep
%setup -qn %{name}-%{version}-rc.1
-rm -rf Godeps/_workspace/src/github.com/{codegangsta,coreos,stretchr}
-rm -rf Godeps/_workspace/src/{code.google.com,bitbucket.org}
+rm -rf Godeps/_workspace/src/github.com/{codegangsta,coreos,stretchr,jonboulle}
+rm -rf Godeps/_workspace/src/{code.google.com,bitbucket.org,golang.org}
find . -name "*.go" \
-print |\
@@ -112,7 +113,8 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
install -d %{buildroot}/%{gopath}/src/%{import_path}
cp -pav main.go %{buildroot}/%{gopath}/src/%{import_path}/
for dir in client discovery error etcdctl etcdmain etcdserver \
- migrate pkg proxy raft rafthttp snap store version wal
+ migrate pkg proxy raft rafthttp snap store version wal \
+ integration
do
cp -rpav ${dir} %{buildroot}/%{gopath}/src/%{import_path}/
done
@@ -122,8 +124,12 @@ export GOPATH=%{gopath}:%{buildroot}%{gopath}:$(pwd)/Godeps/_workspace
go test %{import_path}/client
go test %{import_path}/discovery
go test %{import_path}/error
+go test %{import_path}/etcdctl/command
go test %{import_path}/etcdmain
go test %{import_path}/etcdserver
+#go test %{import_path}/etcdserver/etcdhttp
+#go test %{import_path}/etcdserver/etcdhttp/httptypes
+#go test %{import_path}/integration
go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
@@ -135,7 +141,7 @@ go test %{import_path}/proxy
go test %{import_path}/raft
go test %{import_path}/rafthttp
go test %{import_path}/snap
-go test %{import_path}/store
+#go test %{import_path}/store
go test %{import_path}/wal
%pre
@@ -167,7 +173,12 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
-* Tue Dec 23 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 2.0.0-1.rc1
+* Tue Jan 20 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.2.rc1
+- Update of BuildRequires/Requires, Provides and test
+ Add BuildRequire on jonboulle/clockwork
+ related: #1176138
+
+* Tue Dec 23 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 2.0.0-0.1.rc1
- Resolves: rhbz#1176138 - update to v2.0.0-rc1
- do not redefine gopath
- use jonboulle/clockwork from within Godeps
9 years, 3 months
[etcd/f20] rhbz#1176138 - update to v2.0.0-rc.1
by Jan Chaloupka
commit 17eda4cff5374617a07fd1c12e506ae11bab533f
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Jan 2 07:52:53 2015 +0000
rhbz#1176138 - update to v2.0.0-rc.1
NVR: etcd-2.0.0-1.rc1 (not built in koji yet)
This commit doesn't solve resolve rhbz#1176138 completely, as the package
update isn't quite working as expected. More work is needed on this.
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
.gitignore | 1 +
0001-De-bundle-third_party.patch | 1405 --------------------------------------
etcd.service | 2 +-
etcd.spec | 173 +++--
sources | 2 +-
5 files changed, 111 insertions(+), 1472 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e194d9d..80bc215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/etcd-0.4.6.tar.gz
+/v2.0.0-rc.1.tar.gz
diff --git a/etcd.service b/etcd.service
index fd5733c..85c5953 100644
--- a/etcd.service
+++ b/etcd.service
@@ -6,7 +6,7 @@ After=network.target
Type=simple
# etc logs to the journal directly, suppress double logging
StandardOutput=null
-WorkingDirectory=/var/lib/etcd
+WorkingDirectory=/var/lib/etcd/`$hostname`.etcd
User=etcd
ExecStart=/usr/bin/etcd
diff --git a/etcd.spec b/etcd.spec
index 77be769..87805e5 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,30 +1,33 @@
-%global debug_package %{nil}
-%global import_path github.com/coreos/etcd
-%global gopath %{_datadir}/gocode
+%global debug_package %{nil}
+%global provider github
+%global provider_tld com
+%global project coreos
+%global repo etcd
-Name: etcd
-Version: 0.4.6
-Release: 7%{?dist}
-Summary: A highly-available key value store for shared configuration
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+Name: %{repo}
+Version: 2.0.0
+Release: 1.rc1%{?dist}
+Summary: A highly-available key value store for shared configuration
License: ASL 2.0
-URL: https://github.com/coreos/etcd/
-Source0: https://github.com/coreos/%{name}/archive/v%{version}/%{name}-%{version}....
-Source1: etcd.service
-Source2: etcd.conf
-Patch0: 0001-De-bundle-third_party.patch
-
-BuildRequires: golang
+URL: https://%{import_path}
+Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
+Source1: %{name}.service
+Source2: %{name}.conf
+BuildRequires: golang >= 1.3.3
+BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(bitbucket.org/kardianos/osext)
+BuildRequires: golang(github.com/codegangsta/cli)
+BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(github.com/coreos/go-log/log)
BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/gorilla/mux)
+BuildRequires: golang(github.com/mreiferson/go-httpclient)
BuildRequires: golang(github.com/rcrowley/go-metrics)
+BuildRequires: golang(golang.org/x/net/context)
BuildRequires: systemd
-
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
@@ -34,18 +37,41 @@ Requires(postun): systemd
A highly-available key value store for shared configuration.
%package devel
-BuildRequires: golang
+BuildRequires: golang >= 1.2.1-3
+BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(github.com/coreos/go-log/log)
BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/gorilla/mux)
+BuildRequires: golang(github.com/mreiferson/go-httpclient)
BuildRequires: golang(github.com/rcrowley/go-metrics)
-Requires: golang
-Summary: etcd golang devel libraries
-Provides: golang(%{import_path}) = %{version}-%{release}
+BuildRequires: golang(github.com/stretchr/testify/assert)
+Requires: golang >= 1.2.1-3
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/client) = %{version}-%{release}
+Provides: golang(%{import_path}/discovery) = %{version}-%{release}
+Provides: golang(%{import_path}/error) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
+Provides: golang(%{import_path}/migrate) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cors) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/crc) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/fileutil) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/flags) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/pbutil) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/testutil) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/transport) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/types) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/wait) = %{version}-%{release}
+Provides: golang(%{import_path}/proxy) = %{version}-%{release}
+Provides: golang(%{import_path}/raft) = %{version}-%{release}
+Provides: golang(%{import_path}/rafthttp) = %{version}-%{release}
+Provides: golang(%{import_path}/snap) = %{version}-%{release}
+Provides: golang(%{import_path}/store) = %{version}-%{release}
+Provides: golang(%{import_path}/wal) = %{version}-%{release}
+Summary: etcd golang devel libraries
ExclusiveArch: %{ix86} x86_64 %{arm}
%description devel
@@ -53,59 +79,70 @@ golang development libraries for etcd, a highly-available key value store for
shared configuration.
%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-echo "package main
-const releaseVersion = \"%{version}\"" > release_version.go
-
-# etcd has its own fork of the client API
-mkdir tmp
-mv third_party/github.com/coreos/go-etcd tmp
-# And a raft fork: https://bugzilla.redhat.com/show_bug.cgi?id=1047194#c12
-mv third_party/github.com/goraft tmp
-
-# Nuke everything else though
-rm -rf third_party
-
-# And restore the third party bits we're keeping
-mkdir -p third_party/github.com/coreos/
-mv tmp/go-etcd third_party/github.com/coreos/
-mv tmp/goraft third_party/github.com/
-rmdir tmp
+%setup -qn %{name}-%{version}-rc.1
+rm -rf Godeps/_workspace/src/github.com/{codegangsta,coreos,stretchr}
+rm -rf Godeps/_workspace/src/{code.google.com,bitbucket.org}
+
+find . -name "*.go" \
+ -print |\
+ xargs sed -i 's/github.com\/coreos\/etcd\/Godeps\/_workspace\/src\///g'
+%build
# Make link for etcd itself
mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
-%build
-GOPATH="${PWD}:%{_datadir}/gocode" go build -v -x -o etcd.bin
+export GOPATH=%{gopath}:$(pwd):$(pwd)/Godeps/_workspace:$GOPATH
+go build -v -x -o bin/etcd %{import_path}
+go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
+go build -v -x -o bin/etcd-migrate %{import_path}/migrate/cmd/%{name}-migrate
+
%install
-install -d -m 0755 %{buildroot}%{_sysconfdir}/etcd
-install -m 644 -t %{buildroot}%{_sysconfdir}/etcd %{SOURCE2}
-install -D -p -m 0755 etcd.bin %{buildroot}%{_bindir}/etcd
+install -D -p -m 0755 bin/%{name} %{buildroot}%{_bindir}/%{name}
+install -D -p -m 0755 bin/%{name}ctl %{buildroot}%{_bindir}/%{name}ctl
+install -D -p -m 0755 bin/%{name}-migrate %{buildroot}%{_bindir}/%{name}-migrate
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}
# And create /var/lib/etcd
-install -d -m 0755 %{buildroot}%{_localstatedir}/lib/etcd
+install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
# Install files for devel sub-package
install -d %{buildroot}/%{gopath}/src/%{import_path}
-cp -av main.go %{buildroot}/%{gopath}/src/%{import_path}/
-cp -av go_version.go %{buildroot}/%{gopath}/src/%{import_path}/
-for dir in bench config discovery Documentation error etcd fixtures http log \
- metrics mod pkg server store tests
+cp -pav main.go %{buildroot}/%{gopath}/src/%{import_path}/
+for dir in client discovery error etcdctl etcdmain etcdserver \
+ migrate pkg proxy raft rafthttp snap store version wal
do
- cp -av ${dir} %{buildroot}/%{gopath}/src/%{import_path}/
+ cp -rpav ${dir} %{buildroot}/%{gopath}/src/%{import_path}/
done
%check
-# empty for now
+export GOPATH=%{gopath}:%{buildroot}%{gopath}:$(pwd)/Godeps/_workspace
+go test %{import_path}/client
+go test %{import_path}/discovery
+go test %{import_path}/error
+go test %{import_path}/etcdmain
+go test %{import_path}/etcdserver
+go test %{import_path}/migrate
+#go test %{import_path}/pkg/fileutil
+go test %{import_path}/pkg/flags
+go test %{import_path}/pkg/ioutils
+go test %{import_path}/pkg/transport
+go test %{import_path}/pkg/types
+go test %{import_path}/pkg/wait
+go test %{import_path}/proxy
+go test %{import_path}/raft
+go test %{import_path}/rafthttp
+go test %{import_path}/snap
+go test %{import_path}/store
+go test %{import_path}/wal
%pre
-getent group etcd >/dev/null || groupadd -r etcd
-getent passwd etcd >/dev/null || useradd -r -g etcd -d %{_localstatedir}/lib/etcd \
- -s /sbin/nologin -c "etcd user" etcd
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/%{name} \
+ -s /sbin/nologin -c "etcd user" %{name}
+
%post
%systemd_post %{name}.service
@@ -116,19 +153,25 @@ getent passwd etcd >/dev/null || useradd -r -g etcd -d %{_localstatedir}/lib/etc
%systemd_postun %{name}.service
%files
-%config(noreplace) %{_sysconfdir}/etcd
-%{_bindir}/etcd
-%dir %attr(-,etcd,etcd) %{_localstatedir}/lib/etcd
+%config(noreplace) %{_sysconfdir}/%{name}
+%{_bindir}/%{name}
+%{_bindir}/%{name}ctl
+%{_bindir}/%{name}-migrate
+%dir %attr(-,%{name},%{name}) %{_sharedstatedir}/%{name}
%{_unitdir}/%{name}.service
%doc LICENSE README.md Documentation/internal-protocol-versioning.md
%files devel
%doc LICENSE README.md Documentation/internal-protocol-versioning.md
-%dir %attr(755,root,root) %{gopath}/src/github.com/coreos
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
-%{gopath}/src/%{import_path}/*
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%{gopath}/src/%{import_path}
%changelog
+* Tue Dec 23 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 2.0.0-1.rc1
+- Resolves: rhbz#1176138 - update to v2.0.0-rc1
+- do not redefine gopath
+- use jonboulle/clockwork from within Godeps
+
* Fri Oct 17 2014 jchaloup <jchaloup(a)redhat.com> - 0.4.6-7
- Add ExclusiveArch for go_arches
diff --git a/sources b/sources
index a7395ad..316191f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81d9d03bd3cab84b651689b6f7e570ea etcd-0.4.6.tar.gz
+b34a42260e32e32913d137cd60ec80ca v2.0.0-rc.1.tar.gz
9 years, 3 months
[etcd/f20] Add ExclusiveArch for go_arches
by Jan Chaloupka
commit d98da46285babacc224172309d22101d51dd415f
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Oct 17 13:26:12 2014 +0200
Add ExclusiveArch for go_arches
etcd.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/etcd.spec b/etcd.spec
index 197715b..77be769 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -4,7 +4,7 @@
Name: etcd
Version: 0.4.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
@@ -46,6 +46,7 @@ BuildRequires: golang(github.com/rcrowley/go-metrics)
Requires: golang
Summary: etcd golang devel libraries
Provides: golang(%{import_path}) = %{version}-%{release}
+ExclusiveArch: %{ix86} x86_64 %{arm}
%description devel
golang development libraries for etcd, a highly-available key value store for
@@ -128,6 +129,9 @@ getent passwd etcd >/dev/null || useradd -r -g etcd -d %{_localstatedir}/lib/etc
%{gopath}/src/%{import_path}/*
%changelog
+* Fri Oct 17 2014 jchaloup <jchaloup(a)redhat.com> - 0.4.6-7
+- Add ExclusiveArch for go_arches
+
* Mon Oct 06 2014 jchaloup <jchaloup(a)redhat.com> - 0.4.6-6
- related: #1047194
Remove dependency on go.net
9 years, 3 months
[etcd/f21] Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
by Jan Chaloupka
commit 95eddddab8ccd76f339f8a0a77b5a580ea202ce5
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Feb 20 12:08:11 2015 +0100
Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
.gitignore | 2 +-
etcd.spec | 26 ++++++++++++++++++--------
sources | 2 +-
3 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa3a1f..5f01d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/v2.0.1.tar.gz
+/v2.0.3.tar.gz
diff --git a/etcd.spec b/etcd.spec
index 69b35d1..4646a03 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,15 +1,17 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%global _dwz_low_mem_die_limit 0
+#%global _dwz_low_mem_die_limit 0
+%global debug_package %{nil}
%global provider github
%global provider_tld com
%global project coreos
%global repo etcd
+%global commit 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
Name: %{repo}
-Version: 2.0.1
-Release: 0.2%{?dist}
+Version: 2.0.3
+Release: 0.1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -103,10 +105,13 @@ ln -s ../../../ src/github.com/coreos/etcd
export GOPATH=$(pwd):%{gopath}:$GOPATH
# *** ERROR: No build ID note found in /.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
-function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
-gobuild -o bin/etcd %{import_path}
-gobuild -o bin/etcdctl %{import_path}/etcdctl
-gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+#function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
+#gobuild -o bin/etcd %{import_path}
+#gobuild -o bin/etcdctl %{import_path}/etcdctl
+#gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+go build -v -x -o bin/etcd %{import_path}
+go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -145,7 +150,7 @@ go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
go test %{import_path}/pkg/ioutil
-go test %{import_path}/pkg/transport
+#go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
go test %{import_path}/proxy
@@ -184,6 +189,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Feb 20 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.3-0.1
+- Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
+ remove debug info until 1196571 is resolved
+ related: #1191441
+
* Wed Feb 18 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.1-0.2
- Update configuration and service file
Fix depricated ErrWrongType after update of gogo/protobuf
diff --git a/sources b/sources
index 5c97401..68388d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c71e54f50553d6f7858e065f27d9578 v2.0.1.tar.gz
+074158742a7242b650988e5f70937362 v2.0.3.tar.gz
9 years, 3 months