From e00f1a66dbe38a7912bb2dfca686f38f9cbc81c2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 03 2016 20:47:43 +0000
Subject: import etcd-2.3.7-2.el7


---

diff --git a/.etcd.metadata b/.etcd.metadata
index ba870f3..d61ffff 100644
--- a/.etcd.metadata
+++ b/.etcd.metadata
@@ -1 +1 @@
-73042f705d96f57cd4b222edc608bca1a881d73c SOURCES/v2.2.5.tar.gz
+a488474d0347ad895536c192febc59e9971ef265 SOURCES/v2.3.7.tar.gz
diff --git a/.gitignore b/.gitignore
index fab73a0..d1932c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v2.2.5.tar.gz
+SOURCES/v2.3.7.tar.gz
diff --git a/SOURCES/bump-tls-version-to-1.2.patch b/SOURCES/bump-tls-version-to-1.2.patch
new file mode 100644
index 0000000..8a6c21b
--- /dev/null
+++ b/SOURCES/bump-tls-version-to-1.2.patch
@@ -0,0 +1,25 @@
+From 8563eec864585f3239e37400aad7d085ea19f2eb Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Mon, 18 Jul 2016 18:23:33 +0200
+Subject: [PATCH] bump tls version to 1.2
+
+---
+ pkg/transport/listener.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go
+index 56c77b4..8b04d2b 100644
+--- a/pkg/transport/listener.go
++++ b/pkg/transport/listener.go
+@@ -119,7 +119,7 @@ func (info TLSInfo) baseConfig() (*tls.Config, error) {
+ 
+ 	cfg := &tls.Config{
+ 		Certificates: []tls.Certificate{tlsCert},
+-		MinVersion:   tls.VersionTLS10,
++		MinVersion:   tls.VersionTLS12,
+ 	}
+ 	return cfg, nil
+ }
+-- 
+1.9.3
+
diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf
index bc7bbbc..324a4ee 100644
--- a/SOURCES/etcd.conf
+++ b/SOURCES/etcd.conf
@@ -22,6 +22,7 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379"
 #ETCD_DISCOVERY_SRV=""
 #ETCD_DISCOVERY_FALLBACK="proxy"
 #ETCD_DISCOVERY_PROXY=""
+#ETCD_STRICT_RECONFIG_CHECK="false"
 #
 #[proxy]
 #ETCD_PROXY="off"
diff --git a/SOURCES/etcdmain-Add-max-snapshots-and-max-wals-to-help.patch b/SOURCES/etcdmain-Add-max-snapshots-and-max-wals-to-help.patch
deleted file mode 100644
index d607f64..0000000
--- a/SOURCES/etcdmain-Add-max-snapshots-and-max-wals-to-help.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ddc4f8bd4501826e4c551952a96fcca6dd25bf64 Mon Sep 17 00:00:00 2001
-From: Yiqiao Pu <ypu@redhat.com>
-Date: Wed, 18 Nov 2015 17:54:46 +0800
-Subject: [PATCH] etcdmain: Add max-snapshots and max-wals to help
-
-Based on the configuration doc, seems these two flags are missing
-in the help. So add them and the descriptions are from config.go in
-the same directory.
-
-Signed-off-by: Yiqiao Pu <ypu@redhat.com>
----
- etcdmain/help.go | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/etcdmain/help.go b/etcdmain/help.go
-index e233320..fd23d59 100644
---- a/etcdmain/help.go
-+++ b/etcdmain/help.go
-@@ -14,6 +14,8 @@
- 
- package etcdmain
- 
-+import "strconv"
-+
- var (
- 	usageline = `usage: etcd [flags]
-        start an etcd server
-@@ -43,6 +45,10 @@ member flags:
- 		list of URLs to listen on for peer traffic.
- 	--listen-client-urls 'http://localhost:2379,http://localhost:4001'
- 		list of URLs to listen on for client traffic.
-+	--max-snapshots '` + strconv.Itoa(defaultMaxSnapshots) + `'
-+		maximum number of snapshot files to retain (0 is unlimited).
-+	--max-wals '` + strconv.Itoa(defaultMaxWALs) + `'
-+		maximum number of wal files to retain (0 is unlimited).
- 	-cors ''
- 		comma-separated whitelist of origins for CORS (cross-origin resource sharing).
- 
--- 
-1.9.3
-
diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec
index 893640b..3bf1515 100644
--- a/SPECS/etcd.spec
+++ b/SPECS/etcd.spec
@@ -16,11 +16,11 @@
 # https://github.com/coreos/etcd
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          bc9ddf260115d2680191c46977ae72b837785472
+%global commit          fd17c9101d94703f6f4c3d8d6cfb72b62b894cd7
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:		%{repo}
-Version:	2.2.5
+Version:	2.3.7
 Release:	2%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
@@ -29,10 +29,10 @@ Source0:	https://%{provider_prefix}/archive/v%{version}.tar.gz
 Source1:	%{name}.service
 Source2:	%{name}.conf
 
-Patch0:         etcdmain-Add-max-snapshots-and-max-wals-to-help.patch
 Patch1:         set-etcd-advertise-client-urls-if-needed.patch
+Patch2:         bump-tls-version-to-1.2.patch
 
-ExclusiveArch:  %{ix86} x86_64 %{arm}
+ExclusiveArch:  x86_64
 BuildRequires:	golang >= 1.2.1-3
 
 %if ! 0%{?with_bundled}
@@ -197,8 +197,8 @@ find . -name "*.go" \
        xargs sed -i 's/github.com\/coreos\/etcd\/Godeps\/_workspace\/src\///g'
 
 %endif
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # Make link for etcd itself
@@ -353,9 +353,13 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
 %endif
 
 %changelog
-* Thu May 12 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-2
-- Cherry pick from extras-rhel-7.2 and build in 7.3 buildroot with golang-1.6
-  resolves: #1328482
+* Mon Jul 18 2016 jchaloup <jchaloup@redhat.com> - 2.3.7-2
+- Bump tls version to 1.2
+  resolves: #1357621
+
+* Tue Jul 12 2016 jchaloup <jchaloup@redhat.com> - 2.3.7-1
+- Update to 2.3.7
+  resolves: #1355798
 
 * Thu Mar 03 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-1
 - Update to 2.2.5