include upstream patch to fix issues on ppc64le

.gitignore

@@ -1,6 +1,8 @@
 /results_*
 /*.src.rpm
 
+/syncthing-source-v*/
+
 /syncthing-source-v0.14.35.tar.gz
 /syncthing-source-v0.14.36.tar.gz
 /syncthing-source-v0.14.37.tar.gz
@@ -33,3 +35,11 @@
 /syncthing-source-v1.3.1.tar.gz
 /syncthing-source-v1.3.2.tar.gz
 /syncthing-source-v1.3.3.tar.gz
+/syncthing-source-v1.3.4.tar.gz
+/syncthing-source-v1.4.0.tar.gz
+/syncthing-source-v1.4.2.tar.gz
+/syncthing-source-v1.5.0.tar.gz
+/syncthing-source-v1.6.1.tar.gz
+/syncthing-source-v1.7.0.tar.gz
+/syncthing-source-v1.7.1.tar.gz
+/syncthing-source-v1.8.0.tar.gz

758a1a6.patch

@@ -0,0 +1,22 @@
+From 758a1a6a3729e12b8142c45fcc95c08bc188da28 Mon Sep 17 00:00:00 2001
+From: Audrius Butkevicius <audrius.butkevicius@gmail.com>
+Date: Wed, 19 Aug 2020 06:56:35 +0100
+Subject: [PATCH] lib/fs: Disable ioctl on ppc (fixes #6898) (#6901)
+
+---
+ lib/fs/basicfs_copy_range_ioctl.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/fs/basicfs_copy_range_ioctl.go b/lib/fs/basicfs_copy_range_ioctl.go
+index 9d166c6de0..c11f65c4b3 100644
+--- a/lib/fs/basicfs_copy_range_ioctl.go
++++ b/lib/fs/basicfs_copy_range_ioctl.go
+@@ -4,7 +4,7 @@
+ // License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ // You can obtain one at https://mozilla.org/MPL/2.0/.
+ 
+-// +build linux
++// +build linux,!ppc,!ppc64,!ppc64le
+ 
+ package fs
+ 

sources

@@ -1 +1 @@
-SHA512 (syncthing-source-v1.3.3.tar.gz) = 43504c7ee79db96c1251a52ac0f96178f35926af6fbd4e97a661e4ff222d43e5fd8cfd0a312dd0cea9a2562010ecccdad3e8555495c81a759d92838e6c97b409
+SHA512 (syncthing-source-v1.8.0.tar.gz) = 282e6a700568946ed23d04cda41fa6a86d7c390c12c8abf99897f3818db9b4452baf5ab47d082bcf0b6a0329eb3d073dbc3abfe4a6493835cd201399307f605d

syncthing.spec

@@ -2,8 +2,8 @@
 
 Name:           syncthing
 Summary:        Continuous File Synchronization
-Version:        1.3.3
-Release:        1%{?dist}
+Version:        1.8.0
+Release:        2%{?dist}
 
 %global goipath github.com/syncthing/syncthing
 %global tag     v%{version}
@@ -12,17 +12,22 @@ Release:        1%{?dist}
 
 # syncthing (MPLv2.0) bundles
 # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT),
-# - ForkAwesome (MIT/OFL/CC-BY 3.0), and
-# - a number of go packages (ASL 2.0, MPLv2.0, BSD, Unlicense, MIT, ISC)
-License:        MPLv2.0 and MIT and OFL and CC-BY and ASL 2.0 and BSD and Unlicense and ISC
+# - ForkAwesome (MIT and OFL and CC-BY 3.0), and
+# - a number of go packages (MIT and MPLv2.0 and BSD and ASL 2.0 and CC0 and ISC)
+License:        MPLv2.0 and MIT and OFL and CC-BY and BSD and ASL 2.0 and CC0 and ISC
 
 URL:            https://syncthing.net
+# use official release tarball (contains vendored dependencies)
 Source0:        %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz
 
-# proposed patch to fix tests running out of memory on 32 bit arches
+# rejected patch to fix tests running out of memory on 32 bit arches
 # See: https://github.com/syncthing/syncthing/issues/6209
 Patch0:         https://github.com/imsodin/syncthing/commit/0d64427.patch
 
+# upstream patch to fix builds and tests on ppc64 due to invalid ioctl
+# See: https://github.com/syncthing/syncthing/issues/6898
+Patch1:         https://github.com/syncthing/syncthing/commit/758a1a6.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  systemd
 
@@ -42,54 +47,143 @@ Provides:       bundled(jquery-fancytree) = 2.28.1
 Provides:       bundled(jquery-ui) = 1.12.1
 Provides:       bundled(moment) = 2.19.4
 
-# vendored dependencies: automatically generated from go.mod
-Provides:       bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362
-Provides:       bundled(golang(github.com/AudriusButkevicius/pfilter)) = c55ef6137fc6
+# 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/pfilter : MIT
+Provides:       bundled(golang(github.com/AudriusButkevicius/pfilter)) = c55ef61
+# github.com/AudriusButkevicius/recli : MPLv2.0
 Provides:       bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5
-Provides:       bundled(golang(github.com/StackExchange/wmi)) = cbe66965904d
-Provides:       bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27e
+# github.com/Azure/go-ntlmssp : MIT
+Provides:       bundled(golang(github.com/Azure/go-ntlmssp)) = 6637195
+# github.com/DataDog/zstd : BSD
+Provides:       bundled(golang(github.com/DataDog/zstd)) = 1.4.1
+# github.com/StackExchange/wmi : MIT
+Provides:       bundled(golang(github.com/StackExchange/wmi)) = cbe6696
+# 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
-Provides:       bundled(golang(github.com/ccding/go-stun)) = be486d185f3d
-Provides:       bundled(golang(github.com/certifi/gocertifi)) = a5e0173ced67
-Provides:       bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142b5
+# github.com/ccding/go-stun : ASL 2.0
+Provides:       bundled(golang(github.com/ccding/go-stun)) = be486d1
+# github.com/certifi/gocertifi : MPLv2.0
+Provides:       bundled(golang(github.com/certifi/gocertifi)) = a5e0173
+# github.com/cespare/xxhash : MIT
+Provides:       bundled(golang(github.com/cespare/xxhash)) = 1.1.0
+Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.0
+# github.com/cheekybits/genny : MIT
+Provides:       bundled(golang(github.com/cheekybits/genny)) = 1.0.0
+# github.com/chmduquesne/rollinghash : MIT
+Provides:       bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7
+# github.com/cpuguy83/go-md2man : MIT
+Provides:       bundled(golang(github.com/cpuguy83/go-md2man/v2)) = f79a8a8
+# github.com/d4l3k/messagediff : MIT
 Provides:       bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1
-Provides:       bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568
+# github.com/dchest/siphash : CC0
+Provides:       bundled(golang(github.com/dchest/siphash)) = 1.2.1
+# github.com/dgraph-io/badger : ASL 2.0
+Provides:       bundled(golang(github.com/dgraph-io/badger/v2)) = 2.0.3
+# github.com/dgraph-io/ristretto : ASL 2.0
+Provides:       bundled(golang(github.com/dgraph-io/ristretto)) = 8f368f2
+# github.com/dgryski/go-farm : MIT
+Provides:       bundled(golang(github.com/dgryski/go-farm)) = 6a90982
+# github.com/dustin/go-humanize : MIT
+Provides:       bundled(golang(github.com/dustin/go-humanize)) = 1.0.0
+# github.com/flynn-archive/go-shlex : ASL 2.0
+Provides:       bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97
+# github.com/francoispqt/gojay : MIT
+Provides:       bundled(golang(github.com/francoispqt/gojay)) = 1.2.13
+# github.com/getsentry/raven-go : BSD
 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)) = 1.5.0
