diff --git a/_service b/_service
index 9bda656..e321feb 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
<param name="url">https://github.com/etcd-io/etcd.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v3.5.7</param>
+ <param name="revision">v3.5.8</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
diff --git a/_servicedata b/_servicedata
index 9149b05..c65af57 100644
--- a/_servicedata
+++ b/_servicedata
@@ -5,4 +5,4 @@
<param name="url">git://github.com/etcd-io/etcd.git</param>
<param name="changesrevision">99018a77bea9a9d29962e5169876c64e02739c52</param></service><service name="tar_scm">
<param name="url">https://github.com/etcd-io/etcd.git</param>
- <param name="changesrevision">215b53cf3b48ee761f4c40908b3874b2e5e95e9f</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">217d183e5a2b2b7e826825f8218b8c4f53590a8f</param></service></servicedata>
\ No newline at end of file
diff --git a/etcd-3.5.7.tar.gz b/etcd-3.5.7.tar.gz
deleted file mode 100644
index d40e0bd..0000000
--- a/etcd-3.5.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae92e7a66ee0998d813b81e6f372fa0ca58b88662b02c00c892dfb96fa2cd0db
-size 4136797
diff --git a/etcd-3.5.8.tar.gz b/etcd-3.5.8.tar.gz
new file mode 100644
index 0000000..eea8c87
--- /dev/null
+++ b/etcd-3.5.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0767d23a02c41f38f00078907282b277f7716b237413c96a5ca7c8351062468
+size 4125152
diff --git a/etcd.changes b/etcd.changes
index 56610a5..a03eeda 100644
--- a/etcd.changes
+++ b/etcd.changes
@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Wed Apr 26 08:46:04 UTC 2023 - eroca@suse.com
+
+- Update to version 3.5.8:
+ * version: bump up to 3.5.8
+ * etcdserver: Guarantee order of requested progress notifications
+ * etcdserver: verify field 'username' and 'revision' present when decoding a JWT token
+ * set zap logging to wsproxy
+ * security: remove password after authenticating the user
+ * test: add an e2e test to reproduce https://nvd.nist.gov/vuln/detail/CVE-2021-28235
+ * bump golang to 1.19.8
+ * server/auth: disallow creating empty permission ranges
+ * chore: enable strict mode for test CI
+ * Fixes: #15266 All docker images of Architecture show amd64
+ * scripts: Add testing of etcd in local image in release workflow.
+ * server: Fix defer function closure escape
+ * tests: Test separate http port connection multiplexing
+ * server: Add --listen-client-http-urls flag to allow running grpc server separate from http server
+ * server: Pick one address that all grpc gateways connect to
+ * server: Extract resolveUrl helper function
+ * server: Separate client listener grouping from serving
+ * refactor: Use proper variable names for urls
+ * sever/auth: fix addUserWithNoOption of store_test
+ * server/auth: fix auth panic bug when user changes password
+ * Automated cherry-pick of #14860: Trigger release in current branch for github workflow case
+ * server/embed: fix data race when start insecure grpc
+ * server: Test watch restore
+ * mvcc: update minRev when watcher stays synced
+ * tests: Add v2 API to connection multiplexing test
+ * tests: Add connection muiltiplexer testing
+ * tests: Backport RunUtilCompletion
+ * tests: Backport tls for etcdctl
+ * tests: Extract e2e test utils
+ * tests: Allow specifying http version in curl
+ * tests: Refactor newClient args
+ * tests: Refactor CURLPrefixArgs
+ * Backport tls 1.3 support.
+ * server: Switch back to random scheduler to improve resilience to watch starvation
+ * test: Test etcd watch stream starvation under high read response load when sharing the same connection
+ * tests: Allow configuring progress notify interval in e2e tests
+ * Run go mod tidy
+ * Updated go to 1.19.7.
+ * Backport go_srcs_in_module changes and fix goword failures.
+ * Formatted source code for go 1.19.6.
+ * Bump to go 1.19.6
+ * Bump golang.org/x/net to v0.7.0 to address CVE GO-2023-1571.
+ * test:enhance the test case TestV3WatchProgressOnMemberRestart
+ * clientv3: correct the nextRev on receving progress notification response
+ * etcdserver: add failpoints walBeforeSync and walAfterSync
+ * Fix regression in timestamp resolution
+ * upgrade cockroachdb/datadriven to v1.0.2 to remove archived dependencies
+ * bump github.com/stretchr/testify to v1.8.1
+ * bump bbolt to v1.3.7 for release-3.5
+ * netutil: consistently format ipv6 addresses
+ * docker: remove nsswitch.conf
+
-------------------------------------------------------------------
Wed Jan 25 13:19:15 UTC 2023 - Elisei Roca <eroca@suse.com>
diff --git a/etcd.spec b/etcd.spec
index b85fe54..87bc07f 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -22,7 +22,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: etcd
-Version: 3.5.7
+Version: 3.5.8
Release: 0
Summary: Highly-available key value store for configuration and service discovery
License: Apache-2.0
@@ -35,7 +35,7 @@ Source12: %{name}.service
Source15: README.security
Source16: system-user-etcd.conf
Source17: vendor-update.sh
-BuildRequires: golang(API) >= 1.17
+BuildRequires: golang(API) >= 1.19
BuildRequires: golang-packaging
BuildRequires: systemd-rpm-macros
BuildRequires: sysuser-tools
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 836a057..bbc032e 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b90287feaee21fd37f18e0d30e2b5f5b5ef36ab1d97c9751b0fb174d6e82c73d
-size 4874606
+oid sha256:6ba27291de4c7d607c381359da42b358ec1b6f13c5877cc40acff02c657219fe
+size 4902138