From 5971ec837b05e3ad1452031739b9a2cee52f1686aac89fd2f51d45740673c8ae Mon Sep 17 00:00:00 2001
From: Marius Kittler <marius.kittler@suse.com>
Date: Tue, 6 Jun 2023 09:28:35 +0000
Subject: [PATCH] Update to 1.23.5

OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=267
---
 syncthing-source-v1.23.4.tar.gz     |  3 ---
 syncthing-source-v1.23.4.tar.gz.asc | 11 -----------
 syncthing-source-v1.23.5.tar.gz     |  3 +++
 syncthing.changes                   | 15 +++++++++++++++
 syncthing.spec                      |  4 +---
 5 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 syncthing-source-v1.23.4.tar.gz
 delete mode 100644 syncthing-source-v1.23.4.tar.gz.asc
 create mode 100644 syncthing-source-v1.23.5.tar.gz

diff --git a/syncthing-source-v1.23.4.tar.gz b/syncthing-source-v1.23.4.tar.gz
deleted file mode 100644
index 9febc26..0000000
--- a/syncthing-source-v1.23.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06a2882f8ac49e15faf96025b01d0edcd4cc190a419d5de98fbe8271695329fa
-size 14141457
diff --git a/syncthing-source-v1.23.4.tar.gz.asc b/syncthing-source-v1.23.4.tar.gz.asc
deleted file mode 100644
index 7b63503..0000000
--- a/syncthing-source-v1.23.4.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEN8hFVOfgomHk924e0m5u0ABlSj4FAmQtfqoACgkQ0m5u0ABl
-Sj79VQf/fGt5DsaA+KSkqCS0Pppw45QFPSc997AOZI/GtneFNvs3ATepb2xV6+0G
-YrOGjFS+Zn7AB0/ek2oi/f/TbBoMWalHdlyr1NatqW8rgcYgoZgCzH3BzffUDh+E
-iqSqlzNYntirFLpfqDR+xz+pFSMoNAd05mH1DWD6Mxw+71y0bddCYsBi6KaZxQ1l
-9oFMGfaMlr/u9VHkScsT+t/iT9nUmGAhNfCGxrB3Io67jTrOVNAK0F+VqsSkb5ks
-igOaWkHCYor+oKjEzhYGXhjEhLJZUiEWkbLBrgs1av/buZp/vXkIIGEFod1ymFCm
-WKQgevcpI2r4OR1BRAkUC5wC20ELsg==
-=8H9U
------END PGP SIGNATURE-----
diff --git a/syncthing-source-v1.23.5.tar.gz b/syncthing-source-v1.23.5.tar.gz
new file mode 100644
index 0000000..249424a
--- /dev/null
+++ b/syncthing-source-v1.23.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb74c6973828598e616a63ba8d4fb0027a5fe9231da151634011d4b8d81f7b30
+size 14196275
diff --git a/syncthing.changes b/syncthing.changes
index 36fc132..9d3e19c 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Jun  6 08:49:11 UTC 2023 - Marius Kittler <marius.kittler@suse.com>
+
+- Update to 1.13.5
+  * This release fixes CVE-2022-46165 “Cross-site Scripting (XSS) in Web GUI”
+  * Bugfixes:
+    #8503: "syncthing cli config devices add" reflect error when using --addresses flag
+    #8764: Ignore patterns creating during folder addition are not loaded
+    #8778: Tests fail on Windows with Go 1.20
+    #8779: Test cleanup fails all model tests on Windows on Go 1.20
+    #8859: Incorrect handling of path for auto accepted folder
+
+  * Other issues:
+    #8799: "fatal error: checkptr: converted pointer straddles multiple allocations" in crypto tests
+
 -------------------------------------------------------------------
 Wed Apr  5 16:07:00 UTC 2023 - Marius Kittler <marius.kittler@suse.com>
 
diff --git a/syncthing.spec b/syncthing.spec
index b923031..6b04ec2 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -17,15 +17,13 @@
 
 
 Name:           syncthing
-Version:        1.23.4
+Version:        1.23.5
 Release:        0
 Summary:        Continuous File Synchronisation
 License:        MPL-2.0
 Group:          Productivity/Networking/File-Sharing
 URL:            https://syncthing.net/
 Source:         https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz
-Source1:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz.asc
-Source2:        %{name}.keyring
 Patch0:         harden_strelaysrv.service.patch
 Patch1:         harden_syncthing-resume.service.patch
 Patch2:         harden_syncthing@.service.patch