Update to version 1.20.4; Fixes RHBZ#2113971

.gitignore

@@ -62,3 +62,9 @@
 /syncthing-source-v1.18.4.tar.gz
 /syncthing-source-v1.18.5.tar.gz
 /syncthing-source-v1.18.6.tar.gz
+/syncthing-source-v1.19.1.tar.gz
+/syncthing-source-v1.19.2.tar.gz
+/syncthing-source-v1.20.1.tar.gz
+/syncthing-source-v1.20.2.tar.gz
+/syncthing-source-v1.20.3.tar.gz
+/syncthing-source-v1.20.4.tar.gz

sources

@@ -1 +1 @@
-SHA512 (syncthing-source-v1.18.6.tar.gz) = 011c2b6e4ff16c3a7d8cd5ed6e3fd40319fb88ff781a00febc4c3423b344d4f50e1286ec627c0add44a42716e69d331646aa7303303cc3b0785170375e18d494
+SHA512 (syncthing-source-v1.20.4.tar.gz) = f695cc6d8e6a87b397a11f79f3b5e12565fcea4601da7dd41b681e49913bb48b5164b3648ae68a1d580b77f6a20cc8053e252e24a5c054c52255ece34e90c4f8

syncthing.spec

@@ -1,6 +1,6 @@
 %bcond_with devel
 
-%global basever 1.18.6
+%global basever 1.20.4
 #%%global rcnum   0
 
 Name:           syncthing
@@ -39,10 +39,10 @@ Provides:       bundled(angular-sanitize) = 1.3.20
 Provides:       bundled(angular-translate) = 2.9.0.1
 Provides:       bundled(angular-translate-loader-static-files) = 2.11.0
 Provides:       bundled(bootstrap) = 3.3.6
-Provides:       bundled(daterangepicker) = 3.0.0
-Provides:       bundled(ForkAwesome) = 1.1.2
+Provides:       bundled(daterangepicker) = 3.1
+Provides:       bundled(ForkAwesome) = 1.2.0
 Provides:       bundled(jquery) = 2.2.2
-Provides:       bundled(jquery-fancytree) = 2.28.1
+Provides:       bundled(jquery-fancytree) = 2.38.0
 Provides:       bundled(jquery-ui) = 1.12.1
 Provides:       bundled(moment) = 2.19.4
 
@@ -56,14 +56,10 @@ Provides:       bundled(golang(github.com/AudriusButkevicius/pfilter)) = 0.0.10
 Provides:       bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.6
 # github.com/Azure/go-ntlmssp : MIT
 Provides:       bundled(golang(github.com/Azure/go-ntlmssp)) = 6637195
-# github.com/StackExchange/wmi : MIT
-Provides:       bundled(golang(github.com/StackExchange/wmi)) = 1.2.1
 # github.com/alecthomas/kong : MIT
-Provides:       bundled(golang(github.com/alecthomas/kong)) = 0.2.17
+Provides:       bundled(golang(github.com/alecthomas/kong)) = 0.6.1
 # github.com/beorn7/perks : MIT
 Provides:       bundled(golang(github.com/beorn7/perks)) = 1.0.1
-# github.com/bkaradzic/go-lz4 : BSD
-Provides:       bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d
 # github.com/calmh/xdr : MIT
 Provides:       bundled(golang(github.com/calmh/xdr)) = 1.1.0
 # github.com/ccding/go-stun : ASL 2.0
@@ -91,7 +87,7 @@ Provides:       bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 1.5.3
 # github.com/go-ldap/ldap : MIT
 Provides:       bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.1
 # github.com/go-ole/go-ole : MIT
-Provides:       bundled(golang(github.com/go-ole/go-ole)) = 8b1f7f9
+Provides:       bundled(golang(github.com/go-ole/go-ole)) = 1.2.6
 # github.com/go-task/slim-sprig : MIT
 Provides:       bundled(golang(github.com/go-task/slim-sprig)) = 348f09d
 # github.com/gobwas/glob : MIT
@@ -121,11 +117,13 @@ Provides:       bundled(golang(github.com/klauspost/cpuid/v2)) = 2.0.9
 # github.com/lib/pq : MIT
 Provides:       bundled(golang(github.com/lib/pq)) = 1.10.3
 # github.com/lucas-clemente/quic-go : MIT
-Provides:       bundled(golang(github.com/lucas-clemente/quic-go)) = 0.24.0
+Provides:       bundled(golang(github.com/lucas-clemente/quic-go)) = 0.27.0
 # github.com/marten-seemann/qtls-go1-16 : BSD
-Provides:       bundled(golang(github.com/marten-seemann/qtls-go1-16)) = 0.1.4
+Provides:       bundled(golang(github.com/marten-seemann/qtls-go1-16)) = 0.1.5
 # github.com/marten-seemann/qtls-go1-17 : BSD
