From e2452957df30a1afdc78df22040807cf14a053f8 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jul 04 2019 16:18:15 +0000 Subject: Unused/deprecated --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 757d5ec..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/go-etcd-68b33a3.tar.gz -/go-etcd-2.0.0.tar.gz diff --git a/change-default-ports.patch b/change-default-ports.patch deleted file mode 100644 index 0d2341b..0000000 --- a/change-default-ports.patch +++ /dev/null @@ -1,96 +0,0 @@ -From b6b96f4ddea7a83603e46fd6d512c13e7be45b40 Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Tue, 27 Oct 2015 17:53:45 +0100 -Subject: [PATCH] change default ports - ---- - etcd/client.go | 2 +- - etcd/client_test.go | 8 ++++---- - etcd/cluster.go | 4 ++-- - etcd/member_test.go | 4 ++-- - 4 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/etcd/client.go b/etcd/client.go -index 60ed762..d0869e8 100644 ---- a/etcd/client.go -+++ b/etcd/client.go -@@ -95,7 +95,7 @@ func NewClient(machines []string) *Client { - func NewTLSClient(machines []string, cert, key, caCert string) (*Client, error) { - // overwrite the default machine to use https - if len(machines) == 0 { -- machines = []string{"https://127.0.0.1:4001"} -+ machines = []string{"https://127.0.0.1:2379"} - } - - config := Config{ -diff --git a/etcd/client_test.go b/etcd/client_test.go -index 4720d8d..052114e 100644 ---- a/etcd/client_test.go -+++ b/etcd/client_test.go -@@ -10,13 +10,13 @@ import ( - ) - - // To pass this test, we need to create a cluster of 3 machines --// The server should be listening on localhost:4001, 4002, 4003 -+// The server should be listening on localhost:2379, 4002, 4003 - func TestSync(t *testing.T) { -- fmt.Println("Make sure there are three nodes at 0.0.0.0:4001-4003") -+ fmt.Println("Make sure there are three nodes at 0.0.0.0:2379-4003") - - // Explicit trailing slash to ensure this doesn't reproduce: - // https://github.com/coreos/go-etcd/issues/82 -- c := NewClient([]string{"http://127.0.0.1:4001/"}) -+ c := NewClient([]string{"http://127.0.0.1:2379/"}) - - success := c.SyncCluster() - if !success { -@@ -96,7 +96,7 @@ func TestPersistence(t *testing.T) { - } - - func TestClientRetry(t *testing.T) { -- c := NewClient([]string{"http://strange", "http://127.0.0.1:4001"}) -+ c := NewClient([]string{"http://strange", "http://127.0.0.1:2379"}) - // use first endpoint as the picked url - c.cluster.picked = 0 - if _, err := c.Set("foo", "bar", 5); err != nil { -diff --git a/etcd/cluster.go b/etcd/cluster.go -index d0461e1..02ed577 100644 ---- a/etcd/cluster.go -+++ b/etcd/cluster.go -@@ -14,9 +14,9 @@ type Cluster struct { - } - - func NewCluster(machines []string) *Cluster { -- // if an empty slice was sent in then just assume HTTP 4001 on localhost -+ // if an empty slice was sent in then just assume HTTP 2379 on localhost - if len(machines) == 0 { -- machines = []string{"http://127.0.0.1:4001"} -+ machines = []string{"http://127.0.0.1:2379"} - } - - machines = shuffleStringSlice(machines) -diff --git a/etcd/member_test.go b/etcd/member_test.go -index 53ebdd4..b3439a7 100644 ---- a/etcd/member_test.go -+++ b/etcd/member_test.go -@@ -16,7 +16,7 @@ func TestMemberCollectionUnmarshal(t *testing.T) { - want: memberCollection([]Member{}), - }, - { -- body: []byte(`{"members":[{"id":"2745e2525fce8fe","peerURLs":["http://127.0.0.1:7003"],"name":"node3","clientURLs":["http://127.0.0.1:4003"]},{"id":"42134f434382925","peerURLs":["http://127.0.0.1:2380","http://127.0.0.1:7001"],"name":"node1","clientURLs":["http://127.0.0.1:2379","http://127.0.0.1:4001"]},{"id":"94088180e21eb87b","peerURLs":["http://127.0.0.1:7002"],"name":"node2","clientURLs":["http://127.0.0.1:4002"]}]}`), -+ body: []byte(`{"members":[{"id":"2745e2525fce8fe","peerURLs":["http://127.0.0.1:7003"],"name":"node3","clientURLs":["http://127.0.0.1:4003"]},{"id":"42134f434382925","peerURLs":["http://127.0.0.1:2380","http://127.0.0.1:7001"],"name":"node1","clientURLs":["http://127.0.0.1:2379","http://127.0.0.1:2379"]},{"id":"94088180e21eb87b","peerURLs":["http://127.0.0.1:7002"],"name":"node2","clientURLs":["http://127.0.0.1:4002"]}]}`), - want: memberCollection( - []Member{ - { -@@ -38,7 +38,7 @@ func TestMemberCollectionUnmarshal(t *testing.T) { - }, - ClientURLs: []string{ - "http://127.0.0.1:2379", -- "http://127.0.0.1:4001", -+ "http://127.0.0.1:2379", - }, - }, - { --- -1.9.3 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..adeb9b1 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Unused/deprecated diff --git a/golang-github-coreos-go-etcd.spec b/golang-github-coreos-go-etcd.spec deleted file mode 100644 index 560da95..0000000 --- a/golang-github-coreos-go-etcd.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Run tests in check section -# Needs etcd running -%bcond_with check - -# https://github.com/coreos/go-etcd -%global goipath github.com/coreos/go-etcd -Version: 2.0.0 - -%global common_description %{expand: -Go client library for etcd.} - -%gometa - -Name: golang-github-coreos-go-etcd -Release: 2%{?dist} -Summary: Go client library for etcd -# Detected licences -# - *No copyright* Apache License (v2.0) at 'LICENSE' -License: ASL 2.0 -URL: %{gourl} -Source0: %{gosource} - -BuildRequires: golang(github.com/ugorji/go/codec) - -%description -%{common_description} - - -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel -%{common_description} - -This package contains library source intended for -building other packages which use import path with -%{goipath} prefix. - - -%prep -%forgeautosetup - - -%install -%goinstall - - -%if %{with check} -%check -%gochecks -%endif - - -%files devel -f devel.file-list -%license LICENSE -%doc README.md - - -%changelog -* Thu Jan 31 2019 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 14 2018 Robert-André Mauchin - 2.0.0-1 -- Update to new go packaging - -* Fri Jul 13 2018 Fedora Release Engineering - 2.0.0-0.13.git68b33a3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0.0-0.12.git68b33a3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2.0.0-0.11.git68b33a3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.0.0-0.10.git68b33a3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.0.0-0.9.git68b33a3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jul 21 2016 Fedora Release Engineering - 2.0.0-0.8.git68b33a3 -- https://fedoraproject.org/wiki/Changes/golang1.7 - -* Mon Feb 22 2016 Fedora Release Engineering - 2.0.0-0.7.git68b33a3 -- https://fedoraproject.org/wiki/Changes/golang1.6 - -* Wed Feb 03 2016 Fedora Release Engineering - 2.0.0-0.6.git68b33a3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 27 2015 jchaloup - 2.0.0-0.5.git68b33a3 -- Bump to upstream 68b33a3ba02a45d5f98bd7952e3e63e653a38252 - related: #1246214 - -* Sat Sep 12 2015 jchaloup - 2.0.0-0.4.git4cceaf7 -- Update to spec-2.1 - related: #1246214 - -* Mon Aug 31 2015 jchaloup - 2.0.0-0.3.git4cceaf7 -- Bump to upstream 4cceaf7283b76f27c4a732b20730dcdb61053bf5 - resolves: #1246214 - -* Wed Jun 17 2015 Fedora Release Engineering - 2.0.0-0.2.git0424b5f -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 20 2015 jchaloup - 2.0.0-0.1.git0424b5f -- Bump to upstream 0424b5f86ef0ca57a5309c599f74bbb3e97ecd9d - related: #1141807 - -* Fri Apr 10 2015 Eric Paris -- Bump to version supporting etcd 2.0 - -* Tue Apr 7 2015 Eric Paris -- include etcd dep - -* Tue Mar 31 2015 jchaloup - 0.4.6-0.2.rc1.git2af7a95 -- Bump to upstream 2af7a9525b09fb715b215a1fb852dd4814ef52b5 - related: #1141807 - -* Wed Feb 18 2015 jchaloup - 0.4.6-0.1.rc1.git6aa2da5 -- Bump to upstream 6aa2da5a7a905609c93036b9307185a04a5a84a5 - related: #1141807 - -* Wed Jan 28 2015 jchaloup - 0.2.0-0.5.rc1.gitb7c233e -- Bump to upstream b7c233e2ef9be1016c63f66145161b317165ad7e - related: #1141807 - -* Thu Oct 23 2014 jchaloup - 0.2.0-0.4.rc1.git6fe04d5 -- Choose the correct architecture - related: #1141807 - -* Thu Oct 23 2014 jchaloup - 0.2.0-0.3.rc1.git6fe04d5 -- Bump to upstream 6fe04d580dfb71c9e34cbce2f4df9eefd1e1241e - resolves: #1141807 - -* Mon Sep 15 2014 Lokesh Mandvekar - 0.2.0-0.2.rc1.git23142f6 - - do not redefine gopath - - do not own dirs owned by golang - - correct version number, rc tag goes in release - - noarch - -* Sat Sep 06 2014 Eric Paris - 0.2.0-0.1-rc1 -- Initial fedora package diff --git a/sources b/sources deleted file mode 100644 index 840cfb0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (go-etcd-2.0.0.tar.gz) = 6cbad346080d6c7100954ff40bae82ba796cff7f9a4883dc7d19544c2b3634727a92b3044a409d27f9ff54d27af397f7682dd2480e4ef3352175a2db861ce4cf