public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/syncthing] epel10: Update to version 2.0.11
@ 2026-07-05 13:43 Fabio Valentini
0 siblings, 0 replies; only message in thread
From: Fabio Valentini @ 2026-07-05 13:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/syncthing
Branch : epel10
Commit : 7b3c833a6333d7fa2bd82565ab1b821326541ce9
Author : Fabio Valentini <decathorpe@gmail.com>
Date : 2026-07-05T15:36:02+02:00
Stats : +235/-423 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/syncthing/c/7b3c833a6333d7fa2bd82565ab1b821326541ce9?branch=epel10
Log:
Update to version 2.0.11
---
diff --git a/.gitignore b/.gitignore
index 96d755b..36e3c11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,5 @@
/syncthing-source-v1.29.5.tar.gz
/syncthing-source-v1.29.6.tar.gz
/syncthing-source-v1.30.0.tar.gz
+/syncthing-2.0.11.tar.gz
+/syncthing-2.0.11-vendor.tar.xz
diff --git a/0001-lib-api-api_test-fix-non-constant-format-string.patch b/0001-lib-api-api_test-fix-non-constant-format-string.patch
deleted file mode 100644
index 20f22c2..0000000
--- a/0001-lib-api-api_test-fix-non-constant-format-string.patch
+++ /dev/null
@@ -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
-
diff --git a/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch b/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch
deleted file mode 100644
index 68eb294..0000000
--- a/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch
+++ /dev/null
@@ -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
-
diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml
new file mode 100644
index 0000000..b109f28
--- /dev/null
+++ b/go-vendor-tools.toml
@@ -0,0 +1,124 @@
+[archive]
+
+[licensing]
+detector = "askalono"
+exclude_files = [
+ "vendor/modernc.org/memory/LICENSE-LOGO",
+ "vendor/modernc.org/sqlite/SQLITE-LICENSE",
+]
+
+[[licensing.licenses]]
+path = "gui/default/vendor/angular/angular.js.LICENSE"
+sha256sum = "437ec3967fa345a09f6ce1aba460f75615c673176f2ebaa1d55567985d5ab396"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/angular/angular-dirPagination.js.LICENSE"
+sha256sum = "96dcdcf4bf781efbb07a1912e9364d144f02ad57d7cb7a07ed351d1f56c402ef"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/angular/angular-sanitize.js.LICENSE"
+sha256sum = "437ec3967fa345a09f6ce1aba460f75615c673176f2ebaa1d55567985d5ab396"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/angular/angular-translate.js.LICENSE"
+sha256sum = "3da1d32ec770167a2f1ad71081f9ceff378e772abb1e95a98457d47d5663c3bc"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/angular/angular-translate-loader-static-files.js.LICENSE"
+sha256sum = "3da1d32ec770167a2f1ad71081f9ceff378e772abb1e95a98457d47d5663c3bc"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/bootstrap/LICENSE"
+sha256sum = "8a68c27ad022244b78dc5c9adb4cc5a4c92a994e3e11d356b291f227b2b04eaf"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/daterangepicker/LICENSE"
+sha256sum = "27579d0338d6518d037e68fcdf425c47d85622d7fe1a2db419e4f7d1ab68e778"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fancytree/LICENSE.txt"
+sha256sum = "103a2968d5ae066aa86ba2a48ba8c2fc56d3a6f4b0552d5bf864b123edfdfaff"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/jquery/LICENSE"
+sha256sum = "1492c0e73c53aebf5ba8b3126d8465fae606ffb1f7dc81c7873ad7db7204bbd1"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/moment/LICENSE"
+sha256sum = "8f38f320bbf5eb84c08e08676f7ee1d2204ebe5797f6a090d077329cf212fca3"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/HumanizeDuration.js/LICENSE.txt"
+sha256sum = "cfc340be21de2b0080963aefc20c97af153b2feb6787f28354bc95e0e20b9d75"
+expression = "MIT OR Unlicense"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fork-awesome/css/fork-awesome.css"
+sha256sum = "8f1d99c389a564499c57ee8c638850650a54280ea41bdea93b736906f7c74bec"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fork-awesome/css/v5-compat.css"
+sha256sum = "6483203b5d427de309c65d894046d8469730b8faeb1fef2356574f3d331bb466"
+expression = "MIT"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fork-awesome/fonts/forkawesome-webfont.eot"
+sha256sum = "62c52951be321c21d87dbf076af0d199f6e8d51e27e6eddf80bd4d5b737497d0"
+expression = "OFL-1.1"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fork-awesome/fonts/forkawesome-webfont.svg"
+sha256sum = "d491dbcb3248d003412deafab505433d2e09d59a1dd748fcf7c6dbd7b38e0816"
+expression = "OFL-1.1"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fork-awesome/fonts/forkawesome-webfont.ttf"
+sha256sum = "4f319287827e35f841069eb471c092eccf97d2f7830aa4d8bd7301ded418bf49"
+expression = "OFL-1.1"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fork-awesome/fonts/forkawesome-webfont.woff"
+sha256sum = "006708d6691753cfc46eec2dae88fbdafa22823a89194149d9f223050dc78998"
+expression = "OFL-1.1"
+
+[[licensing.licenses]]
+path = "gui/default/vendor/fork-awesome/fonts/forkawesome-webfont.woff2"
+sha256sum = "8810ba3440bf482ced33d2f74b7803bba711f689d8e4caa7da5c6ae6844a1b49"
+expression = "OFL-1.1"
+
+[[licensing.licenses]]
+path = "vendor/github.com/maxmind/geoipupdate/v6/LICENSE-APACHE"
+sha256sum = "aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe"
+expression = "Apache-2.0 OR MIT"
+
+[[licensing.licenses]]
+path = "vendor/github.com/maxmind/geoipupdate/v6/LICENSE-MIT"
+sha256sum = "91276db973f25602d1aa43491f59cbc84cb88e6f151e1d0cc82a755563ce0195"
+expression = "Apache-2.0 OR MIT"
+
+[[licensing.licenses]]
+path = "vendor/github.com/shirou/gopsutil/v4/LICENSE"
+sha256sum = "ad1e64b82c04fb2ee6bfe521bff01266971ffaa70500024d4ac767c6033aafb9"
+expression = "BSD-3-Clause"
+
+[[licensing.licenses]]
+path = "vendor/gopkg.in/yaml.v3/LICENSE"
+sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b"
+expression = "Apache-2.0 AND MIT"
+
+[[licensing.licenses]]
+path = "vendor/modernc.org/libc/COPYRIGHT-MUSL"
+sha256sum = "f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af"
+expression = "MIT"
+
diff --git a/sources b/sources
index cb41ca6..a4cd47f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (syncthing-source-v1.30.0.tar.gz) = 30c69b4dc3373b915da39ecca85c785ecbb19f847b49c1e95e3c5d4417d02415e9a991d3b3d9984f7ae02594d4805c80cf86aba22e33456d352b76a9e5bd3fef
+SHA512 (syncthing-2.0.11.tar.gz) = 2939b0a58482d16f7553818a137e1d11699c63879013eeea65118287e33c72a4ec1a4fd6c7b779e2f705c65480a1984cdc44e67961f8ee2aa0117b914d8ae6b8
+SHA512 (syncthing-2.0.11-vendor.tar.xz) = dea1d97b7f8c3c2289ecadd53d02e2576d94a5e0c9b8bc7681edf641cd29f8df8f2aa1884c72d1fb211d72e32d4ec812330617febfbaf57f3374619d42828bbd
diff --git a/syncthing.rpmlintrc b/syncthing.rpmlintrc
deleted file mode 100644
index 3e9a54e..0000000
--- a/syncthing.rpmlintrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# don't care about manpages
-addFilter("W: no-manual-page-for-binary *")
-
-# this is expected for golang packages
-addFilter("W: hidden-file-or-dir /usr/share/gocode/src/github.com/syncthing/syncthing/.goipath*")
diff --git a/syncthing.spec b/syncthing.spec
index 563d026..d3379f8 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -1,33 +1,29 @@
-%global basever 1.30.0
-#%%global rcnum 0
+# Generated by go2rpm 1.18.0
+%bcond check 1
-Name: syncthing
-Summary: Continuous File Synchronization
-Version: %{basever}%{?rcnum:~rc%{rcnum}}
-Release: %autorelease
-
-%global goipath github.com/syncthing/syncthing
-%global tag v%{basever}%{?rcnum:-rc.%{rcnum}}
+# https://github.com/syncthing/syncthing
+%global goipath github.com/syncthing/syncthing
+Version: 2.0.11
-%gometa -f
+%gometa -L -f
-# syncthing (MPL-2.0) bundles
-# - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT),
-# - HumanizeDuration (MIT OR Unlicense),
-# - ForkAwesome (MIT, OFL-1.1, CC-BY-3.0), and
-# - a number of go packages (Apache-2.0, BSD-2-Clause, BSD-2-Clause-Views, BSD-3-Clause, ISC, MIT, MPL-2.0)
-License: MPL-2.0 AND Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC-BY-3.0 AND ISC AND MIT AND OFL-1.1 AND (Apache-2.0 OR MIT) AND (MIT OR Unlicense)
+Name: syncthing
+Release: %autorelease
+Summary: Continuous File Synchronization
-URL: https://syncthing.net
-# use official release tarball (contains vendored dependencies)
-Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz
+# Generated by go-vendor-tools
+License: Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND OFL-1.1 AND (Apache-2.0 OR MIT) AND (MIT OR Unlicense)
-# 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
+URL: %{gourl}
+Source0: %{gosource}
+# Generated by go-vendor-tools
+Source1: %{archivename}-vendor.tar.xz
+Source2: go-vendor-tools.toml
+BuildRequires: go-vendor-tools
BuildRequires: desktop-file-utils
BuildRequires: systemd-rpm-macros
+BuildRequires: sqlite-devel
Requires: hicolor-icon-theme
@@ -42,192 +38,12 @@ Provides: bundled(daterangepicker) = 3.1
Provides: bundled(ForkAwesome) = 1.2.0
Provides: bundled(HumanizeDuration.js)
Provides: bundled(jquery) = 2.2.2
-Provides: bundled(jquery-fancytree) = 2.38.0
-Provides: bundled(jquery-ui) = 1.12.1
+Provides: bundled(jquery-fancytree) = 2.38.5
+Provides: bundled(jquery-ui) = 1.14.1
Provides: bundled(moment) = 2.19.4
-# automatically generated Provides for bundled go dependencies
-# manually check licenses for new deps and update License tag if necessary
-# generate with "./vendor2provides.py path/to/vendor/modules.txt"
-
-# 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
-# github.com/aws/aws-sdk-go : Apache-2.0
-Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.7
-# github.com/beorn7/perks : MIT
-Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1
-# github.com/calmh/incontainer : MIT
-Provides: bundled(golang(github.com/calmh/incontainer)) = 1.0.0
-# github.com/calmh/xdr : MIT
-Provides: bundled(golang(github.com/calmh/xdr)) = 1.2.0
-# github.com/ccding/go-stun : Apache-2.0
-Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.5
-# github.com/cenkalti/backoff : MIT
-Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.3.0
-# github.com/certifi/gocertifi : MPL-2.0
-Provides: bundled(golang(github.com/certifi/gocertifi)) = 431795d
-# github.com/cespare/xxhash : MIT
-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
-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
-# 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
-# github.com/go-ldap/ldap : MIT
-Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.11
-# 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
-Provides: bundled(golang(github.com/go-task/slim-sprig/v3)) = 3.0.0
-# github.com/gobwas/glob : MIT
-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/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
-# github.com/google/uuid : BSD-3-Clause
-Provides: bundled(golang(github.com/google/uuid)) = 1.6.0
-# github.com/greatroar/blobloom : Apache-2.0
-Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.8.0
-# github.com/hashicorp/errwrap : MPL-2.0
-Provides: bundled(golang(github.com/hashicorp/errwrap)) = 1.1.0
-# github.com/hashicorp/go-multierror : MPL-2.0
-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
-# 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
-Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0
-# github.com/julienschmidt/httprouter : BSD-3-Clause
-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/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
-# github.com/maxbrunsfeld/counterfeiter : MIT
-Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.11.2
-# 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
-Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763
-# github.com/munnerz/goautoneg : BSD-3-Clause
-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
-# 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
-# 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
-Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
-# github.com/posener/complete : MIT
-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
-# 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
-# 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
-# github.com/quic-go/quic-go : MIT
-Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.52.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
-# 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
-# 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
-# github.com/syncthing/notify : MIT
-Provides: bundled(golang(github.com/syncthing/notify)) = c7027d4
-# 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
-# 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
-# github.com/urfave/cli : MIT
-Provides: bundled(golang(github.com/urfave/cli)) = 1.22.16
-# github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause
-Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92
-# github.com/willabides/kongplete : MIT
-Provides: bundled(golang(github.com/willabides/kongplete)) = 0.4.0
-# github.com/yusufpapurcu/wmi : MIT
-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
-# golang.org/x/crypto : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/crypto)) = 0.38.0
-# golang.org/x/mod : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/mod)) = 0.24.0
-# golang.org/x/net : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/net)) = 0.40.0
-# golang.org/x/sync : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/sync)) = 0.14.0
-# golang.org/x/sys : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/sys)) = 0.33.0
-# golang.org/x/text : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/text)) = 0.25.0
-# golang.org/x/time : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/time)) = 0.11.0
-# golang.org/x/tools : BSD-3-Clause
-Provides: bundled(golang(golang.org/x/tools)) = 0.33.0
-# google.golang.org/protobuf : BSD-3-Clause
-Provides: bundled(golang(google.golang.org/protobuf)) = 1.36.6
-# 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)
-Provides: bundled(golang(sigs.k8s.io/yaml)) = 1.4.0
+# sqlite bundled in github.com/mattn/go-sqlite3
+Provides: bundled(sqlite) = 3.50.3
%description
Syncthing replaces other file synchronization services with something
@@ -238,7 +54,6 @@ that control is returned to you.
This package contains the syncthing client binary and systemd services.
-
%package tools
Summary: Continuous File Synchronization (server tools)
@@ -256,62 +71,40 @@ This package contains the main syncthing server tools:
* stdiscosrv, the syncthing discovery server for discovering nodes
to connect to indirectly over the internet.
-
%prep
-%autosetup -n %{name} -p1
+%goprep -A
+%setup -q -T -D -a1 %{forgesetupargs}
+%autopatch -p1
+%generate_buildrequires
+%go_vendor_license_buildrequires -c %{S:2}
%build
-export GO111MODULE=off
-
-# remove bundled libraries
-#rm -r vendor
-
-# prepare build environment
-mkdir -p ./_build/src/github.com/syncthing
-
-TOP=$(pwd)
-pushd _build/src/github.com/syncthing
-ln -s $TOP syncthing
-popd
-
-export GOPATH=$(pwd)/_build:%{gopath}
-export BUILDDIR=$(pwd)/_build/src/%{goipath}
-
-# compile assets used by the build process
-pushd _build/src/%{goipath}
+%global gomodulesmode GO111MODULE=on
go run build.go assets
-rm build.go
-popd
# set variables expected by syncthing binaries as additional FOOFLAGS
export BUILD_HOST=fedora-koji
-export COMMON_LDFLAGS="-X %{goipath}/lib/build.Version=%{tag} -X %{goipath}/lib/build.Stamp=$SOURCE_DATE_EPOCH -X %{goipath}/lib/build.User=$USER -X %{goipath}/lib/build.Host=$BUILD_HOST"
-export BUILDTAGS="noupgrade"
-
-export LDFLAGS="-X %{goipath}/lib/build.Program=syncthing $COMMON_LDFLAGS"
-%gobuild -o _bin/syncthing %{goipath}/cmd/syncthing
-
-export LDFLAGS="-X %{goipath}/lib/build.Program=stdiscosrv $COMMON_LDFLAGS"
-%gobuild -o _bin/stdiscosrv %{goipath}/cmd/stdiscosrv
-
-export LDFLAGS="-X %{goipath}/lib/build.Program=strelaysrv $COMMON_LDFLAGS"
-%gobuild -o _bin/strelaysrv %{goipath}/cmd/strelaysrv
-
-export LDFLAGS="-X %{goipath}/lib/build.Program=strelaypoolsrv $COMMON_LDFLAGS"
-%gobuild -o _bin/strelaypoolsrv %{goipath}/cmd/infra/strelaypoolsrv
-
+export COMMON_LDFLAGS="-X %{goipath}/lib/build.Version=v%{version} -X %{goipath}/lib/build.Stamp=$SOURCE_DATE_EPOCH -X %{goipath}/lib/build.User=$USER -X %{goipath}/lib/build.Host=$BUILD_HOST"
+# noupgrade: disable syncthing self-update functionality
+# libsqlite3 / cgo: link system libsqlite3
+export GO_BUILDTAGS="noupgrade libsqlite3 cgo"
+
+for cmd in cmd/syncthing cmd/stdiscosrv cmd/strelaysrv cmd/infra/strelaypoolsrv ; do
+ export GO_LDFLAGS="-X %{goipath}/lib/build.Program=$(basename $cmd) $COMMON_LDFLAGS"
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
+done
%install
-export GO111MODULE=off
+%go_vendor_license_install -c %{S:2}
# install binaries
mkdir -p %{buildroot}/%{_bindir}
-cp -pav _bin/syncthing %{buildroot}/%{_bindir}/
-cp -pav _bin/stdiscosrv %{buildroot}/%{_bindir}/
-cp -pav _bin/strelaysrv %{buildroot}/%{_bindir}/
-cp -pav _bin/strelaypoolsrv %{buildroot}/%{_bindir}/
+cp -pav %{gobuilddir}/bin/syncthing %{buildroot}/%{_bindir}/
+cp -pav %{gobuilddir}/bin/stdiscosrv %{buildroot}/%{_bindir}/
+cp -pav %{gobuilddir}/bin/strelaysrv %{buildroot}/%{_bindir}/
+cp -pav %{gobuilddir}/bin/strelaypoolsrv %{buildroot}/%{_bindir}/
# install man pages
mkdir -p %{buildroot}/%{_mandir}/man1
@@ -343,112 +136,120 @@ mkdir -p %{buildroot}/%{_userunitdir}
cp -pav etc/linux-systemd/system/syncthing@.service %{buildroot}/%{_unitdir}/
cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/
-# unmark source files as executable
-for i in $(find -name "*.go" -type f -executable -print); do
- chmod a-x $i;
-done
+%post
+%systemd_post 'syncthing@.service'
+%systemd_user_post syncthing.service
+%preun
+%systemd_preun 'syncthing@*.service'
+%systemd_user_preun syncthing.service
+
+%postun
+%systemd_postun_with_restart 'syncthing@*.service'
+%systemd_user_postun_with_restart syncthing.service
%check
+%go_vendor_license_check -c %{S:2}
desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
+%if %{with check}
export LANG=C.utf8
-export GOPATH=$(pwd)/_build:%{gopath}
-export GO111MODULE=off
-
+export GO_BUILDTAGS="noupgrade libsqlite3 cgo"
+# for ~some~ reason using %%gochecks causes test failures
%gotest %{goipath}/cmd/stdiscosrv
-%gotest %{goipath}/cmd/infra/strelaypoolsrv
+%gotest %{goipath}/cmd/strelaysrv
%gotest %{goipath}/cmd/syncthing
+%gotest %{goipath}/cmd/syncthing/cli
+%gotest %{goipath}/cmd/syncthing/decrypt
+%gotest %{goipath}/cmd/syncthing/generate
+%gotest %{goipath}/internal/blob
+%gotest %{goipath}/internal/blob/azureblob
+%gotest %{goipath}/internal/blob/s3
+%gotest %{goipath}/internal/db
+%gotest %{goipath}/internal/db/olddb
+%gotest %{goipath}/internal/db/olddb/backend
+%gotest %{goipath}/internal/db/sqlite
+%gotest %{goipath}/internal/gen/apiproto
+%gotest %{goipath}/internal/gen/bep
+%gotest %{goipath}/internal/gen/dbproto
+%gotest %{goipath}/internal/gen/discoproto
+%gotest %{goipath}/internal/gen/discosrv
+%gotest %{goipath}/internal/itererr
+%gotest %{goipath}/internal/protoutil
+%gotest %{goipath}/internal/slogutil
+%gotest %{goipath}/internal/timeutil
%gotest %{goipath}/lib/api
+%gotest %{goipath}/lib/api/auto
+%gotest %{goipath}/lib/assets
+%gotest %{goipath}/lib/automaxprocs
%gotest %{goipath}/lib/beacon
+%gotest %{goipath}/lib/build
%gotest %{goipath}/lib/config
-
-# This test times out on s390x
-%gotest %{goipath}/lib/connections || :
-
-%gotest %{goipath}/lib/db
+%gotest %{goipath}/lib/config/mocks
+%gotest %{goipath}/lib/connections
+%gotest %{goipath}/lib/connections/mocks
+%gotest %{goipath}/lib/connections/registry
%gotest %{goipath}/lib/dialer
%gotest %{goipath}/lib/discover
+%gotest %{goipath}/lib/discover/mocks
%gotest %{goipath}/lib/events
-
-# This test fails on SELinux-enabled systems:
-# https://github.com/syncthing/syncthing/issues/8601
-%gotest %{goipath}/lib/fs || :
-
+%gotest %{goipath}/lib/events/mocks
+%gotest %{goipath}/lib/fs
+%gotest %{goipath}/lib/geoip
+%gotest %{goipath}/lib/httpcache
%gotest %{goipath}/lib/ignore
-%gotest %{goipath}/lib/logger
-
-# This test sometimes fails dependent on load on some architectures:
-# https://github.com/syncthing/syncthing/issues/4370
-%gotest %{goipath}/lib/model || :
-
+%gotest %{goipath}/lib/ignore/ignoreresult
+%gotest %{goipath}/lib/locations
+%gotest %{goipath}/lib/model
+%gotest %{goipath}/lib/model/mocks
%gotest %{goipath}/lib/nat
+%gotest %{goipath}/lib/netutil
%gotest %{goipath}/lib/osutil
%gotest %{goipath}/lib/pmp
%gotest %{goipath}/lib/protocol
+%gotest %{goipath}/lib/protocol/mocks
%gotest %{goipath}/lib/rand
+%gotest %{goipath}/lib/rc
%gotest %{goipath}/lib/relay/client
%gotest %{goipath}/lib/relay/protocol
%gotest %{goipath}/lib/scanner
%gotest %{goipath}/lib/semaphore
%gotest %{goipath}/lib/signature
+%gotest %{goipath}/lib/sliceutil
%gotest %{goipath}/lib/stats
%gotest %{goipath}/lib/stringutil
%gotest %{goipath}/lib/structutil
+%gotest %{goipath}/lib/stun
%gotest %{goipath}/lib/svcutil
-%gotest %{goipath}/lib/sync
%gotest %{goipath}/lib/syncthing
+%gotest %{goipath}/lib/syncutil
+%gotest %{goipath}/lib/testutil
%gotest %{goipath}/lib/tlsutil
%gotest %{goipath}/lib/upgrade
%gotest %{goipath}/lib/upnp
-
-# This test sometimes fails dependent on load on some architectures:
-# https://github.com/syncthing/syncthing/issues/4351
-%gotest %{goipath}/lib/versioner || :
-
+%gotest %{goipath}/lib/ur
+%gotest %{goipath}/lib/ur/contract
+%gotest %{goipath}/lib/versioner
%gotest %{goipath}/lib/watchaggregator
-%gotest %{goipath}/lib/weakhash
-
-
-%post
-%systemd_post 'syncthing@.service'
-%systemd_user_post syncthing.service
+%gotest %{goipath}/meta
+%endif
-%preun
-%systemd_preun 'syncthing@*.service'
-%systemd_user_preun syncthing.service
-
-%postun
-%systemd_postun_with_restart 'syncthing@*.service'
-%systemd_user_postun_with_restart syncthing.service
-
-
-%files
-%license LICENSE
+%files -f %{go_vendor_license_filelist}
%doc README.md AUTHORS
-
%{_bindir}/syncthing
-
%{_datadir}/applications/syncthing*.desktop
%{_datadir}/icons/hicolor/*/apps/syncthing.*
-
%{_mandir}/*/syncthing*
-
%{_unitdir}/syncthing@.service
%{_userunitdir}/syncthing.service
-
-%files tools
-%license LICENSE
+%files tools -f %{go_vendor_license_filelist}
%doc README.md AUTHORS
-
%{_bindir}/stdiscosrv
%{_bindir}/strelaysrv
%{_bindir}/strelaypoolsrv
-
%{_mandir}/man1/stdiscosrv*
%{_mandir}/man1/strelaysrv*
-
%changelog
%autochangelog
diff --git a/vendor2provides.py b/vendor2provides.py
deleted file mode 100755
index ce1afb8..0000000
--- a/vendor2provides.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python3
-
-# vendor2provides.py
-# ==================
-#
-# Parse modules.txt files into rpm .spec file Provides for bundled dependencies.
-# Written by Fabio "decathorpe" Valentini <decathorpe@fedoraproject.org> for
-# the fedora syncthing package: https://src.fedoraproject.org/rpms/syncthing
-#
-# SPDX-License-Identifier: Unlicense
-
-import os
-import sys
-
-
-def main() -> int:
- if len(sys.argv) < 2:
- print("No path to 'modules.txt' file given.")
- return 1
-
- path = sys.argv[1]
-
- with open(path) as file:
- contents = file.read()
-
- lines = contents.split("\n")
-
- # dependencies = filter lines for "# package version"
- dependencies = list(filter(lambda line: line.startswith("# "), lines))
-
- # parse vendored dependencies into (import path, version) pairs
- vendored = list()
- for dep in dependencies:
- ipath, version = dep[2:].split(" ")[:2]
-
- # check for git snapshots
- if len(version) > 27:
- # return only 7 digits of git commit hash
- version = version[-12:-1][0:7]
- else:
- # strip off leading "v"
- version = version.lstrip("v")
-
- vendored.append((ipath, version))
-
- for ipath, version in vendored:
- print(f"Provides: bundled(golang({ipath})) = {version}")
-
-
-if __name__ == "__main__":
- exit(main())
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-05 13:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-05 13:43 [rpms/syncthing] epel10: Update to version 2.0.11 Fabio Valentini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox