Update to version 1.28.0; Fixes RHBZ#2319211

Update to version 1.27.12; Fixes RHBZ#2303591
Update to version 1.27.9; Fixes RHBZ#2290442
2024-10-28 12:21:20 +01:00 · 2024-09-09 16:26:04 +02:00 · 2024-08-02 17:30:39 +02:00
6 changed files with 99 additions and 108 deletions
--- a/.gitignore
+++ b/.gitignore
@ -90,8 +90,3 @@
 /syncthing-source-v1.27.9.tar.gz
 /syncthing-source-v1.27.12.tar.gz
 /syncthing-source-v1.28.0.tar.gz
-/syncthing-source-v1.28.1.tar.gz
-/syncthing-source-v1.29.3.tar.gz
-/syncthing-source-v1.29.5.tar.gz
-/syncthing-source-v1.29.6.tar.gz
-/syncthing-source-v1.30.0.tar.gz
--- a/0001-lib-api-api_test-fix-non-constant-format-string.patch
+++ b/0001-lib-api-api_test-fix-non-constant-format-string.patch
@ -1,25 +0,0 @@
-From e983a6d622f5ddc7968fdf06bfc6cf0c027444eb Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Wed, 12 Mar 2025 16:42:24 +0100
-Subject: [PATCH 1/2] lib/api/api_test: fix non-constant format string
-
---
- lib/api/api_test.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/api/api_test.go b/lib/api/api_test.go
-index db5df49..301d41c 100644
--- a/lib/api/api_test.go
-+++ b/lib/api/api_test.go
-@@ -790,7 +790,7 @@ func TestHtmlFormLogin(t *testing.T) {
- 				t.Errorf("Unexpected non-200 return code %d at %s", resp.StatusCode, noAuthPath)
- 			}
- 			if hasSessionCookie(resp.Cookies()) {
-				t.Errorf("Unexpected session cookie at " + noAuthPath)
-+				t.Errorf("Unexpected session cookie at %s", noAuthPath)
- 			}
- 		})
- 	}
-- 
-2.48.1
-
--- a/0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch
+++ b/0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch
@ -0,0 +1,27 @@
+From 0eb79d77f145cb6794ab31506e7a40bdfbbdef10 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Mon, 11 Mar 2024 14:03:37 +0100
+Subject: [PATCH] lib/api/api_test: increase timeout from 1 second to 60
+ seconds
+
+When run in parellel, 1 second is not enough for tests to work reliably.
+---
+ lib/api/api_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/api/api_test.go b/lib/api/api_test.go
+index cfdcb42..8badf19 100644
+--- a/lib/api/api_test.go
+++ b/lib/api/api_test.go
+@@ -444,7 +444,7 @@ func TestAPIServiceRequests(t *testing.T) {
+ // testHTTPRequest tries the given test case, comparing the result code,
+ // content type, and result prefix.
+ func testHTTPRequest(t *testing.T, baseURL string, tc httpTestCase, apikey string) {
+-	timeout := time.Second
+	timeout := 60 * time.Second
+ 	if tc.Timeout > 0 {
+ 		timeout = tc.Timeout
+ 	}
+-- 
+2.44.0
+
--- a/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch
+++ b/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch
@ -1,34 +0,0 @@
-From 4a9469f9969c646098a7d23d387aad150de1259c Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Wed, 12 Mar 2025 16:53:32 +0100
-Subject: [PATCH 2/2] lib/ignore/ignore_test: fix non-constant format string
-
---
- lib/ignore/ignore_test.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/ignore/ignore_test.go b/lib/ignore/ignore_test.go
-index 72a0c4d..6ca5267 100644
--- a/lib/ignore/ignore_test.go
-+++ b/lib/ignore/ignore_test.go
-@@ -1077,7 +1077,7 @@ func TestIssue4901(t *testing.T) {
- 
- 	fd, err := pats.fs.Create(".stignore")
- 	if err != nil {
-		t.Fatalf(err.Error())
-+		t.Fatalf("%s", err.Error())
- 	}
- 	if _, err := fd.Write([]byte(stignore)); err != nil {
- 		t.Fatal(err)
-@@ -1099,7 +1099,7 @@ func TestIssue4901(t *testing.T) {
- 
- 	fd, err = pats.fs.Create("unicorn-lazor-death")
- 	if err != nil {
-		t.Fatalf(err.Error())
-+		t.Fatalf("%s", err.Error())
- 	}
- 	if _, err := fd.Write([]byte(" ")); err != nil {
- 		t.Fatal(err)
-- 
-2.48.1
-
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (syncthing-source-v1.30.0.tar.gz) = 30c69b4dc3373b915da39ecca85c785ecbb19f847b49c1e95e3c5d4417d02415e9a991d3b3d9984f7ae02594d4805c80cf86aba22e33456d352b76a9e5bd3fef
+SHA512 (syncthing-source-v1.28.0.tar.gz) = 1a11a77b7dd6007bd6817cf055ff3c3fca7294e4b0eb32132361dccb94dcc80a46a556f302a3c13bece5580aec3d6d74d23045615bf982975db9858bd2692df2
--- a/syncthing.spec
+++ b/syncthing.spec
@ -1,4 +1,6 @@
-%global basever 1.30.0
+%bcond_with devel
+
+%global basever 1.28.0
 #%%global rcnum   0

 Name:           syncthing
@ -22,10 +24,6 @@ URL:            https://syncthing.net
 # use official release tarball (contains vendored dependencies)
 Source0:        %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz

-# fix compilation failures caused non-constant format strings
-Patch:          0001-lib-api-api_test-fix-non-constant-format-string.patch
-Patch:          0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  systemd-rpm-macros

@ -52,16 +50,12 @@ Provides:       bundled(moment) = 2.19.4

 # github.com/AudriusButkevicius/recli : MPL-2.0
 Provides:       bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8
-# github.com/Azure/azure-sdk-for-go : MIT
-Provides:       bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azcore)) = 1.18.0
-Provides:       bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/internal)) = 1.11.1
-Provides:       bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.1
 # github.com/Azure/go-ntlmssp : MIT
 Provides:       bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693
 # github.com/alecthomas/kong : MIT
-Provides:       bundled(golang(github.com/alecthomas/kong)) = 1.11.0
+Provides:       bundled(golang(github.com/alecthomas/kong)) = 1.2.1
 # github.com/aws/aws-sdk-go : Apache-2.0
-Provides:       bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.7
+Provides:       bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.5
 # github.com/beorn7/perks : MIT
 Provides:       bundled(golang(github.com/beorn7/perks)) = 1.0.1
 # github.com/calmh/incontainer : MIT
@ -78,8 +72,6 @@ Provides:       bundled(golang(github.com/certifi/gocertifi)) = 431795d
 Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = 2.3.0
 # github.com/chmduquesne/rollinghash : MIT
 Provides:       bundled(golang(github.com/chmduquesne/rollinghash)) = 4.0.0+incompatible
-# github.com/coreos/go-semver : Apache-2.0
-Provides:       bundled(golang(github.com/coreos/go-semver)) = 0.3.1
 # github.com/cpuguy83/go-md2man : MIT
 Provides:       bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.5
 # github.com/d4l3k/messagediff : MIT
@ -87,15 +79,15 @@ Provides:       bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1
 # github.com/davecgh/go-spew : ISC
 Provides:       bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
 # github.com/ebitengine/purego : Apache-2.0
-Provides:       bundled(golang(github.com/ebitengine/purego)) = 0.8.3
+Provides:       bundled(golang(github.com/ebitengine/purego)) = 0.8.0
 # github.com/fsnotify/fsnotify : BSD-3-Clause
 Provides:       bundled(golang(github.com/fsnotify/fsnotify)) = 1.7.0
 # github.com/getsentry/raven-go : BSD-3-Clause
 Provides:       bundled(golang(github.com/getsentry/raven-go)) = 0.2.0
 # github.com/go-asn1-ber/asn1-ber : MIT
-Provides:       bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 2923003
+Provides:       bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 1.5.7
 # github.com/go-ldap/ldap : MIT
-Provides:       bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.11
+Provides:       bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.8
 # github.com/go-ole/go-ole : MIT
 Provides:       bundled(golang(github.com/go-ole/go-ole)) = 1.3.0
 # github.com/go-task/slim-sprig : MIT
@ -104,10 +96,12 @@ Provides:       bundled(golang(github.com/go-task/slim-sprig/v3)) = 3.0.0
 Provides:       bundled(golang(github.com/gobwas/glob)) = 0.2.3
 # github.com/gofrs/flock : BSD-3-Clause
 Provides:       bundled(golang(github.com/gofrs/flock)) = 0.12.1
+# github.com/gogo/protobuf : BSD-3-Clause
+Provides:       bundled(golang(github.com/gogo/protobuf)) = 1.3.2
 # github.com/golang/snappy : BSD-3-Clause
 Provides:       bundled(golang(github.com/golang/snappy)) = 0.0.4
 # github.com/google/pprof : Apache-2.0
-Provides:       bundled(golang(github.com/google/pprof)) = 337e5dd
+Provides:       bundled(golang(github.com/google/pprof)) = f4c0cfd
 # github.com/google/uuid : BSD-3-Clause
 Provides:       bundled(golang(github.com/google/uuid)) = 1.6.0
 # github.com/greatroar/blobloom : Apache-2.0
@ -119,7 +113,7 @@ Provides:       bundled(golang(github.com/hashicorp/go-multierror)) = 1.1.1
 # github.com/hashicorp/golang-lru : MPL-2.0
 Provides:       bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.7
 # github.com/jackpal/gateway : BSD-3-Clause
-Provides:       bundled(golang(github.com/jackpal/gateway)) = 1.0.16
+Provides:       bundled(golang(github.com/jackpal/gateway)) = 1.0.15
 # github.com/jackpal/go-nat-pmp : Apache-2.0
 Provides:       bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2
 # github.com/jmespath/go-jmespath : Apache-2.0
@ -128,12 +122,16 @@ Provides:       bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0
 Provides:       bundled(golang(github.com/julienschmidt/httprouter)) = 1.3.0
 # github.com/kballard/go-shellquote : MIT
 Provides:       bundled(golang(github.com/kballard/go-shellquote)) = 95032a8
+# github.com/lib/pq : MIT
+Provides:       bundled(golang(github.com/lib/pq)) = 1.10.9
+# github.com/klauspost/compress : BSD-3-Clause AND Apache-2.0
+Provides:       bundled(golang(github.com/klauspost/compress)) = 1.17.10
 # github.com/lufia/plan9stats : BSD-3-Clause
 Provides:       bundled(golang(github.com/lufia/plan9stats)) = 873cd01
 # github.com/maruel/panicparse : Apache-2.0
-Provides:       bundled(golang(github.com/maruel/panicparse/v2)) = 2.5.0
+Provides:       bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1
 # github.com/maxbrunsfeld/counterfeiter : MIT
-Provides:       bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.11.2
+Provides:       bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.8.1
 # github.com/maxmind/geoipupdate : Apache-2.0 OR MIT
 Provides:       bundled(golang(github.com/maxmind/geoipupdate/v6)) = 6.1.0
 # github.com/miscreant/miscreant.go : MIT
@ -143,13 +141,13 @@ Provides:       bundled(golang(github.com/munnerz/goautoneg)) = a7dc8b6
 # github.com/nxadm/tail : MIT
 Provides:       bundled(golang(github.com/nxadm/tail)) = 1.4.11
 # github.com/onsi/ginkgo : MIT
-Provides:       bundled(golang(github.com/onsi/ginkgo/v2)) = 2.23.4
+Provides:       bundled(golang(github.com/onsi/ginkgo/v2)) = 2.20.2
 # github.com/oschwald/geoip2-golang : ISC
 Provides:       bundled(golang(github.com/oschwald/geoip2-golang)) = 1.11.0
 # github.com/oschwald/maxminddb-golang : ISC
 Provides:       bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.13.1
 # github.com/pierrec/lz4 : BSD-3-Clause
-Provides:       bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.22
+Provides:       bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.21
 # github.com/pkg/errors : BSD-2-Clause
 Provides:       bundled(golang(github.com/pkg/errors)) = 0.9.1
 # github.com/pmezard/go-difflib : BSD-3-Clause
@ -159,43 +157,43 @@ Provides:       bundled(golang(github.com/posener/complete)) = 1.2.3
 # github.com/power-devops/perfstat : MIT
 Provides:       bundled(golang(github.com/power-devops/perfstat)) = 82ca368
 # github.com/prometheus/client_golang : Apache-2.0
-Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.22.0
+Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.20.4
 # github.com/prometheus/client_model : Apache-2.0
 Provides:       bundled(golang(github.com/prometheus/client_model)) = 0.6.1
 # github.com/prometheus/common : Apache-2.0
-Provides:       bundled(golang(github.com/prometheus/common)) = 0.62.0
+Provides:       bundled(golang(github.com/prometheus/common)) = 0.60.0
 # github.com/prometheus/procfs : Apache-2.0
 Provides:       bundled(golang(github.com/prometheus/procfs)) = 0.15.1
 # github.com/puzpuzpuz/xsync : Apache-2.0
-Provides:       bundled(golang(github.com/puzpuzpuz/xsync/v3)) = 3.5.1
+Provides:       bundled(golang(github.com/puzpuzpuz/xsync/v3)) = 3.4.0
 # github.com/quic-go/quic-go : MIT
-Provides:       bundled(golang(github.com/quic-go/quic-go)) = 0.52.0
+Provides:       bundled(golang(github.com/quic-go/quic-go)) = 0.47.0
 # github.com/rabbitmq/amqp091-go : BSD-2-Clause
 Provides:       bundled(golang(github.com/rabbitmq/amqp091-go)) = 1.10.0
 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views
-Provides:       bundled(golang(github.com/rcrowley/go-metrics)) = 65e299d
+Provides:       bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc
 # github.com/riywo/loginshell : MIT
 Provides:       bundled(golang(github.com/riywo/loginshell)) = 7d26008
 # github.com/russross/blackfriday : BSD-2-Clause
 Provides:       bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0
 # github.com/shirou/gopsutil : BSD-3-Clause
-Provides:       bundled(golang(github.com/shirou/gopsutil/v4)) = 4.25.4
+Provides:       bundled(golang(github.com/shirou/gopsutil/v4)) = 4.24.9
 # github.com/stretchr/objx : MIT
 Provides:       bundled(golang(github.com/stretchr/objx)) = 0.5.2
 # github.com/stretchr/testify : MIT
-Provides:       bundled(golang(github.com/stretchr/testify)) = 1.10.0
+Provides:       bundled(golang(github.com/stretchr/testify)) = 1.9.0
 # github.com/syncthing/notify : MIT
-Provides:       bundled(golang(github.com/syncthing/notify)) = c7027d4
+Provides:       bundled(golang(github.com/syncthing/notify)) = c6b7342
 # github.com/syndtr/goleveldb : BSD-2-Clause
 Provides:       bundled(golang(github.com/syndtr/goleveldb)) = 126854a
 # github.com/thejerf/suture : MIT
-Provides:       bundled(golang(github.com/thejerf/suture/v4)) = 4.0.6
+Provides:       bundled(golang(github.com/thejerf/suture/v4)) = 4.0.5
 # github.com/tklauser/go-sysconf : BSD-3-Clause
 Provides:       bundled(golang(github.com/tklauser/go-sysconf)) = 0.3.14
 # github.com/tklauser/numcpus : Apache-2.0
-Provides:       bundled(golang(github.com/tklauser/numcpus)) = 0.9.0
+Provides:       bundled(golang(github.com/tklauser/numcpus)) = 0.8.0
 # github.com/urfave/cli : MIT
-Provides:       bundled(golang(github.com/urfave/cli)) = 1.22.16
+Provides:       bundled(golang(github.com/urfave/cli)) = 1.22.15
 # github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause
 Provides:       bundled(golang(github.com/vitrun/qart)) = bf64b92
 # github.com/willabides/kongplete : MIT
@ -205,25 +203,27 @@ Provides:       bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.4
 # go.uber.org/automaxprocs : MIT
 Provides:       bundled(golang(go.uber.org/automaxprocs)) = 1.6.0
 # go.uber.org/mock : Apache-2.0
-Provides:       bundled(golang(go.uber.org/mock)) = 0.5.2
+Provides:       bundled(golang(go.uber.org/mock)) = 0.4.0
 # golang.org/x/crypto : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/crypto)) = 0.38.0
+Provides:       bundled(golang(golang.org/x/crypto)) = 0.27.0
+# golang.org/x/exp : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/exp)) = 701f63a
 # golang.org/x/mod : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/mod)) = 0.24.0
+Provides:       bundled(golang(golang.org/x/mod)) = 0.21.0
 # golang.org/x/net : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/net)) = 0.40.0
+Provides:       bundled(golang(golang.org/x/net)) = 0.29.0
 # golang.org/x/sync : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/sync)) = 0.14.0
+Provides:       bundled(golang(golang.org/x/sync)) = 0.8.0
 # golang.org/x/sys : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/sys)) = 0.33.0
+Provides:       bundled(golang(golang.org/x/sys)) = 0.25.0
 # golang.org/x/text : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/text)) = 0.25.0
+Provides:       bundled(golang(golang.org/x/text)) = 0.18.0
 # golang.org/x/time : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/time)) = 0.11.0
+Provides:       bundled(golang(golang.org/x/time)) = 0.6.0
 # golang.org/x/tools : BSD-3-Clause
-Provides:       bundled(golang(golang.org/x/tools)) = 0.33.0
+Provides:       bundled(golang(golang.org/x/tools)) = 0.25.0
 # google.golang.org/protobuf : BSD-3-Clause
-Provides:       bundled(golang(google.golang.org/protobuf)) = 1.36.6
+Provides:       bundled(golang(google.golang.org/protobuf)) = 1.34.2
 # gopkg.in/yaml.v3 : MIT AND Apache-2.0
 Provides:       bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 # sigs.k8s.io/yaml : MIT AND BSD-3-Clause AND (MIT OR Apache-2.0)
@ -239,6 +239,23 @@ that control is returned to you.
 This package contains the syncthing client binary and systemd services.


+%if %{with devel}
+%package        devel
+Summary:        Continuous File Synchronization (development files)
+BuildArch:      noarch
+
+%description    devel
+Syncthing replaces other file synchronization services with something
+open, trustworthy and decentralized. Your data is your data alone and
+you deserve to choose where it is stored, if it is shared with some
+third party and how it's transmitted over the Internet. Using syncthing,
+that control is returned to you.
+
+This package contains the syncthing sources, which are needed as
+dependency for building packages using syncthing.
+%endif
+
+
 %package        tools
 Summary:        Continuous File Synchronization (server tools)

@ -348,6 +365,10 @@ for i in $(find -name "*.go" -type f -executable -print); do
    chmod a-x $i;
 done

+%if %{with devel}
+%goinstall
+%endif
+

 %check
 desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
@ -450,5 +471,12 @@ export GO111MODULE=off
 %{_mandir}/man1/strelaysrv*


+%if %{with devel}
+%files devel -f devel.file-list
+%license LICENSE
+%doc README.md AUTHORS
+%endif
+
+
 %changelog
 %autochangelog
Author	SHA1	Message	Date
Fabio Valentini	552c08a434	Update to version 1.28.0; Fixes RHBZ#2319211	2024-10-28 12:21:20 +01:00
Fabio Valentini	c279983abd	Update to version 1.27.12; Fixes RHBZ#2303591	2024-09-09 16:26:04 +02:00
Fabio Valentini	9a60072724	Update to version 1.27.9; Fixes RHBZ#2290442	2024-08-02 17:30:39 +02:00