From 9c7ba503fe296a651c9d12400c5f272bd352830edbd93f461e92640f4ee7dd1a Mon Sep 17 00:00:00 2001
From: Marius Kittler <marius.kittler@suse.com>
Date: Tue, 2 Nov 2021 20:16:08 +0000
Subject: [PATCH] Update to 1.18.4

OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=225
---
 syncthing-source-v1.18.3.tar.gz     |  3 ---
 syncthing-source-v1.18.3.tar.gz.asc | 11 -----------
 syncthing-source-v1.18.4.tar.gz     |  3 +++
 syncthing-source-v1.18.4.tar.gz.asc | 11 +++++++++++
 syncthing.changes                   | 13 +++++++++++++
 syncthing.spec                      |  2 +-
 6 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 syncthing-source-v1.18.3.tar.gz
 delete mode 100644 syncthing-source-v1.18.3.tar.gz.asc
 create mode 100644 syncthing-source-v1.18.4.tar.gz
 create mode 100644 syncthing-source-v1.18.4.tar.gz.asc

diff --git a/syncthing-source-v1.18.3.tar.gz b/syncthing-source-v1.18.3.tar.gz
deleted file mode 100644
index 1c4b8a9..0000000
--- a/syncthing-source-v1.18.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32c11a56f467b5f9a45ff30da38953387da10d71b4d3cb41643c6a6f5c073c7a
-size 12977000
diff --git a/syncthing-source-v1.18.3.tar.gz.asc b/syncthing-source-v1.18.3.tar.gz.asc
deleted file mode 100644
index 5bc5bcb..0000000
--- a/syncthing-source-v1.18.3.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEN8hFVOfgomHk924e0m5u0ABlSj4FAmFa67EACgkQ0m5u0ABl
-Sj4A8wf/ciIRMKe9IVkXS7+Y3U+37nHBVu+1CRWTXgo2q9wjZaOQWXMDBaLFUuBv
-LYTiPZzPWh/5JJEzYdrdjCPiffAtHrByMoVIXOY1Z4Y0HG2lx3vj8Lse50fl8+nk
-9a8XaFYVWsdFDnA/ZvK588+n/MYYRKwBhka/uOyi7NVGE3COfsdhmNcXxHHc9X+M
-/3xG/ntWeltSiQUf3F78OK6ZHvRl3hz0R3q9g4NyEd+PDDGBeVIfhDiwX67GMQ3Y
-BnVAXXSi7qQewauwGM92OsiKV9JnJAu7ECBFtCOeBM/Qm+ukdHaL6w6xCrY21wXX
-6b0joD0H91nk9eXP1MwcJnsrFabvPA==
-=g9qM
------END PGP SIGNATURE-----
diff --git a/syncthing-source-v1.18.4.tar.gz b/syncthing-source-v1.18.4.tar.gz
new file mode 100644
index 0000000..7424ee2
--- /dev/null
+++ b/syncthing-source-v1.18.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:163185cf120a7c66fa114937d8712866a891cf09c50eb2995fd49788850c7c02
+size 13006540
diff --git a/syncthing-source-v1.18.4.tar.gz.asc b/syncthing-source-v1.18.4.tar.gz.asc
new file mode 100644
index 0000000..6bffb1c
--- /dev/null
+++ b/syncthing-source-v1.18.4.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEN8hFVOfgomHk924e0m5u0ABlSj4FAmGBc+UACgkQ0m5u0ABl
+Sj7uGggAxiEVBC1noWgShSZ+liTYHny1PqsuHdkL20XGP0xZDwUiBwujuS9D6d1o
+5uT7TgQ8ClQdWK1X4n2YTObFbCTfo4PfHrLmOr0g6482MbdvCMaMAS+bY2l/TqWx
+qKSaVyJgUrhjIvEaFDGOGXptM3ptH+EnAhn8YPkqr0QQd2aLtAw1G4Of8CzsfzZn
+pLPyrel8neAB3M2Z/J4bKdtNvSogqcQ3CzvByQvA1LEUK6OCXEXBcbqehvncUrMi
+LlWOeff+fCsCgNdwfXjiPhViS2Q1dMHRctPcWYu8A0JHm41Fz1dhTIK7NMqG5UGR
++Ti8spRdNtIVIQxV4Ok/5/6cHtMrTA==
+=xQtR
+-----END PGP SIGNATURE-----
diff --git a/syncthing.changes b/syncthing.changes
index bb4200c..8a4a489 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Nov  2 20:13:46 UTC 2021 - Marius Kittler <marius.kittler@suse.com>
+
+- Update to 1.18.4
+  * Bugfixes:
+    #7991: Encryption trailer not updated on shortcut
+    #7994: Index "out of sync with reality" on receive-encrypted folder
+    #8000: stdiscosrv + strelaysrv systemd services not restarting on upgrade
+    #8012: Not retrying to sync when a new connection is established
+
+  * Enhancements:
+    #4293: make "Reduced by ignore patterns" label act like "editIgnoresButton"
+
 -------------------------------------------------------------------
 Wed Oct  6 14:58:24 UTC 2021 - Marius Kittler <marius.kittler@suse.com>
 
diff --git a/syncthing.spec b/syncthing.spec
index 75a9235..aa8d5f5 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -17,7 +17,7 @@
 
 
 Name:           syncthing
-Version:        1.18.3
+Version:        1.18.4
 Release:        0
 Summary:        Continuous File Synchronisation
 License:        MPL-2.0