From be508040c629d9b131cc8668f68cb60c822e7823 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 23 2015 09:23:08 +0000 Subject: import etcd-2.0.11-2.el7 --- diff --git a/.etcd.metadata b/.etcd.metadata index f88fe89..07d2eaa 100644 --- a/.etcd.metadata +++ b/.etcd.metadata @@ -1 +1 @@ -082df0ea53403731ef3bcf9e49c341674dc0f486 SOURCES/v2.0.9.tar.gz +b230653f183e5f737975575b8f5953f0fb932493 SOURCES/v2.0.11.tar.gz diff --git a/.gitignore b/.gitignore index 33e313d..3ed8a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v2.0.9.tar.gz +SOURCES/v2.0.11.tar.gz diff --git a/SOURCES/don-t-set-GIT_SHA-in-build-script.patch b/SOURCES/don-t-set-GIT_SHA-in-build-script.patch new file mode 100644 index 0000000..ceb65b7 --- /dev/null +++ b/SOURCES/don-t-set-GIT_SHA-in-build-script.patch @@ -0,0 +1,25 @@ +From a5da60a9df487c6614d0f2b06db465f43154086b Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka +Date: Wed, 20 May 2015 19:32:36 +0200 +Subject: [PATCH] don't set GIT_SHA in build script + +--- + build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build b/build +index 2bb96e5..b94d708 100755 +--- a/build ++++ b/build +@@ -11,7 +11,7 @@ ln -s ${PWD} $GOPATH/src/${REPO_PATH} + + eval $(go env) + +-GIT_SHA=`git rev-parse --short HEAD` ++#GIT_SHA=`git rev-parse --short HEAD` + + # Static compilation is useful when etcd is run in a container + CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s -X ${REPO_PATH}/version.GitSHA ${GIT_SHA}" -o bin/etcd ${REPO_PATH} +-- +1.9.3 + diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf index 086b740..7cad6e6 100644 --- a/SOURCES/etcd.conf +++ b/SOURCES/etcd.conf @@ -16,7 +16,7 @@ ETCD_LISTEN_CLIENT_URLS="http://localhost:4001" #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_ADVERTISE_CLIENT_URLS="http://localhost:2379,http://localhost:4001" #ETCD_DISCOVERY="" #ETCD_DISCOVERY_SRV="" #ETCD_DISCOVERY_FALLBACK="proxy" diff --git a/SOURCES/etcd.service b/SOURCES/etcd.service index 7b8169a..240a948 100644 --- a/SOURCES/etcd.service +++ b/SOURCES/etcd.service @@ -7,7 +7,8 @@ Type=simple WorkingDirectory=/var/lib/etcd/ EnvironmentFile=-/etc/etcd/etcd.conf User=etcd -ExecStart=/usr/bin/etcd +# set GOMAXPROCS to number of processors +ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd" [Install] WantedBy=multi-user.target diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec index aa4cb14..ce142ff 100644 --- a/SPECS/etcd.spec +++ b/SPECS/etcd.spec @@ -8,12 +8,13 @@ %global provider_tld com %global project coreos %global repo etcd -%global commit 02697ca725e5c790cc1f9d0918ff22fad84cb4c5 +%global commit 0678329cd64a64d7478eae6c35ed0bea0346da86 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} Name: %{repo} -Version: 2.0.9 +Version: 2.0.11 Release: 2%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 @@ -22,8 +23,9 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf +Patch0: don-t-set-GIT_SHA-in-build-script.patch %if 0%{?fedora} -Patch0: etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch +Patch1: etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch %endif ExclusiveArch: %{ix86} x86_64 %{arm} @@ -113,8 +115,8 @@ find . -name "*.go" \ -print |\ xargs sed -i 's/github.com\/coreos\/etcd\/Godeps\/_workspace\/src\///g' -%patch0 -p1 %endif +%patch0 -p1 %build %if 0%{?fedora} @@ -129,6 +131,7 @@ gobuild -o bin/etcd %{import_path} gobuild -o bin/etcdctl %{import_path}/etcdctl gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate %else +export GIT_SHA=%{shortcommit} ./build %endif @@ -224,6 +227,15 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog +* Fri May 22 2015 jchaloup - 2.0.11-2 +- ETCD_ADVERTISE_CLIENT_URLS has to be set if ETCD_LISTEN_CLIENT_URLS is + set GOMAXPROCS to use all processors available + related: #1223388 + +* Wed May 20 2015 jchaloup - 2.0.11-1 +- Update to etcd-2.0.11 + resolves: #1223388 + * Wed Apr 08 2015 jchaloup - 2.0.9-2 - No debug info related: #1199223