diff --git a/_service b/_service
index 851f091..9bda656 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
https://github.com/etcd-io/etcd.git
git
.git
- v3.5.4
+ v3.5.7
@PARENT_TAG@
enable
v(.*)
diff --git a/_servicedata b/_servicedata
index ff39f7d..9149b05 100644
--- a/_servicedata
+++ b/_servicedata
@@ -5,4 +5,4 @@
git://github.com/etcd-io/etcd.git
99018a77bea9a9d29962e5169876c64e02739c52
https://github.com/etcd-io/etcd.git
- 08407ff7600eb16c4445d5f21c4fafaf19412e24
\ No newline at end of file
+ 215b53cf3b48ee761f4c40908b3874b2e5e95e9f
\ No newline at end of file
diff --git a/etcd-3.5.4.tar.gz b/etcd-3.5.4.tar.gz
deleted file mode 100644
index 365a313..0000000
--- a/etcd-3.5.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bb4378949a59358c513a19dbfcc36304d5273e5b405ed8aa197d7683518b415
-size 4091864
diff --git a/etcd-3.5.7.tar.gz b/etcd-3.5.7.tar.gz
new file mode 100644
index 0000000..d40e0bd
--- /dev/null
+++ b/etcd-3.5.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae92e7a66ee0998d813b81e6f372fa0ca58b88662b02c00c892dfb96fa2cd0db
+size 4136797
diff --git a/etcd.changes b/etcd.changes
index b080453..56610a5 100644
--- a/etcd.changes
+++ b/etcd.changes
@@ -1,3 +1,125 @@
+-------------------------------------------------------------------
+Wed Jan 25 13:19:15 UTC 2023 - Elisei Roca
+
+- Add -trimpath which removes specific build time paths from the binary
+- Add -w to strip DWARF symbols, not needed
+
+- Update to version 3.5.7:
+ * version: bump up to 3.5.7
+ * etcdserver: return membership.ErrIDNotFound when the memberID not found
+ * etcdserver: process the scenaro of the last WAL record being partially synced to disk
+ * update nsswitch.conf for 3.5
+ * 3.5: remove the dependency on busybox
+ * Remove dependency on gobin
+ * resolve build error: parameter may not start with quote character '
+ * remove .travis.yml
+ * format the source code and tidy the dependencies using go 1.17.13
+ * bump go version to 1.17.13
+ * deps: bump golang.org/x/net to v0.4.0 to address CVEs
+ * security: use distroless base image to address critical Vulnerabilities
+ * cidc: specify the correct branch name of release-3.5 in workflow for trivy nightly scan
+ * Add trivy nightly scan for release-3.5
+ * clientv3: revert the client side change in 14547
+ * client/pkg/v3: fixes Solaris build of transport
+ * etcdserver: fix nil pointer panic for readonly txn
+ * Fix go fmt error
+ * [3.5] Backport: non mutating requests pass through quotaKVServer when NOSPACE
+ * etcdserver: intentionally set the memberID as 0 in corruption alarm
+
+- Update to version 3.5.6:
+ * version: bump up to 3.5.6
+ * release: build with consistent paths
+ * client/pkg/fileutil: add missing logger to {Create,Touch}DirAll
+ * test: add test case to cover the CommonName based authentication
+ * test: add certificate with root CommonName
+ * clientv3: do not refresh token when using TLS CommonName based authentication
+ * etcdserver: call the OnPreCommitUnsafe in unsafeCommit
+ * add range flag for delete in etcdctl
+ * server: add more context to panic message
+ * fix:close conn
+ * clientv3: fix the design & implementation of double barrier
+ * test: added e2e test case for issue 14571: etcd doesn't load auth info when recovering from a snapshot
+ * etcdserver: call refreshRangePermCache on Recover() in AuthStore. #14574
+ * server: add a unit test case for authStore.Reocver() with empty rangePermCache
+ * Backport #14591 to 3.5.
+ * client/v3: Add backoff before retry when watch stream returns unavailable
+ * etcdserver: added more debug log for the purgeFile goroutine
+ * netutil: make a `raw` URL comparison part of the urlsEqual function
+ * Apply suggestions from code review
+ * netutil: add url comparison without resolver to URLStringsEqual
+ * tests/Dockerfile: Switch to ubuntu 22.04 base
+ * Makefile: Additional logic fix
+ * *: avoid closing a watch with ID 0 incorrectly
+ * tests: a test case for watch with auth token expiration
+ * *: handle auth invalid token and old revision errors in watch
+ * server/etcdmain: add configurable cipher list to gRPC proxy listener
+ * Replace github.com/form3tech-oss/jwt-go with https://github.com/golang-jwt/jwt/v4
+
+- Update to version 3.5.5:
+ * version: bump up to 3.5.5
+ * fix the flaky test fix_TestV3AuthRestartMember_20220913 for 3.5
+ * etcdctl: fix move-leader for multiple endpoints
+ * testing: fix TestOpenWithMaxIndex cleanup
+ * server,test: refresh cache on each NewAuthStore
+ * server/etcdmain: add build support for Apple M1
+ * tests: Fix member id in CORRUPT alarm
+ * server: Make corrtuption check optional and period configurable
+ * server: Implement compaction hash checking
+ * tests: Cover periodic check in tests
+ * server: Refactor compaction checker
+ * tests: Move CorruptBBolt to testutil
+ * tests: Rename corruptHash to CorruptBBolt
+ * tests: Unify TestCompactionHash and extend it to also Delete keys and Defrag
+ * tests: Add tests for HashByRev HTTP API
+ * tests: Add integration tests for compact hash
+ * server: Cache compaction hash for HashByRev API
+ * server: Extract hasher to separate interface
+ * server: Remove duplicated compaction revision
+ * server: Return revision range that hash was calcualted for
+ * server: Store real rv range in hasher
+ * server: Move adjusting revision to hasher
+ * server: Pass revision as int
+ * server: Calculate hash during compaction
+ * server: Fix range in mock not returning same number of keys and values
+ * server: Move reading KV index inside scheduleCompaction function
+ * server: Return error from scheduleCompaction
+ * server: Refactor hasher
+ * server: Extract kvHash struct
+ * server: Move unsafeHashByRev to new hash.go file
+ * server: Extract unsafeHashByRev function
+ * server: Test HashByRev values to make sure they don't change
+ * server: Cover corruptionMonitor with tests
+ * server: Extract corruption detection to dedicated struct
+ * server: Extract triggerCorruptAlarm to function
+ * move consistent_index forward when executing alarmList operation
+ * fix the potential data loss for clusters with only one member
+ * [backport 3.5] server: don't panic in readonly serializable txn
+ * Backport of pull/14354 to 3.5.5
+ * Refactor the keepAliveListener and keepAliveConn
+ * clientv3: close streams after use in lessor keepAliveOnce method
+ * Change default sampling rate from 100% to 0%
+ * Fix the failure in TestEndpointSwitchResolvesViolation
+ * update all related dependencies
+ * move setupTracing into a separate file config_tracing.go
+ * etcdserver: bump OpenTelemetry to 1.0.1
+ * Change default sampling rate from 100% to 0%
+ * server/auth: protect rangePermCache with a RW lock
+ * Improve error message for incorrect values of ETCD_CLIENT_DEBUG
+ * add e2e test cases to cover the maxConcurrentStreams
+ * Add flag `--max-concurrent-streams` to set the max concurrent stream each client can open at a time
+ * add the uint32Value data type
+ * Client: fix check for WithPrefix op
+ * client/v3: do not overwrite authTokenBundle on dial
+ * restrict the max size of each WAL entry to the remaining size of the file
+ * Add FileReader and FileBufReader utilities
+ * Backport two lease related bug fixes to 3.5
+ * scripts: Detect staged files before building release
+ * scripts: Avoid additional repo clone
+ * Make DRY_RUN explicit
+ * scripts: Add tests for release scripts
+ * server/auth: enable tokenProvider if recoved store enables auth
+ * Update golang.org/x/crypto to latest
+
-------------------------------------------------------------------
Mon Jul 18 05:47:16 UTC 2022 - dmueller@suse.com
diff --git a/etcd.spec b/etcd.spec
index ccfcd0d..b85fe54 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -22,7 +22,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: etcd
-Version: 3.5.4
+Version: 3.5.7
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.16
+BuildRequires: golang(API) >= 1.17
BuildRequires: golang-packaging
BuildRequires: systemd-rpm-macros
BuildRequires: sysuser-tools
@@ -90,7 +90,8 @@ for item in server etcdctl etcdutl;do
go build -v \
-buildmode=pie \
-mod=vendor \
- -ldflags="-s -X main.Version=%{version}" \
+ -trimpath \
+ -ldflags="-s -w -X main.Version=%{version}" \
-o ../bin/"$item"
done
cd "$dir"
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 0fa165c..836a057 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c5edc344a46164e7bbab181c535bc4d4fc57d961bfd90d2586eb14d43e9265ef
-size 4772726
+oid sha256:b90287feaee21fd37f18e0d30e2b5f5b5ef36ab1d97c9751b0fb174d6e82c73d
+size 4874606