+# github.com/go-ldap/ldap : MIT
+Provides:       bundled(golang(github.com/go-ldap/ldap/v3)) = 3.2.0
+# github.com/go-ole/go-ole : MIT
 Provides:       bundled(golang(github.com/go-ole/go-ole)) = 1.2.4
+# github.com/gobwas/glob : MIT
 Provides:       bundled(golang(github.com/gobwas/glob)) = 0.2.3
+# github.com/gogo/protobuf : BSD
 Provides:       bundled(golang(github.com/gogo/protobuf)) = 1.3.1
-Provides:       bundled(golang(github.com/golang/groupcache)) = 869f871628b6
-Provides:       bundled(golang(github.com/golang/mock)) = 1.3.1
-Provides:       bundled(golang(github.com/jackpal/gateway)) = 1.0.5
-Provides:       bundled(golang(github.com/kballard/go-shellquote)) = 95032a82bc51
-Provides:       bundled(golang(github.com/kr/pretty)) = 0.1.0
+# github.com/golang/groupcache : ASL 2.0
+Provides:       bundled(golang(github.com/golang/groupcache)) = 869f871
+# github.com/golang/protobuf : BSD
+Provides:       bundled(golang(github.com/golang/protobuf)) = 1.4.0
+# github.com/golang/snappy : BSD
+Provides:       bundled(golang(github.com/golang/snappy)) = 0.0.1
+# github.com/greatroar/blobloom : ASL 2.0
+Provides:       bundled(golang(github.com/greatroar/blobloom)) = 0.3.0
+# github.com/jackpal/gateway : BSD
+Provides:       bundled(golang(github.com/jackpal/gateway)) = 1.0.6
+# github.com/jackpal/go-nat-pmp : ASL 2.0
+Provides:       bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2
+# 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.2.0
-Provides:       bundled(golang(github.com/lucas-clemente/quic-go)) = 0.12.1
+# github.com/lucas-clemente/quic-go : MIT
+Provides:       bundled(golang(github.com/lucas-clemente/quic-go)) = 0.17.3
+# github.com/marten-seemann/qtls : BSD
+Provides:       bundled(golang(github.com/marten-seemann/qtls)) = 0.9.1
+# github.com/maruel/panicparse : ASL 2.0
 Provides:       bundled(golang(github.com/maruel/panicparse)) = 1.3.0
-Provides:       bundled(golang(github.com/mattn/go-isatty)) = 0.0.10
+# github.com/mattn/go-isatty : MIT
+Provides:       bundled(golang(github.com/mattn/go-isatty)) = 0.0.11
+# github.com/matttproud/golang_protobuf_extensions : ASL 2.0
+Provides:       bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.1
+# github.com/minio/sha256-simd : ASL 2.0
 Provides:       bundled(golang(github.com/minio/sha256-simd)) = 0.1.1
-Provides:       bundled(golang(github.com/onsi/ginkgo)) = 1.9.0
-Provides:       bundled(golang(github.com/onsi/gomega)) = 1.6.0
-Provides:       bundled(golang(github.com/oschwald/geoip2-golang)) = 1.3.0
-Provides:       bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.4.0
-Provides:       bundled(golang(github.com/petermattis/goid)) = b0b1615b78e5
-Provides:       bundled(golang(github.com/pkg/errors)) = 0.8.1
+# github.com/oschwald/geoip2-golang : ISC
+Provides:       bundled(golang(github.com/oschwald/geoip2-golang)) = 1.4.0
+# github.com/oschwald/maxminddb-golang : ISC
+Provides:       bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.6.0
+# github.com/petermattis/goid : ASL 2.0
+Provides:       bundled(golang(github.com/petermattis/goid)) = b0b1615
+# github.com/pkg/errors : BSD
+Provides:       bundled(golang(github.com/pkg/errors)) = 0.9.1
+# github.com/prometheus/client_golang : ASL 2.0
 Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.2.1
-Provides:       bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30c2563
+# github.com/prometheus/client_model : ASL 2.0
+Provides:       bundled(golang(github.com/prometheus/client_model)) = 14fe0d1
+# github.com/prometheus/common : ASL 2.0
+Provides:       bundled(golang(github.com/prometheus/common)) = 0.7.0
+# github.com/prometheus/procfs : ASL 2.0
+Provides:       bundled(golang(github.com/prometheus/procfs)) = 0.0.5
+# github.com/rcrowley/go-metrics : BSD
+Provides:       bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30
+# github.com/russross/blackfriday : BSD
+Provides:       bundled(golang(github.com/russross/blackfriday/v2)) = 2.0.1
+# github.com/sasha-s/go-deadlock : ASL 2.0
 Provides:       bundled(golang(github.com/sasha-s/go-deadlock)) = 0.2.0
-Provides:       bundled(golang(github.com/shirou/gopsutil)) = 47ef3260b6bf
-Provides:       bundled(golang(github.com/syncthing/notify)) = 69c7a957d3e2
-Provides:       bundled(golang(github.com/syndtr/goleveldb)) = 758128399b1d
+# github.com/shirou/gopsutil : BSD
+Provides:       bundled(golang(github.com/shirou/gopsutil)) = 47ef326
+# github.com/shurcooL/sanitized_anchor_name : MIT
+Provides:       bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0
+# github.com/syncthing/notify : MIT
+Provides:       bundled(golang(github.com/syncthing/notify)) = 69c7a95
+# github.com/syndtr/goleveldb : BSD
+Provides:       bundled(golang(github.com/syndtr/goleveldb)) = 7581283
+# github.com/thejerf/suture : MIT
 Provides:       bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible
+# github.com/urfave/cli : MIT
 Provides:       bundled(golang(github.com/urfave/cli)) = 1.22.2
-Provides:       bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0
-Provides:       bundled(golang(golang.org/x/crypto)) = 9756ffdc2472
-Provides:       bundled(golang(golang.org/x/net)) = ba9fcec4b297
-Provides:       bundled(golang(golang.org/x/text)) = 0.3.2
-Provides:       bundled(golang(golang.org/x/time)) = 9d24e82272b4
-Provides:       bundled(golang(gopkg.in/asn1-ber.v1)) = f715ec2f112d
-Provides:       bundled(golang(gopkg.in/check.v1)) = 788fd7840127
-Provides:       bundled(golang(gopkg.in/ldap.v2)) = 2.5.1
+# github.com/vitrun/qart : ASL 2.0 and BSD
+Provides:       bundled(golang(github.com/vitrun/qart)) = bf64b92
+# golang.org/x/crypto : BSD
+Provides:       bundled(golang(golang.org/x/crypto)) = 4bdfaf4
+# golang.org/x/net : BSD
+Provides:       bundled(golang(golang.org/x/net)) = ba9fcec
+# golang.org/x/sys : BSD
+Provides:       bundled(golang(golang.org/x/sys)) = d5e6a3e
+# golang.org/x/text: BSD
+Provides:       bundled(golang(golang.org/x/text)) = 0.3.3
+# golang.org/x/text : BSD
+Provides:       bundled(golang(golang.org/x/time)) = 9d24e82
+# google.golang.org/protobuf : BSD
+Provides:       bundled(golang(google.golang.org/protobuf)) = 1.23.0
 
 # an inotify filesystem watcher is integrated with syncthing now
 Provides:       syncthing-inotify = 0.8.7-5
@@ -258,7 +352,6 @@ export GO111MODULE=off
 %gotest %{goipath}/cmd/syncthing
 
 %gotest %{goipath}/lib/api
-%gotest %{goipath}/lib/auto
 %gotest %{goipath}/lib/beacon
 %gotest %{goipath}/lib/config
 %gotest %{goipath}/lib/connections
@@ -353,6 +446,33 @@ export GO111MODULE=off
 
 
 %changelog
+* Thu Aug 20 2020 Fabio Valentini <decathorpe@gmail.com> - 1.8.0-2
+- Include upstream patch to fix issues on ppc64le.
+
+* Sun Aug 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1.8.0-1
+- Update to version 1.8.0.
+
+* Thu Jul 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1.7.1-1
+- Update to version 1.7.1.
+
+* Tue Jul 07 2020 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-1
+- Update to version 1.7.0.
+
+* Tue Jun 02 2020 Fabio Valentini <decathorpe@gmail.com> - 1.6.1-1
+- Update to version 1.6.1.
+
+* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1.5.0-1
+- Update to version 1.5.0.
+
+* Wed Apr 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.2-1
+- Update to version 1.4.2.
+
+* Tue Mar 17 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.0-1
+- Update to version 1.4.0.
+
+* Tue Feb 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.4-1
+- Update to version 1.3.4.
+
 * Wed Jan 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.3-1
 - Update to version 1.3.3.
 

vendor2provides.py

@@ -0,0 +1,51 @@
+#!/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: CC0-1.0 OR 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(" ")
+
+        # 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())
+