From 6b732f0317ba8c31da41339d415fa84fec4f0a91 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 2 Mar 2022 12:09:25 +0100 Subject: [PATCH 1/6] Update to version 1.19.1; Fixes RHBZ#2049063 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 28 ++++++++++++++++------------ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d74e26e..8276915 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /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 diff --git a/sources b/sources index d3bcc1a..c23735d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.18.6.tar.gz) = 011c2b6e4ff16c3a7d8cd5ed6e3fd40319fb88ff781a00febc4c3423b344d4f50e1286ec627c0add44a42716e69d331646aa7303303cc3b0785170375e18d494 +SHA512 (syncthing-source-v1.19.1.tar.gz) = 6e87ac43bbdaa9b19f7c62bde63a37ef4a3c2315305333078bd24cebd0f02bbe9432c7b5e463bac220f26e221ec24c213c383b2aa31ba1a6fb3ed06d1013f26e diff --git a/syncthing.spec b/syncthing.spec index 475cf82..6256f56 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.18.6 +%global basever 1.19.1 #%%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(daterangepicker) = 3.1 Provides: bundled(ForkAwesome) = 1.1.2 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.3.0 # 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.25.0 # github.com/marten-seemann/qtls-go1-16 : BSD Provides: bundled(golang(github.com/marten-seemann/qtls-go1-16)) = 0.1.4 # github.com/marten-seemann/qtls-go1-17 : BSD Provides: bundled(golang(github.com/marten-seemann/qtls-go1-17)) = 0.1.0 +# github.com/marten-seemann/qtls-go1-18 : BSD +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.0-beta.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,8 +144,12 @@ 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.13 # 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 # github.com/prometheus/client_model : ASL 2.0 @@ -163,7 +165,7 @@ 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 @@ -174,6 +176,8 @@ Provides: bundled(golang(github.com/thejerf/suture/v4)) = 4.0.1 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,7 +185,7 @@ 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)) = 97ac67d # golang.org/x/text: BSD Provides: bundled(golang(golang.org/x/text)) = 0.3.7 # golang.org/x/time : BSD From fd1883839c38bc7728fe0fe7e1012a957f00c248 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 23 Apr 2022 23:46:18 +0200 Subject: [PATCH 2/6] Update to version 1.19.2; Fixes RHBZ#2072314 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8276915..f9dac2f 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /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 diff --git a/sources b/sources index c23735d..286fce4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.19.1.tar.gz) = 6e87ac43bbdaa9b19f7c62bde63a37ef4a3c2315305333078bd24cebd0f02bbe9432c7b5e463bac220f26e221ec24c213c383b2aa31ba1a6fb3ed06d1013f26e +SHA512 (syncthing-source-v1.19.2.tar.gz) = 3e7e188a5aadbabf97c9925039b1d81bac7da2541f7a1bf61e55cf760696bc878789da8707b3495366c8df5f6673267ed309c049d352deeabd5ee309ec85cb95 diff --git a/syncthing.spec b/syncthing.spec index 6256f56..2377bba 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.19.1 +%global basever 1.19.2 #%%global rcnum 0 Name: syncthing @@ -171,7 +171,7 @@ 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 From efbd1fb007f672aeeb5935964d5d010a3d25f904 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 18 May 2022 12:19:02 +0200 Subject: [PATCH 3/6] Update to version 1.20.1; Fixes RHBZ#2081813 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f9dac2f..d5df3c6 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /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 diff --git a/sources b/sources index 286fce4..2ea52d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.19.2.tar.gz) = 3e7e188a5aadbabf97c9925039b1d81bac7da2541f7a1bf61e55cf760696bc878789da8707b3495366c8df5f6673267ed309c049d352deeabd5ee309ec85cb95 +SHA512 (syncthing-source-v1.20.1.tar.gz) = 7b365b295862f1cac41a9f33b389d7ac6c814b6ea14b8a964f4ecbfd15f1207abd26c53efbe5779aaad9b4b256e594f5f6f59ecf911ddfc6eb129295ba11646c diff --git a/syncthing.spec b/syncthing.spec index 2377bba..e44a0fa 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.19.2 +%global basever 1.20.1 #%%global rcnum 0 Name: syncthing @@ -117,13 +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.25.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.0-beta.1 +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 @@ -191,7 +191,7 @@ 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 From ace58f1a2df41107febcf240b3b88da1575ace7c Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 7 Jun 2022 23:13:09 +0200 Subject: [PATCH 4/6] Update to version 1.20.2; Fixes RHBZ#2094550 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d5df3c6..e1a29ac 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /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 diff --git a/sources b/sources index 2ea52d9..77f94c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.20.1.tar.gz) = 7b365b295862f1cac41a9f33b389d7ac6c814b6ea14b8a964f4ecbfd15f1207abd26c53efbe5779aaad9b4b256e594f5f6f59ecf911ddfc6eb129295ba11646c +SHA512 (syncthing-source-v1.20.2.tar.gz) = 19b3451cd73141332b84c0d4a406044f94dd83b0d509b47dba5dc834e3e566c65898587f7cb10792c9d47fca3c1a3e4fc934cdce8c01c3403771d1420cedb50b diff --git a/syncthing.spec b/syncthing.spec index e44a0fa..6607031 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.20.1 +%global basever 1.20.2 #%%global rcnum 0 Name: syncthing @@ -40,7 +40,7 @@ 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.1 -Provides: bundled(ForkAwesome) = 1.1.2 +Provides: bundled(ForkAwesome) = 1.2.0 Provides: bundled(jquery) = 2.2.2 Provides: bundled(jquery-fancytree) = 2.38.0 Provides: bundled(jquery-ui) = 1.12.1 From cf834d166ce348876394f78bda0302da050f0b28 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 13 Jul 2022 13:11:37 +0200 Subject: [PATCH 5/6] Update to version 1.20.3; Fixes RHBZ#2104251 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 12 ++++++------ vendor2provides.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e1a29ac..b3fd284 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /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 diff --git a/sources b/sources index 77f94c5..deb5f12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.20.2.tar.gz) = 19b3451cd73141332b84c0d4a406044f94dd83b0d509b47dba5dc834e3e566c65898587f7cb10792c9d47fca3c1a3e4fc934cdce8c01c3403771d1420cedb50b +SHA512 (syncthing-source-v1.20.3.tar.gz) = 153420546ee35ed504e56d23167d803c28c2d3ba97f3f8d4a361489f1fc293e802998a8762fcf9f6986d2aebd9b7c04335f0fb8aa476cfeed41255d6bd7cd857 diff --git a/syncthing.spec b/syncthing.spec index 6607031..0e50347 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.20.2 +%global basever 1.20.3 #%%global rcnum 0 Name: syncthing @@ -57,7 +57,7 @@ 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/alecthomas/kong : MIT -Provides: bundled(golang(github.com/alecthomas/kong)) = 0.3.0 +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/calmh/xdr : MIT @@ -145,17 +145,17 @@ 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.13 +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 @@ -185,7 +185,7 @@ 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)) = 97ac67d +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 diff --git a/vendor2provides.py b/vendor2provides.py index 838c47f..d4fc942 100755 --- a/vendor2provides.py +++ b/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: From 3dfd2d20e4ce51df3038e30ee7c9b8591d379f61 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 18 Aug 2022 15:52:15 +0200 Subject: [PATCH 6/6] Update to version 1.20.4; Fixes RHBZ#2113971 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b3fd284..0880485 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /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 diff --git a/sources b/sources index deb5f12..e5b9dfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.20.3.tar.gz) = 153420546ee35ed504e56d23167d803c28c2d3ba97f3f8d4a361489f1fc293e802998a8762fcf9f6986d2aebd9b7c04335f0fb8aa476cfeed41255d6bd7cd857 +SHA512 (syncthing-source-v1.20.4.tar.gz) = f695cc6d8e6a87b397a11f79f3b5e12565fcea4601da7dd41b681e49913bb48b5164b3648ae68a1d580b77f6a20cc8053e252e24a5c054c52255ece34e90c4f8 diff --git a/syncthing.spec b/syncthing.spec index 0e50347..f220c55 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.20.3 +%global basever 1.20.4 #%%global rcnum 0 Name: syncthing