-Provides:       bundled(golang(github.com/marten-seemann/qtls-go1-17)) = 0.1.0
+Provides:       bundled(golang(github.com/marten-seemann/qtls-go1-17)) = 0.1.1
+# github.com/marten-seemann/qtls-go1-18 : BSD
+Provides:       bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.1
 # github.com/maruel/panicparse : ASL 2.0
 Provides:       bundled(golang(github.com/maruel/panicparse)) = 1.6.1
 # github.com/matttproud/golang_protobuf_extensions : ASL 2.0
@@ -146,14 +144,18 @@ Provides:       bundled(golang(github.com/oschwald/geoip2-golang)) = 1.5.0
 Provides:       bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.8.0
 # github.com/petermattis/goid : ASL 2.0
 Provides:       bundled(golang(github.com/petermattis/goid)) = b0b1615
+# github.com/pierrec/lz4 : BSD
+Provides:       bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.15
 # github.com/pkg/errors : BSD
 Provides:       bundled(golang(github.com/pkg/errors)) = 0.9.1
+# github.com/power-devops/perfstat : MIT
+Provides:       bundled(golang(github.com/power-devops/perfstat)) = 5aafc22
 # github.com/prometheus/client_golang : ASL 2.0
-Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.11.0
+Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.12.2
 # github.com/prometheus/client_model : ASL 2.0
 Provides:       bundled(golang(github.com/prometheus/client_model)) = 0.2.0
 # github.com/prometheus/common : ASL 2.0
-Provides:       bundled(golang(github.com/prometheus/common)) = 0.30.0
+Provides:       bundled(golang(github.com/prometheus/common)) = 0.32.1
 # github.com/prometheus/procfs : ASL 2.0
 Provides:       bundled(golang(github.com/prometheus/procfs)) = 0.7.3
 # github.com/rcrowley/go-metrics : BSD
@@ -163,17 +165,19 @@ Provides:       bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0
 # github.com/sasha-s/go-deadlock : ASL 2.0
 Provides:       bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1
 # github.com/shirou/gopsutil : BSD
-Provides:       bundled(golang(github.com/shirou/gopsutil/v3)) = 3.21.8
+Provides:       bundled(golang(github.com/shirou/gopsutil/v3)) = 3.21.12
 # github.com/syncthing/notify : MIT
 Provides:       bundled(golang(github.com/syncthing/notify)) = c6b7342
 # github.com/syndtr/goleveldb : BSD
 Provides:       bundled(golang(github.com/syndtr/goleveldb)) = d9e9293
 # github.com/thejerf/suture : MIT
-Provides:       bundled(golang(github.com/thejerf/suture/v4)) = 4.0.1
+Provides:       bundled(golang(github.com/thejerf/suture/v4)) = 4.0.2
 # github.com/urfave/cli : MIT
 Provides:       bundled(golang(github.com/urfave/cli)) = 1.22.5
 # github.com/vitrun/qart : ASL 2.0 and BSD
 Provides:       bundled(golang(github.com/vitrun/qart)) = bf64b92
+# github.com/yusufpapurcu/wmi : MIT
+Provides:       bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.2
 # golang.org/x/crypto : BSD
 Provides:       bundled(golang(golang.org/x/crypto)) = 089bfa5
 # golang.org/x/mod : BSD
@@ -181,13 +185,13 @@ Provides:       bundled(golang(golang.org/x/mod)) = 0.5.1
 # golang.org/x/net : BSD
 Provides:       bundled(golang(golang.org/x/net)) = 3ad01bb
 # golang.org/x/sys : BSD
-Provides:       bundled(golang(golang.org/x/sys)) = 92d5a99
+Provides:       bundled(golang(golang.org/x/sys)) = da31bd3
 # golang.org/x/text: BSD
 Provides:       bundled(golang(golang.org/x/text)) = 0.3.7
 # golang.org/x/time : BSD
 Provides:       bundled(golang(golang.org/x/time)) = 1f47c86
 # golang.org/x/tools : BSD
-Provides:       bundled(golang(golang.org/x/tools)) = 0.1.6
+Provides:       bundled(golang(golang.org/x/tools)) = 0.1.7
 # golang.org/x/xerrors : BSD
 Provides:       bundled(golang(golang.org/x/xerrors)) = 5ec99f8
 # google.golang.org/protobuf : BSD

vendor2provides.py

@@ -30,7 +30,7 @@ def main() -> int:
     # parse vendored dependencies into (import path, version) pairs
     vendored = list()
     for dep in dependencies:
-        ipath, version = dep[2:].split(" ")
+        ipath, version = dep[2:].split(" ")[:2]
 
         # check for git snapshots
         if len(version) > 27: