diff --git a/_service b/_service index d732487..3357d9f 100644 --- a/_service +++ b/_service @@ -1,16 +1,19 @@ + git://github.com/etcd-io/etcd.git git - https://github.com/coreos/etcd.git .git - etcd - 3.3.15 - v3.3.15 + v3.4.3 + @PARENT_TAG@ enable + v(.*) + + *.tar - xz + gz + + - diff --git a/_servicedata b/_servicedata index c197779..18e9429 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,6 @@ https://github.com/coreos/etcd.git - 94745a4eed0425653b3b4275a208d38babceeaec \ No newline at end of file + 94745a4eed0425653b3b4275a208d38babceeaec + git://github.com/etcd-io/etcd.git + 3cf2f69b5738fb702ba1a935590f36b52b18979b \ No newline at end of file diff --git a/etcd-3.3.15.tar.xz b/etcd-3.3.15.tar.xz deleted file mode 100644 index a1c1209..0000000 --- a/etcd-3.3.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7baf8a9d015917dec69f4349455ad29043566d85065011bea7c343c1ca4606d -size 4206684 diff --git a/etcd-3.4.3.tar.gz b/etcd-3.4.3.tar.gz new file mode 100644 index 0000000..8e943ec --- /dev/null +++ b/etcd-3.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bed9b521a7819bc3b78dbaabac387182bdb246ad3fdc96fe8e11b01d4fb42a17 +size 9051598 diff --git a/etcd.changes b/etcd.changes index cab843a..88abb77 100644 --- a/etcd.changes +++ b/etcd.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Thu Feb 6 09:03:22 UTC 2020 - Michal Jura + +- Update to version 3.4.3: + * version: 3.4.3 + * *: use Go 1.12.12 + * rafthttp: add 3.4 stream type + * etcdserver: strip patch version in metrics + * etcdserver: strip patch version in cluster version + * etcdserver: unset old cluster version in metrics + * Add version, tag and branch checks to release script + * scripts: fix read failure prompt in release; use https for git clone. + * version: 3.4.2 + * etcdserver: trace compaction request; add return parameter 'trace' to applierV3.Compaction() mvcc: trace compaction request; add input parameter 'trace' to KV.Compact() + * etcdserver: trace raft requests. + * etcdserver: add put request steps. mvcc: add put request steps; add trace to KV.Write() as input parameter. + * pkg: use zap logger to format the structure log output. + * pkg: add field to record additional detail of trace; add stepThreshold to reduce log volume. + * pkg: create package traceutil for tracing. mvcc: add tracing steps:range from the in-memory index tree; range from boltdb. etcdserver: add tracing steps: agreement among raft nodes before linerized reading; authentication; filter and sort kv pairs; assemble the response. + * clientv3: Replace endpoint.ParseHostPort with net.SplitHostPort to fix IPv6 client endpoints + * clientv3: Set authority used in cert checks to host of endpoint + * tests/e2e: fix metrics tests + * etcdctl: fix member add command + * scripts/build-binary: fix darwin tar commands + * scripts/release: fix SHA256SUMS command + * version: 3.4.1 + * scripts/release: fix docker push command + * integration: fix bug in for loop, make it break properly + * embed: expose ZapLoggerBuilder + * vendor: upgrade to gRPC v1.23.1 + ------------------------------------------------------------------- Thu Oct 10 09:50:11 UTC 2019 - rbrown@suse.com diff --git a/etcd.spec b/etcd.spec index 5e1c7ed..401f324 100644 --- a/etcd.spec +++ b/etcd.spec @@ -20,18 +20,20 @@ %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif +%define project go.etcd.io/etcd Name: etcd -Version: 3.3.15 +Version: 3.4.3 Release: 0 Summary: Highly-available key value store for configuration and service discovery License: Apache-2.0 Group: System/Management Url: https://github.com/coreos/etcd -Source: %{name}-%{version}.tar.xz -Source1: %{name}.conf -Source2: %{name}.service -Source5: README.security +Source: %{name}-%{version}.tar.gz +Source1: vendor.tar.gz +Source11: %{name}.conf +Source12: %{name}.service +Source15: README.security BuildRequires: golang-packaging BuildRequires: shadow BuildRequires: systemd-rpm-macros @@ -65,25 +67,38 @@ A command line client for etcd. It can be used in scripts or for administrators to explore an etcd cluster. %prep -%setup -q -cp %{SOURCE5} . +%setup -q -a1 +cp %{SOURCE15} . %build -%{goprep} github.com/coreos/etcd -%{gobuild} . -%{gobuild} etcdctl +%{goprep} go.etcd.io/etcd +export GOPATH=$HOME/go +mkdir -pv $HOME/go/src/%{project} +rm -rf $HOME/go/src/%{project}/* +cp -avr * $HOME/go/src/%{project} + +cd $HOME/go/src/%{project} +go build -v -buildmode=pie -o etcd + +cd $HOME/go/src/%{project}/etcdctl +go build -v -buildmode=pie -o etcdctl %install -%{goinstall} -rm -rf %{buildroot}/%{_libdir}/go/contrib +cd $HOME/go/src/%{project} + +install -d %{buildroot}/%{_sbindir} +install -D -m 0755 etcd %{buildroot}/%{_sbindir}/etcd + +install -d %{buildroot}/%{_bindir} +install -D -m 0755 etcdctl/etcdctl %{buildroot}/%{_bindir}/etcdctl # Service -install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service +install -D -p -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}.service install -d %{buildroot}/%{_sbindir} ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} # Sysconfig -install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.%{name} +install -D -p -m 0644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.%{name} %ifarch aarch64 # arm64 is not yet officially supported echo -e "\n#Enable arm64\nETCD_UNSUPPORTED_ARCH=arm64\n" >> %{buildroot}%{_fillupdir}/sysconfig.%{name} @@ -92,9 +107,6 @@ echo -e "\n#Enable arm64\nETCD_UNSUPPORTED_ARCH=arm64\n" >> %{buildroot}%{_fillu # Additional install -d -m 750 %{buildroot}%{_localstatedir}/lib/%{name} -# Move -mv %{buildroot}%{_bindir}/etcd %{buildroot}%{_sbindir}/%{name} - %pre getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name} getent passwd %{name} >/dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /bin/false -c "etcd daemon" %{name} diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..f39ce8a --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:874ea09dac1f5b266ab52a2f4d483dce9dd56b76a8b6e5ce74845c7eb7e41e9c +size 3126011