From 499fb9cce623b73166d64a2923f47b5a52f2066d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 10 Aug 2017 23:57:10 +0200 Subject: [PATCH 001/133] Initial import (#1427634). --- .gitignore | 1 + 00-go-build-flags.patch | 38 +++ README.md | 3 - sources | 1 + syncthing.spec | 674 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 714 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 00-go-build-flags.patch delete mode 100644 README.md create mode 100644 sources create mode 100644 syncthing.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b1e1323 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/syncthing-source-v0.14.35.tar.gz diff --git a/00-go-build-flags.patch b/00-go-build-flags.patch new file mode 100644 index 0000000..ea6df26 --- /dev/null +++ b/00-go-build-flags.patch @@ -0,0 +1,38 @@ +diff --git a/build.go b/build.go +index d8e7f00..bdceb0d 100644 +--- a/build.go ++++ b/build.go +@@ -424,9 +424,16 @@ func build(target target, tags []string) { + lazyRebuildAssets() + + tags = append(target.tags, tags...) ++ tags = append(tags, "rpm_crashtraceback") + + rmr(target.BinaryName()) +- args := []string{"build", "-i", "-v", "-ldflags", ldflags()} ++ ++ build_id, _ := ioutil.ReadFile("build_id") ++ ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", ++ ldflags(), os.Getenv("LDFLAGS"), build_id) ++ ++ args := []string{"build", "-buildmode", "pie", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} ++ + if len(tags) > 0 { + args = append(args, "-tags", strings.Join(tags, " ")) + } +@@ -702,11 +709,10 @@ func ldflags() string { + } + + b := new(bytes.Buffer) +- b.WriteString("-w") +- fmt.Fprintf(b, " -X main.Version%c%s", sep, version) +- fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp()) +- fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser()) +- fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost()) ++ fmt.Fprintf(b, "-X main.Version%c%s ", sep, version) ++ fmt.Fprintf(b, "-X main.BuildStamp%c%d ", sep, buildStamp()) ++ fmt.Fprintf(b, "-X main.BuildUser%c%s ", sep, buildUser()) ++ fmt.Fprintf(b, "-X main.BuildHost%c%s", sep, buildHost()) + return b.String() + } + diff --git a/README.md b/README.md deleted file mode 100644 index bf92e6f..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# syncthing - -The syncthing package \ No newline at end of file diff --git a/sources b/sources new file mode 100644 index 0000000..3440b04 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (syncthing-source-v0.14.35.tar.gz) = 5fb4fd7975b091bc971034c73a9b94f3c6091ece64d356192b11ec8306b8fd73cc8053bcfb531c2255fedc717a2177e6d021351a8c8e3b8484db51c0dd3c9b74 diff --git a/syncthing.spec b/syncthing.spec new file mode 100644 index 0000000..091fbfd --- /dev/null +++ b/syncthing.spec @@ -0,0 +1,674 @@ +# Generate devel rpm +%global with_devel 1 + +# Build project from bundled dependencies +%if 0%{?rhel} +%global with_bundled 1 +%else +%global with_bundled 0 +%endif + +# Build with debug info rpm +%global with_debug 1 + +# Run tests in check section +%global with_check 1 + +# Generate unit-test rpm +%global with_unit_test 1 + +# Build server tools +%global with_tools 1 + + +%if 0%{?with_debug} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +%global provider github +%global provider_tld com +%global project syncthing +%global repo syncthing +%global long_name golang-%{provider}-%{project}-%{repo} +# https://github.com/syncthing/syncthing +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit 1fc2ab444b3a3bf2ab1e2e2a9e5f1f4987103b00 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +# commit 1fc2ab444b3a3bf2ab1e2e2a9e5f1f4987103b00 == version 0.14.35 + + +Name: syncthing +Summary: Continuous File Synchronization +Version: 0.14.35 +Release: 2%{?dist} + +# syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) +License: MPLv2.0 and MIT and OFL + +URL: https://syncthing.net +Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz + +# Patch build.go script so go build doesn't install deps +# and produces debug-enabled binaries for rpm +Patch0: 00-go-build-flags.patch + +# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} +# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} + +BuildRequires: systemd +%{?systemd_requires} + +%if ! 0%{?with_bundled} +BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) +BuildRequires: golang(github.com/AudriusButkevicius/pfilter) +BuildRequires: golang(github.com/bkaradzic/go-lz4) +BuildRequires: golang(github.com/calmh/du) +BuildRequires: golang(github.com/calmh/luhn) +BuildRequires: golang(github.com/calmh/xdr) +BuildRequires: golang(github.com/ccding/go-stun/stun) +BuildRequires: golang(github.com/chmduquesne/rollinghash/adler32) +BuildRequires: golang(github.com/gobwas/glob) +BuildRequires: golang(github.com/gogo/protobuf/gogoproto) +BuildRequires: golang(github.com/gogo/protobuf/proto) +BuildRequires: golang(github.com/jackpal/gateway) +BuildRequires: golang(github.com/kardianos/osext) +BuildRequires: golang(github.com/minio/sha256-simd) +BuildRequires: golang(github.com/rcrowley/go-metrics) +BuildRequires: golang(github.com/sasha-s/go-deadlock) +BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) +BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/errors) +BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/iterator) +BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/opt) +BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) +BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) +BuildRequires: golang(github.com/thejerf/suture) +BuildRequires: golang(github.com/vitrun/qart) +BuildRequires: golang(github.com/xtaci/kcp-go) +BuildRequires: golang(github.com/xtaci/smux) +BuildRequires: golang(golang.org/x/net/context) +BuildRequires: golang(golang.org/x/net/ipv4) +BuildRequires: golang(golang.org/x/net/ipv6) +BuildRequires: golang(golang.org/x/net/proxy) +BuildRequires: golang(golang.org/x/text/unicode/norm) +BuildRequires: golang(golang.org/x/time/rate) +%endif + +Provides: %{long_name} = %{version}-%{release} + +Provides: bundled(angular) = 1.2.9 +Provides: bundled(angular-dirPagination) = 759009c +Provides: bundled(angular-translate) = 2.9.0.1 +Provides: bundled(angular-translate-loader-static-files) = 2.11.0 +Provides: bundled(bootstrap) = 3.3.5 +Provides: bundled(font-awesome) = 4.5.0 +Provides: bundled(jquery) = 2.2.2 + + +%description +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. + + +%if 0%{?with_devel} +%package devel +Summary: Continuous File Synchronization (development files) +Provides: %{long_name}-devel = %{version}-%{release} +BuildArch: noarch + +Requires: golang(github.com/AudriusButkevicius/go-nat-pmp) +Requires: golang(github.com/AudriusButkevicius/pfilter) +Requires: golang(github.com/bkaradzic/go-lz4) +Requires: golang(github.com/calmh/du) +Requires: golang(github.com/calmh/luhn) +Requires: golang(github.com/calmh/xdr) +Requires: golang(github.com/ccding/go-stun/stun) +Requires: golang(github.com/chmduquesne/rollinghash/adler32) +Requires: golang(github.com/gobwas/glob) +Requires: golang(github.com/gogo/protobuf/gogoproto) +Requires: golang(github.com/gogo/protobuf/proto) +Requires: golang(github.com/jackpal/gateway) +Requires: golang(github.com/kardianos/osext) +Requires: golang(github.com/minio/sha256-simd) +Requires: golang(github.com/rcrowley/go-metrics) +Requires: golang(github.com/sasha-s/go-deadlock) +Requires: golang(github.com/syndtr/goleveldb/leveldb) +Requires: golang(github.com/syndtr/goleveldb/leveldb/errors) +Requires: golang(github.com/syndtr/goleveldb/leveldb/iterator) +Requires: golang(github.com/syndtr/goleveldb/leveldb/opt) +Requires: golang(github.com/syndtr/goleveldb/leveldb/storage) +Requires: golang(github.com/syndtr/goleveldb/leveldb/util) +Requires: golang(github.com/thejerf/suture) +Requires: golang(github.com/vitrun/qart) +Requires: golang(github.com/xtaci/kcp-go) +Requires: golang(github.com/xtaci/smux) +Requires: golang(golang.org/x/net/context) +Requires: golang(golang.org/x/net/ipv4) +Requires: golang(golang.org/x/net/ipv6) +Requires: golang(golang.org/x/net/proxy) +Requires: golang(golang.org/x/text/unicode/norm) +Requires: golang(golang.org/x/time/rate) + +Provides: golang(%{import_path}/lib/auto) = %{version}-%{release} +Provides: golang(%{import_path}/lib/beacon) = %{version}-%{release} +Provides: golang(%{import_path}/lib/config) = %{version}-%{release} +Provides: golang(%{import_path}/lib/connections) = %{version}-%{release} +Provides: golang(%{import_path}/lib/db) = %{version}-%{release} +Provides: golang(%{import_path}/lib/dialer) = %{version}-%{release} +Provides: golang(%{import_path}/lib/discover) = %{version}-%{release} +Provides: golang(%{import_path}/lib/events) = %{version}-%{release} +Provides: golang(%{import_path}/lib/fs) = %{version}-%{release} +Provides: golang(%{import_path}/lib/ignore) = %{version}-%{release} +Provides: golang(%{import_path}/lib/logger) = %{version}-%{release} +Provides: golang(%{import_path}/lib/model) = %{version}-%{release} +Provides: golang(%{import_path}/lib/nat) = %{version}-%{release} +Provides: golang(%{import_path}/lib/osutil) = %{version}-%{release} +Provides: golang(%{import_path}/lib/pmp) = %{version}-%{release} +Provides: golang(%{import_path}/lib/protocol) = %{version}-%{release} +Provides: golang(%{import_path}/lib/rand) = %{version}-%{release} +Provides: golang(%{import_path}/lib/rc) = %{version}-%{release} +Provides: golang(%{import_path}/lib/relay/client) = %{version}-%{release} +Provides: golang(%{import_path}/lib/relay/protocol) = %{version}-%{release} +Provides: golang(%{import_path}/lib/scanner) = %{version}-%{release} +Provides: golang(%{import_path}/lib/sha256) = %{version}-%{release} +Provides: golang(%{import_path}/lib/signature) = %{version}-%{release} +Provides: golang(%{import_path}/lib/stats) = %{version}-%{release} +Provides: golang(%{import_path}/lib/sync) = %{version}-%{release} +Provides: golang(%{import_path}/lib/tlsutil) = %{version}-%{release} +Provides: golang(%{import_path}/lib/upgrade) = %{version}-%{release} +Provides: golang(%{import_path}/lib/upnp) = %{version}-%{release} +Provides: golang(%{import_path}/lib/util) = %{version}-%{release} +Provides: golang(%{import_path}/lib/versioner) = %{version}-%{release} +Provides: golang(%{import_path}/lib/weakhash) = %{version}-%{release} + +%if 0%{?with_bundled} +Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb +Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 09b3cfdd04de89f0196caecb0b335d7149a6593a +Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a +Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be +Provides: bundled(golang(github.com/calmh/luhn)) = 0c8388ff95fa92d4094011e5a04fc99dea3d1632 +Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f +Provides: bundled(golang(github.com/ccding/go-stun/stun)) = 04a4eed61c57ecc9903f8983d1d2c17b88d2e9e1 +Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 043b8fdecc9816f0011a056f6d92f9a091ab63dd +Provides: bundled(golang(github.com/cznic/b)) = aaaa43c92e509a827e63540510bc94c3003ef2e1 +Provides: bundled(golang(github.com/cznic/fileutil)) = 90cf820aafe8f7df39416fdbb932029ff99bd1ab +Provides: bundled(golang(github.com/cznic/internal/buffer)) = e5e1c3e9165d0a72507c2bbb0ffac1c02b8d3f7c +Provides: bundled(golang(github.com/cznic/internal/file)) = e5e1c3e9165d0a72507c2bbb0ffac1c02b8d3f7c +Provides: bundled(golang(github.com/cznic/internal/slice)) = e5e1c3e9165d0a72507c2bbb0ffac1c02b8d3f7c +Provides: bundled(golang(github.com/cznic/lldb)) = bea8611dd5c407f3c5eab9f9c68e887a27dc6f0e +Provides: bundled(golang(github.com/cznic/mathutil)) = 1447ad269d64ca91aa8d7079baa40b6fc8b965e7 +Provides: bundled(golang(github.com/cznic/ql)) = bd2055c7674ac80c520815dfe85082844cd246d4 +Provides: bundled(golang(github.com/cznic/sortutil)) = 4c7342852e65c2088c981288f2c5610d10b9f7f4 +Provides: bundled(golang(github.com/cznic/strutil)) = 43a89592ed56c227c7fdb1fcaf7d1d08be02ec54 +Provides: bundled(golang(github.com/cznic/zappy)) = 2533cb5b45cc6c07421468ce262899ddc9d53fb7 +Provides: bundled(golang(github.com/d4l3k/messagediff)) = 2fe2a1d40db6c23619ae5bcc8f80a5b43c40581b +Provides: bundled(golang(github.com/edsrzf/mmap-go)) = 0bce6a6887123b67a60366d2c9fe2dfb74289d2e +Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d931c66d229ceeb7c31b985563420 +Provides: bundled(golang(github.com/gogo/protobuf)) = efccd33a0c20aa078705571d5ddbfa14c8395a63 +Provides: bundled(golang(github.com/golang/groupcache/lru)) = 72d04f9fcdec7d3821820cc4a6f150eae553639a +Provides: bundled(golang(github.com/golang/protobuf/proto)) = 2bba0603135d7d7f5cb73b2125beeda19c09f4ef +Provides: bundled(golang(github.com/golang/protobuf/ptypes/any)) = 2bba0603135d7d7f5cb73b2125beeda19c09f4ef +Provides: bundled(golang(github.com/golang/snappy)) = 553a641470496b2327abcac10b36396bd98e45c9 +Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e01d3fab7bcf21c043c3d6a32b006 +Provides: bundled(golang(github.com/kardianos/osext)) = 9d302b58e975387d0b4d9be876622c86cefe64be +Provides: bundled(golang(github.com/klauspost/cpuid)) = 09cded8978dc9e80714c4d85b0322337b0a1e5e0 +Provides: bundled(golang(github.com/klauspost/reedsolomon)) = 5abf0ee302ccf4834e84f63ff74eca3e8b88e4e2 +Provides: bundled(golang(github.com/lib/pq)) = 2704adc878c21e1329f46f6e56a1c387d788ff94 +Provides: bundled(golang(github.com/minio/sha256-simd)) = 6124d070eb4e7001c244b6ccc282620a5dce44a0 +Provides: bundled(golang(github.com/onsi/ginkgo)) = 77a8c1e5c40d6bb6c5eb4dd4bdce9763564f6298 +Provides: bundled(golang(github.com/onsi/gomega)) = 334b8f472b3af5d541c5642701c1e29e2126f486 +Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 0fd242da7906550802871efe101abfdb1cc550a8 +Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 697da8075d2061aa8ed639346443f5d3e8c80b30 +Provides: bundled(golang(github.com/petermattis/goid)) = caab6446a35a918488a0f52d4b0bd088a60f3511 +Provides: bundled(golang(github.com/pkg/errors)) = ff09b135c25aae272398c51a07235b90a75aa4f0 +Provides: bundled(golang(github.com/rcrowley/go-metrics)) = 1f30fe9094a513ce4c700b9a54458bbb0c96996c +Provides: bundled(golang(github.com/remyoudompheng/bigfft)) = a8e77ddfb93284b9d58881f597c820a2875af336 +Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 341000892f3dd25f440e6231e8533eb3688ed7ec +Provides: bundled(golang(github.com/stathat/go)) = 74669b9f388d9d788c97399a0824adbfee78400e +Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 3c5717caf1475fd25964109a0fc640bd150fce43 +Provides: bundled(golang(github.com/thejerf/suture)) = 0ac47afae95ad5bc5184ed346bc945168e883f5d +Provides: bundled(golang(github.com/vitrun/qart/coding)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa +Provides: bundled(golang(github.com/vitrun/qart/gf256)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa +Provides: bundled(golang(github.com/vitrun/qart/qr)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa +Provides: bundled(golang(github.com/xtaci/kcp-go)) = 0b0731ef3f184a8985edcb4ca26a4b0598c6dc1a +Provides: bundled(golang(github.com/xtaci/smux)) = 0f6b9aaecaaf354357adc7def9239011ad276776 +Provides: bundled(golang(golang.org/x/crypto/bcrypt)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/crypto/blowfish)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/crypto/cast5)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/crypto/pbkdf2)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/crypto/salsa20)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/crypto/tea)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/crypto/twofish)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/crypto/xtea)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd +Provides: bundled(golang(golang.org/x/net/bpf)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d +Provides: bundled(golang(golang.org/x/net/context)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d +Provides: bundled(golang(golang.org/x/net/internal/iana)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d +Provides: bundled(golang(golang.org/x/net/internal/netreflect)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d +Provides: bundled(golang(golang.org/x/net/ipv4)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d +Provides: bundled(golang(golang.org/x/net/ipv6)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d +Provides: bundled(golang(golang.org/x/net/proxy)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d +Provides: bundled(golang(golang.org/x/sys/unix)) = f3918c30c5c2cb527c0b071a27c35120a6c0719a +Provides: bundled(golang(golang.org/x/sys/windows)) = 493114f68206f85e7e333beccfabc11e98cba8dd +Provides: bundled(golang(golang.org/x/text/internal/gen)) = f4b4367115ec2de254587813edaa901bc1c723a8 +Provides: bundled(golang(golang.org/x/text/internal/triegen)) = f4b4367115ec2de254587813edaa901bc1c723a8 +Provides: bundled(golang(golang.org/x/text/internal/ucd)) = f4b4367115ec2de254587813edaa901bc1c723a8 +Provides: bundled(golang(golang.org/x/text/transform)) = f4b4367115ec2de254587813edaa901bc1c723a8 +Provides: bundled(golang(golang.org/x/text/unicode/cldr)) = f4b4367115ec2de254587813edaa901bc1c723a8 +Provides: bundled(golang(golang.org/x/text/unicode/norm)) = f4b4367115ec2de254587813edaa901bc1c723a8 +Provides: bundled(golang(golang.org/x/time/rate)) = f51c12702a4d776e4c1fa9b0fabab841babae631 +Provides: bundled(golang(gopkg.in/yaml.v2)) = a3f3340b5840cee44f372bddb5880fcbc419b46a +%endif + +%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 source files, which are needed as +dependency for building packages using syncthing. +%endif + + +%if 0%{?with_unit_test} && 0%{?with_devel} +%package unit-test-devel +Summary: Continuous File Synchronization (unit tests) +Provides: %{long_name}-unit-test-devel = %{version}-%{release} + +# test subpackage tests code from devel subpackage +Requires: %{name}-devel = %{version}-%{release} + +%if 0%{?with_check} && ! 0%{?with_bundled} +BuildRequires: golang(github.com/d4l3k/messagediff) +%endif + +Requires: golang(github.com/d4l3k/messagediff) + +%description unit-test-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 unit tests for syncthing. +%endif + + +%if 0%{?with_tools} +%package tools +Summary: Continuous File Synchronization (server tools) + +%if ! 0%{?with_bundled} +BuildRequires: golang(github.com/AudriusButkevicius/cli) +BuildRequires: golang(github.com/cznic/ql) +BuildRequires: golang(github.com/golang/groupcache/lru) +BuildRequires: golang(github.com/lib/pq) +BuildRequires: golang(github.com/oschwald/geoip2-golang) +%endif + +%description tools +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 server tools. +%endif + + +%prep +%setup -q -n syncthing +%patch0 -p1 + + +%build +%if ! 0%{?with_bundled} +# remove bundled libraries +rm -r vendor +%endif + +# Replace usage of "context" package (go 1.7+ only) with the old +# "golang.org/x/net/context" package if only an old compiler is available +%if 0%{?fedora} == 24 || 0%{?rhel} +sed -i 's/"context"/"golang.org\/x\/net\/context"/' cmd/syncthing/*.go lib/*/*.go +%endif + +# prepare build environment +mkdir -p ./_build/src/%{provider}.%{provider_tld}/%{project} + +TOP=$(pwd) +pushd _build/src/%{provider}.%{provider_tld}/%{project} +ln -s $TOP ./syncthing +popd + +export GOPATH=$(pwd)/_build:%{gopath} +export BUILDDIR=$(pwd)/_build/src/%{import_path} + +# set BUILD_HOST variable so syncthing knows where it was built +export BUILD_HOST=fedora-koji + +# run builds in appropriate directory +pushd $BUILDDIR + +head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id +go run build.go -no-upgrade build syncthing + +%if 0%{?with_tools} +head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id +go run build.go -no-upgrade build stdiscosrv + +head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id +go run build.go -no-upgrade build strelaysrv + +head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id +go run build.go -no-upgrade build strelaypoolsrv +%endif + +popd + +# remove build script so it doesn't get picked up later +%if 0%{?with_devel} +rm build.go +%endif + + +%install +# install binaries +mkdir -p %{buildroot}/%{_bindir} + +cp -pav ./syncthing %{buildroot}/%{_bindir}/ + +%if 0%{?with_tools} +cp -pav ./stdiscosrv %{buildroot}/%{_bindir}/ +cp -pav ./strelaysrv %{buildroot}/%{_bindir}/ +cp -pav ./strelaypoolsrv %{buildroot}/%{_bindir}/ +%endif + +# install man pages +mkdir -p %{buildroot}/%{_mandir}/man1 +mkdir -p %{buildroot}/%{_mandir}/man5 +mkdir -p %{buildroot}/%{_mandir}/man7 + +cp -pav ./man/syncthing.1 %{buildroot}/%{_mandir}/man1/ +cp -pav ./man/*.5 %{buildroot}/%{_mandir}/man5/ +cp -pav ./man/*.7 %{buildroot}/%{_mandir}/man7/ + +%if 0%{?with_tools} +cp -pav ./man/stdiscosrv.1 %{buildroot}/%{_mandir}/man1/ +cp -pav ./man/strelaysrv.1 %{buildroot}/%{_mandir}/man1/ +%endif + +# install systemd units +mkdir -p %{buildroot}/%{_unitdir} +mkdir -p %{buildroot}/%{_userunitdir} + +cp -pav etc/linux-systemd/system/syncthing@.service %{buildroot}/%{_unitdir}/ +cp -pav etc/linux-systemd/system/syncthing-resume.service %{buildroot}/%{_unitdir}/ +cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ + +# install systemd preset disabling the service per default +mkdir -p %{buildroot}/%{_prefix}/lib/systemd/user-preset +echo "disable syncthing*" > %{buildroot}/%{_prefix}/lib/systemd/user-preset/90-syncthing.preset + + +# Unmark source files as executable +for i in $(find -name "*.go" -executable -print); do chmod a-x $i; done + + +# source codes for building projects +%if 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list + +# find all *.go but no *_test.go files and generate devel.file-list +for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "vendor") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done +done +%endif + +# testing files for this project +%if 0%{?with_unit_test} && 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ + +# find all *_test.go files and generate unit-test-devel.file-list +for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done +done + +# add test data for unit test subpackage +cp -pavr cmd/syncthing/testdata %{buildroot}/%{gopath}/src/%{import_path}/cmd/syncthing/ +echo "%%{gopath}/src/%%{import_path}/cmd/syncthing/testdata" >> unit-test-devel.file-list + +cp -pavr test/h* %{buildroot}/%{gopath}/src/%{import_path}/test/ + +cp -pavr lib/config/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/config/ +echo "%%{gopath}/src/%%{import_path}/lib/config/testdata" >> unit-test-devel.file-list + +cp -pavr lib/db/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/db/ +echo "%%{gopath}/src/%%{import_path}/lib/db/testdata" >> unit-test-devel.file-list + +cp -pavr lib/ignore/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/ignore/ +echo "%%{gopath}/src/%%{import_path}/lib/ignore/testdata" >> unit-test-devel.file-list + +cp -pavr lib/model/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/model/ +echo "%%{gopath}/src/%%{import_path}/lib/model/testdata" >> unit-test-devel.file-list + +cp -pavr lib/scanner/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/scanner/ +echo "%%{gopath}/src/%%{import_path}/lib/scanner/testdata" >> unit-test-devel.file-list + +cp -pavr lib/versioner/_external_test %{buildroot}/%{gopath}/src/%{import_path}/lib/versioner/ +echo "%%{gopath}/src/%%{import_path}/lib/versioner/_external_test" >> unit-test-devel.file-list +%endif + +%if 0%{?with_devel} +sort -u -o devel.file-list devel.file-list +%endif + +%if 0%{?with_unit_test} +sort -u -o unit-test-devel.file-list unit-test-devel.file-list +%endif + + +%check +%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +%if ! 0%{?with_bundled} +export GOPATH=%{buildroot}/%{gopath}:%{gopath} +%else +# Since we aren't packaging up the vendor directory we need to link +# back to it somehow. Hack it up so that we can add the vendor +# directory from BUILD dir as a gopath to be searched when executing +# tests from the BUILDROOT dir. +ln -s ./ ./vendor/src # ./vendor/src -> ./vendor +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} +%endif + +%if ! 0%{?gotest:1} +%global gotest go test +%endif + +%gotest %{import_path}/cmd/syncthing +%gotest %{import_path}/lib/auto +%gotest %{import_path}/lib/beacon +%gotest %{import_path}/lib/config +%gotest %{import_path}/lib/connections +%gotest %{import_path}/lib/db +%gotest %{import_path}/lib/dialer +%gotest %{import_path}/lib/discover +%gotest %{import_path}/lib/events +%gotest %{import_path}/lib/fs +%gotest %{import_path}/lib/ignore +%gotest %{import_path}/lib/logger +%gotest %{import_path}/lib/model +%gotest %{import_path}/lib/nat +%gotest %{import_path}/lib/osutil +%gotest %{import_path}/lib/pmp +%gotest %{import_path}/lib/protocol +%gotest %{import_path}/lib/rand +%gotest %{import_path}/lib/relay/client +%gotest %{import_path}/lib/relay/protocol +%gotest %{import_path}/lib/scanner +%gotest %{import_path}/lib/signature +%gotest %{import_path}/lib/stats +%gotest %{import_path}/lib/sync +%gotest %{import_path}/lib/tlsutil +%gotest %{import_path}/lib/upgrade +%gotest %{import_path}/lib/upnp +%gotest %{import_path}/lib/util +%gotest %{import_path}/lib/versioner +%gotest %{import_path}/lib/weakhash + +# Clean up after the tests +rm %{buildroot}/%{gopath}/src/%{import_path}/lib/model/testdata/empty +rm -r %{buildroot}/%{gopath}/src/%{import_path}/test/h*/ + +find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".gitignore" -print -delete +find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stignore" -print -delete +find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete +%endif + + +%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 + + +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + + +%files +%license LICENSE +%doc README.md AUTHORS + +%{_bindir}/syncthing + +%{_mandir}/*/syncthing* + +%{_unitdir}/syncthing@.service +%{_unitdir}/syncthing-resume.service +%{_userunitdir}/syncthing.service + +%{_prefix}/lib/systemd/user-preset/90-syncthing.preset + + +%if 0%{?with_tools} +%files tools +%license LICENSE +%doc README.md AUTHORS + +%{_bindir}/stdiscosrv +%{_bindir}/strelaysrv +%{_bindir}/strelaypoolsrv + +%{_mandir}/man1/stdiscosrv* +%{_mandir}/man1/strelaysrv* +%endif + + +%if 0%{?with_devel} +%files devel -f devel.file-list +%license LICENSE +%doc README.md AUTHORS +%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} +%endif + + +%if 0%{?with_unit_test} && 0%{?with_devel} +%files unit-test-devel -f unit-test-devel.file-list +%license LICENSE +%doc README.md AUTHORS +%endif + + +%changelog +* Wed Aug 09 2017 Fabio Valentini - 0.14.35-2 +- Add Provides for bundled JS libraries and adapt License tag. + +* Tue Aug 08 2017 Fabio Valentini - 0.14.35-1 +- Update to version 0.14.35. + +* Tue Aug 08 2017 Fabio Valentini - 0.14.34-1 +- Update to version 0.14.34. + +* Sat Aug 05 2017 Fabio Valentini - 0.14.33-3 +- Add another missing ldflags argument. + +* Tue Aug 01 2017 Fabio Valentini - 0.14.33-2 +- Adapt patched build script to use the correct LDFLAGS. + +* Tue Jul 25 2017 Fabio Valentini - 0.14.33-1 +- Update to version 0.14.33. + +* Tue Jul 11 2017 Fabio Valentini - 0.14.32-1 +- Update to version 0.14.32. + +* Tue Jun 27 2017 Fabio Valentini - 0.14.31-1 +- Update to version 0.14.31. + +* Tue Jun 13 2017 Fabio Valentini - 0.14.30-1 +- Update to version 0.14.30. + +* Tue May 30 2017 Fabio Valentini - 0.14.29-1 +- Update to version 0.14.29. + +* Tue May 16 2017 Fabio Valentini - 0.14.28-1 +- Update to version 0.14.28. + +* Tue Apr 25 2017 Fabio Valentini - 0.14.27-1 +- Update to version 0.14.27. + +* Fri Apr 07 2017 Fabio Valentini - 0.14.26-1 +- Update to version 0.14.26. + +* Tue Mar 21 2017 Fabio Valentini - 0.14.25-1 +- Update to version 0.14.25. + +* Tue Mar 07 2017 Fabio Valentini - 0.14.24-1 +- Update to version 0.14.24. + +* Tue Feb 28 2017 Fabio Valentini - 0.14.23-2 +- Clean up spec file, remove bundled libs on fedora, add man pages. + +* Tue Feb 07 2017 Fabio Valentini - 0.14.23-1 +- First package for fedora. + From 020181098ec15a933a0ed95b13b9a8f2a365da18 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 12 Aug 2017 23:13:04 +0200 Subject: [PATCH 002/133] update to version 0.14.36 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b1e1323..9782082 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /syncthing-source-v0.14.35.tar.gz +/syncthing-source-v0.14.36.tar.gz diff --git a/sources b/sources index 3440b04..5203525 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.35.tar.gz) = 5fb4fd7975b091bc971034c73a9b94f3c6091ece64d356192b11ec8306b8fd73cc8053bcfb531c2255fedc717a2177e6d021351a8c8e3b8484db51c0dd3c9b74 +SHA512 (syncthing-source-v0.14.36.tar.gz) = 66170f43a77f5e0c3da9f6907a313e288b4bfb659dd38601da62ebd4c6a8af597c72148da1f9b9d66a62f2fc8c0a58f503074e89f9f39bcb0a7d10e75d3e5c10 diff --git a/syncthing.spec b/syncthing.spec index 091fbfd..8c3f9c4 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -35,16 +35,16 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 1fc2ab444b3a3bf2ab1e2e2a9e5f1f4987103b00 +%global commit 77578e8aac65c0660d98ad7c4f65b020718cb7c2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 1fc2ab444b3a3bf2ab1e2e2a9e5f1f4987103b00 == version 0.14.35 +# commit 77578e8aac65c0660d98ad7c4f65b020718cb7c2 == version 0.14.36 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.35 -Release: 2%{?dist} +Version: 0.14.36 +Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) License: MPLv2.0 and MIT and OFL @@ -621,6 +621,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Sat Aug 12 2017 Fabio Valentini - 0.14.36-1 +- Update to version 0.14.36. + * Wed Aug 09 2017 Fabio Valentini - 0.14.35-2 - Add Provides for bundled JS libraries and adapt License tag. From ac3c7c0d31e6ae9e6a5350a2821f0bf09d6ef472 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 15 Aug 2017 00:21:26 +0200 Subject: [PATCH 003/133] add special patch for ppc64, where PIE isn't supported --- 00-go-build-flags-ppc64.patch | 38 +++++++++++++++++++++++++++++++++++ syncthing.spec | 12 ++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 00-go-build-flags-ppc64.patch diff --git a/00-go-build-flags-ppc64.patch b/00-go-build-flags-ppc64.patch new file mode 100644 index 0000000..4605292 --- /dev/null +++ b/00-go-build-flags-ppc64.patch @@ -0,0 +1,38 @@ +diff --git a/build.go b/build.go +index d8e7f00..bdceb0d 100644 +--- a/build.go ++++ b/build.go +@@ -424,9 +424,16 @@ func build(target target, tags []string) { + lazyRebuildAssets() + + tags = append(target.tags, tags...) ++ tags = append(tags, "rpm_crashtraceback") + + rmr(target.BinaryName()) +- args := []string{"build", "-i", "-v", "-ldflags", ldflags()} ++ ++ build_id, _ := ioutil.ReadFile("build_id") ++ ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", ++ ldflags(), os.Getenv("LDFLAGS"), build_id) ++ ++ args := []string{"build", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} ++ + if len(tags) > 0 { + args = append(args, "-tags", strings.Join(tags, " ")) + } +@@ -702,11 +709,10 @@ func ldflags() string { + } + + b := new(bytes.Buffer) +- b.WriteString("-w") +- fmt.Fprintf(b, " -X main.Version%c%s", sep, version) +- fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp()) +- fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser()) +- fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost()) ++ fmt.Fprintf(b, "-X main.Version%c%s ", sep, version) ++ fmt.Fprintf(b, "-X main.BuildStamp%c%d ", sep, buildStamp()) ++ fmt.Fprintf(b, "-X main.BuildUser%c%s ", sep, buildUser()) ++ fmt.Fprintf(b, "-X main.BuildHost%c%s", sep, buildHost()) + return b.String() + } + diff --git a/syncthing.spec b/syncthing.spec index 8c3f9c4..c369a55 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -44,7 +44,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 0.14.36 -Release: 1%{?dist} +Release: 2%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) License: MPLv2.0 and MIT and OFL @@ -55,6 +55,7 @@ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version} # Patch build.go script so go build doesn't install deps # and produces debug-enabled binaries for rpm Patch0: 00-go-build-flags.patch +Patch1: 00-go-build-flags-ppc64.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} @@ -334,7 +335,13 @@ This package contains the syncthing server tools. %prep %setup -q -n syncthing + +# PIE build mode isn't supported on ppc64 +%ifarch ppc64 +%patch1 -p1 +%else %patch0 -p1 +%endif %build @@ -621,6 +628,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Aug 15 2017 Fabio Valentini - 0.14.36-2 +- Adapt patch to work on ppc64, where PIE isn't supported. + * Sat Aug 12 2017 Fabio Valentini - 0.14.36-1 - Update to version 0.14.36. From e97e5e2bd8381b4374a26d9b2d643125f1da107a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 16 Aug 2017 14:21:47 +0200 Subject: [PATCH 004/133] add README --- README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..826f6c3 --- /dev/null +++ b/README.md @@ -0,0 +1,52 @@ +## Usage + +By default, the syncthing service isn't enabled after installation. Depending on +the use-case, syncthing can be run as a system-wide service for a specific user, +or as a real user-session service. + +Once enabled, the syncthing service exposes a web interface (the port can be +changed in the configuration later) at address . + +For manual (or offline) configuration, the settings file of syncthing (XML +format) lives at `$HOME/.config/syncthing/config.xml`. + +An empty, default "Sync" folder is created at the first startup in the user's +home directory. + + +### User Session service + +To enable the syncthing service as a user-session service for the current user, +run: + +```sh +systemctl --user enable --now syncthing.service +``` + +The service will be started now and each time you log in. + +The syncthing user session service will not automatically be restarted after +package updates. Instead, the user has to either restart syncthing from the web +interface, log out and back in, or run the following commands manually: + +```sh +systemctl --user daemon-reload +systemctl --user restart syncthing.service +``` + +### System service + +To enable the syncthing service as a system-wide service for user `USER`, +run: + +```sh +sudo systemctl enable --now syncthing@USER.service +``` + +The service will be started now and each time the system boots. + +Enabling the syncthing service this way has the benefit that it will even be +automatically restarted when the syncthing package is updated by the package +manager. The drawback of this method is that the syncthing service cannot be +restarted from within the web interface (due to it being a system service). + From 9b6eeb816d82a4d4a3c3d6488504fc8be899b2b9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 20 Aug 2017 13:22:21 +0200 Subject: [PATCH 005/133] update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 826f6c3..7864bd6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ the use-case, syncthing can be run as a system-wide service for a specific user, or as a real user-session service. Once enabled, the syncthing service exposes a web interface (the port can be -changed in the configuration later) at address . +changed in the configuration later) at address [localhost:8384](http://localhost:8384). For manual (or offline) configuration, the settings file of syncthing (XML format) lives at `$HOME/.config/syncthing/config.xml`. From 4f23d813e1eb8d44211898f0ba572eae412bd7c7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 15 Sep 2017 16:06:34 +0200 Subject: [PATCH 006/133] update to version 0.14.37 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 57 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 9782082..839c10d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /syncthing-source-v0.14.35.tar.gz /syncthing-source-v0.14.36.tar.gz +/syncthing-source-v0.14.37.tar.gz diff --git a/sources b/sources index 5203525..4d07f1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.36.tar.gz) = 66170f43a77f5e0c3da9f6907a313e288b4bfb659dd38601da62ebd4c6a8af597c72148da1f9b9d66a62f2fc8c0a58f503074e89f9f39bcb0a7d10e75d3e5c10 +SHA512 (syncthing-source-v0.14.37.tar.gz) = 097fdc66c5f4454790a6962b51b40489ab8e88aff2a0ea2d063205292c37d28a41f4d038c7b1f87d978a40e490e6cbcd2dc5946d63343940aff15a04a61c390d diff --git a/syncthing.spec b/syncthing.spec index c369a55..13e2eea 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -35,16 +35,16 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 77578e8aac65c0660d98ad7c4f65b020718cb7c2 +%global commit c7221b035d94d459fe8bbe1e88df67b7d320b216 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 77578e8aac65c0660d98ad7c4f65b020718cb7c2 == version 0.14.36 +# commit c7221b035d94d459fe8bbe1e88df67b7d320b216 == version 0.14.37 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.36 -Release: 2%{?dist} +Version: 0.14.37 +Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) License: MPLv2.0 and MIT and OFL @@ -79,6 +79,7 @@ BuildRequires: golang(github.com/gogo/protobuf/gogoproto) BuildRequires: golang(github.com/gogo/protobuf/proto) BuildRequires: golang(github.com/jackpal/gateway) BuildRequires: golang(github.com/kardianos/osext) +BuildRequires: golang(github.com/kballard/go-shellquote) BuildRequires: golang(github.com/minio/sha256-simd) BuildRequires: golang(github.com/rcrowley/go-metrics) BuildRequires: golang(github.com/sasha-s/go-deadlock) @@ -106,7 +107,7 @@ Provides: bundled(angular) = 1.2.9 Provides: bundled(angular-dirPagination) = 759009c Provides: bundled(angular-translate) = 2.9.0.1 Provides: bundled(angular-translate-loader-static-files) = 2.11.0 -Provides: bundled(bootstrap) = 3.3.5 +Provides: bundled(bootstrap) = 3.3.6 Provides: bundled(font-awesome) = 4.5.0 Provides: bundled(jquery) = 2.2.2 @@ -115,9 +116,10 @@ Provides: bundled(jquery) = 2.2.2 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. +third party and how it's transmitted over the Internet. Using syncthing, +that control is returned to you. -Using syncthing, that control is returned to you. +This package contains the syncthing client binary and systemd services. %if 0%{?with_devel} @@ -139,6 +141,7 @@ Requires: golang(github.com/gogo/protobuf/gogoproto) Requires: golang(github.com/gogo/protobuf/proto) Requires: golang(github.com/jackpal/gateway) Requires: golang(github.com/kardianos/osext) +Requires: golang(github.com/kballard/go-shellquote) Requires: golang(github.com/minio/sha256-simd) Requires: golang(github.com/rcrowley/go-metrics) Requires: golang(github.com/sasha-s/go-deadlock) @@ -222,6 +225,7 @@ Provides: bundled(golang(github.com/golang/protobuf/ptypes/any)) = 2bba060 Provides: bundled(golang(github.com/golang/snappy)) = 553a641470496b2327abcac10b36396bd98e45c9 Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e01d3fab7bcf21c043c3d6a32b006 Provides: bundled(golang(github.com/kardianos/osext)) = 9d302b58e975387d0b4d9be876622c86cefe64be +Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657ff3dc51de0b4f55dd299a3e136f2 Provides: bundled(golang(github.com/klauspost/cpuid)) = 09cded8978dc9e80714c4d85b0322337b0a1e5e0 Provides: bundled(golang(github.com/klauspost/reedsolomon)) = 5abf0ee302ccf4834e84f63ff74eca3e8b88e4e2 Provides: bundled(golang(github.com/lib/pq)) = 2704adc878c21e1329f46f6e56a1c387d788ff94 @@ -274,11 +278,10 @@ Provides: bundled(golang(gopkg.in/yaml.v2)) = a3f3340b5840cee44f372bddb588 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. +third party and how it's transmitted over the Internet. Using syncthing, +that control is returned to you. -Using syncthing, that control is returned to you. - -This package contains the syncthing source files, which are needed as +This package contains the syncthing sources, which are needed as dependency for building packages using syncthing. %endif @@ -301,11 +304,10 @@ Requires: golang(github.com/d4l3k/messagediff) 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. +third party and how it's transmitted over the Internet. Using syncthing, +that control is returned to you. -Using syncthing, that control is returned to you. - -This package contains the unit tests for syncthing. +This package contains the syncthing unit tests. %endif @@ -325,11 +327,15 @@ BuildRequires: golang(github.com/oschwald/geoip2-golang) 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. +third party and how it's transmitted over the Internet. Using syncthing, +that control is returned to you. -Using syncthing, that control is returned to you. +This package contains the main syncthing server tools: -This package contains the syncthing server tools. +* strelaysrv / strelaypoolsrv, the syncthing relay server for indirect + file transfers between client nodes, and +* stdiscosrv, the syncthing discovery server for discovering nodes + to connect to indirectly over the internet. %endif @@ -537,7 +543,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/lib/fs %gotest %{import_path}/lib/ignore %gotest %{import_path}/lib/logger -%gotest %{import_path}/lib/model + +# This test is a bit flaky on some architectures, issue is tracked at: +# https://github.com/syncthing/syncthing/issues/4370 +%gotest %{import_path}/lib/model || : + %gotest %{import_path}/lib/nat %gotest %{import_path}/lib/osutil %gotest %{import_path}/lib/pmp @@ -553,7 +563,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/lib/upgrade %gotest %{import_path}/lib/upnp %gotest %{import_path}/lib/util -%gotest %{import_path}/lib/versioner + +# This test is failing randomly right now. Issue is tracked upstream at: +# https://github.com/syncthing/syncthing/issues/4351 +%gotest %{import_path}/lib/versioner || : + %gotest %{import_path}/lib/weakhash # Clean up after the tests @@ -628,6 +642,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Sep 05 2017 Fabio Valentini - 0.14.37-1 +- Update to version 0.14.37. + * Tue Aug 15 2017 Fabio Valentini - 0.14.36-2 - Adapt patch to work on ppc64, where PIE isn't supported. From a4665b0e5d69553da80a3d720599e86ab193cc7d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 18 Sep 2017 19:22:13 +0200 Subject: [PATCH 007/133] rebuild for go 1.9 stable and updated dependencies, fixing crashes --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 13e2eea..654c5cc 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -44,7 +44,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 0.14.37 -Release: 1%{?dist} +Release: 2%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) License: MPLv2.0 and MIT and OFL @@ -642,6 +642,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Mon Sep 18 2017 Fabio Valentini - 0.14.37-2 +- Rebuild for updated dependencies, fixing crashes. + * Tue Sep 05 2017 Fabio Valentini - 0.14.37-1 - Update to version 0.14.37. From 163994503e96732cb08156e23d85fcab37ea0ec0 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 25 Sep 2017 11:54:01 +0200 Subject: [PATCH 008/133] update to version 0.14.38 --- .gitignore | 1 + 02-luhn-fixes.patch | 280 ++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- syncthing.spec | 29 +++-- 4 files changed, 301 insertions(+), 11 deletions(-) create mode 100644 02-luhn-fixes.patch diff --git a/.gitignore b/.gitignore index 839c10d..a808b4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /syncthing-source-v0.14.35.tar.gz /syncthing-source-v0.14.36.tar.gz /syncthing-source-v0.14.37.tar.gz +/syncthing-source-v0.14.38.tar.gz diff --git a/02-luhn-fixes.patch b/02-luhn-fixes.patch new file mode 100644 index 0000000..79e780e --- /dev/null +++ b/02-luhn-fixes.patch @@ -0,0 +1,280 @@ +From 2dd94507937276cae93ca17a8518c12b55e8ae6e Mon Sep 17 00:00:00 2001 +From: Jakob Borg +Date: Wed, 20 Sep 2017 21:34:32 +0200 +Subject: [PATCH] lib/protocol, vendor: Import luhn code directly + +I've changed it incompatibly to fix a correctness bug. Nonetheless, we +should remain incorrect indefinitely. +--- + lib/protocol/deviceid.go | 5 ++- + lib/protocol/luhn.go | 53 ++++++++++++++++++++++++++++ + lib/protocol/luhn_test.go | 48 ++++++++++++++++++++++++++ + vendor/github.com/calmh/luhn/LICENSE | 19 ---------- + vendor/github.com/calmh/luhn/luhn.go | 67 ------------------------------------ + vendor/manifest | 8 ----- + 6 files changed, 103 insertions(+), 97 deletions(-) + create mode 100644 lib/protocol/luhn.go + create mode 100644 lib/protocol/luhn_test.go + delete mode 100644 vendor/github.com/calmh/luhn/LICENSE + delete mode 100644 vendor/github.com/calmh/luhn/luhn.go + +diff --git a/lib/protocol/deviceid.go b/lib/protocol/deviceid.go +index df1cbdece..c2a30b286 100644 +--- a/lib/protocol/deviceid.go ++++ b/lib/protocol/deviceid.go +@@ -10,7 +10,6 @@ import ( + "fmt" + "strings" + +- "github.com/calmh/luhn" + "github.com/syncthing/syncthing/lib/sha256" + ) + +@@ -158,7 +157,7 @@ func luhnify(s string) (string, error) { + for i := 0; i < 4; i++ { + p := s[i*13 : (i+1)*13] + copy(res[i*(13+1):], p) +- l, err := luhn.Base32.Generate(p) ++ l, err := luhnBase32.generate(p) + if err != nil { + return "", err + } +@@ -176,7 +175,7 @@ func unluhnify(s string) (string, error) { + for i := 0; i < 4; i++ { + p := s[i*(13+1) : (i+1)*(13+1)-1] + copy(res[i*13:], p) +- l, err := luhn.Base32.Generate(p) ++ l, err := luhnBase32.generate(p) + if err != nil { + return "", err + } +diff --git a/lib/protocol/luhn.go b/lib/protocol/luhn.go +new file mode 100644 +index 000000000..ee5155f09 +--- /dev/null ++++ b/lib/protocol/luhn.go +@@ -0,0 +1,53 @@ ++// Copyright (C) 2014 The Protocol Authors. ++ ++package protocol ++ ++import ( ++ "fmt" ++ "strings" ++) ++ ++// An alphabet is a string of N characters, representing the digits of a given ++// base N. ++type luhnAlphabet string ++ ++var ( ++ luhnBase32 luhnAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567" ++) ++ ++// generate returns a check digit for the string s, which should be composed ++// of characters from the Alphabet a. ++func (a luhnAlphabet) generate(s string) (rune, error) { ++ factor := 1 ++ sum := 0 ++ n := len(a) ++ ++ for i := range s { ++ codepoint := strings.IndexByte(string(a), s[i]) ++ if codepoint == -1 { ++ return 0, fmt.Errorf("Digit %q not valid in alphabet %q", s[i], a) ++ } ++ addend := factor * codepoint ++ if factor == 2 { ++ factor = 1 ++ } else { ++ factor = 2 ++ } ++ addend = (addend / n) + (addend % n) ++ sum += addend ++ } ++ remainder := sum % n ++ checkCodepoint := (n - remainder) % n ++ return rune(a[checkCodepoint]), nil ++} ++ ++// luhnValidate returns true if the last character of the string s is correct, for ++// a string s composed of characters in the alphabet a. ++func (a luhnAlphabet) luhnValidate(s string) bool { ++ t := s[:len(s)-1] ++ c, err := a.generate(t) ++ if err != nil { ++ return false ++ } ++ return rune(s[len(s)-1]) == c ++} +diff --git a/lib/protocol/luhn_test.go b/lib/protocol/luhn_test.go +new file mode 100644 +index 000000000..fe7f80c11 +--- /dev/null ++++ b/lib/protocol/luhn_test.go +@@ -0,0 +1,48 @@ ++// Copyright (C) 2014 The Protocol Authors. ++ ++package protocol ++ ++import ( ++ "testing" ++) ++ ++func TestGenerate(t *testing.T) { ++ // Base 6 Luhn ++ a := luhnAlphabet("abcdef") ++ c, err := a.generate("abcdef") ++ if err != nil { ++ t.Fatal(err) ++ } ++ if c != 'e' { ++ t.Errorf("Incorrect check digit %c != e", c) ++ } ++ ++ // Base 10 Luhn ++ a = luhnAlphabet("0123456789") ++ c, err = a.generate("7992739871") ++ if err != nil { ++ t.Fatal(err) ++ } ++ if c != '3' { ++ t.Errorf("Incorrect check digit %c != 3", c) ++ } ++} ++ ++func TestInvalidString(t *testing.T) { ++ a := luhnAlphabet("ABC") ++ _, err := a.generate("7992739871") ++ t.Log(err) ++ if err == nil { ++ t.Error("Unexpected nil error") ++ } ++} ++ ++func TestValidate(t *testing.T) { ++ a := luhnAlphabet("abcdef") ++ if !a.luhnValidate("abcdefe") { ++ t.Errorf("Incorrect validation response for abcdefe") ++ } ++ if a.luhnValidate("abcdefd") { ++ t.Errorf("Incorrect validation response for abcdefd") ++ } ++} +diff --git a/vendor/github.com/calmh/luhn/LICENSE b/vendor/github.com/calmh/luhn/LICENSE +deleted file mode 100644 +index 0e07d0e10..000000000 +--- a/vendor/github.com/calmh/luhn/LICENSE ++++ /dev/null +@@ -1,19 +0,0 @@ +-Copyright (C) 2014 Jakob Borg +- +-Permission is hereby granted, free of charge, to any person obtaining a copy of +-this software and associated documentation files (the "Software"), to deal in +-the Software without restriction, including without limitation the rights to +-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +-of the Software, and to permit persons to whom the Software is furnished to do +-so, subject to the following conditions: +- +-- The above copyright notice and this permission notice shall be included in +- all copies or substantial portions of the Software. +- +-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-SOFTWARE. +diff --git a/vendor/github.com/calmh/luhn/luhn.go b/vendor/github.com/calmh/luhn/luhn.go +deleted file mode 100644 +index f09f3f298..000000000 +--- a/vendor/github.com/calmh/luhn/luhn.go ++++ /dev/null +@@ -1,67 +0,0 @@ +-// Copyright (C) 2014 Jakob Borg +- +-// Package luhn generates and validates Luhn mod N check digits. +-package luhn +- +-import ( +- "fmt" +- "strings" +-) +- +-// An alphabet is a string of N characters, representing the digits of a given +-// base N. +-type Alphabet string +- +-var ( +- Base32 Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567" +-) +- +-// Generate returns a check digit for the string s, which should be composed +-// of characters from the Alphabet a. +-func (a Alphabet) Generate(s string) (rune, error) { +- factor := 1 +- sum := 0 +- n := len(a) +- +- for i := range s { +- codepoint := strings.IndexByte(string(a), s[i]) +- if codepoint == -1 { +- return 0, fmt.Errorf("Digit %q not valid in alphabet %q", s[i], a) +- } +- addend := factor * codepoint +- if factor == 2 { +- factor = 1 +- } else { +- factor = 2 +- } +- addend = (addend / n) + (addend % n) +- sum += addend +- } +- remainder := sum % n +- checkCodepoint := (n - remainder) % n +- return rune(a[checkCodepoint]), nil +-} +- +-// Validate returns true if the last character of the string s is correct, for +-// a string s composed of characters in the alphabet a. +-func (a Alphabet) Validate(s string) bool { +- t := s[:len(s)-1] +- c, err := a.Generate(t) +- if err != nil { +- return false +- } +- return rune(s[len(s)-1]) == c +-} +- +-// NewAlphabet converts the given string an an Alphabet, verifying that it +-// is correct. +-func NewAlphabet(s string) (Alphabet, error) { +- cm := make(map[byte]bool, len(s)) +- for i := range s { +- if cm[s[i]] { +- return "", fmt.Errorf("Digit %q non-unique in alphabet %q", s[i], s) +- } +- cm[s[i]] = true +- } +- return Alphabet(s), nil +-} +diff --git a/vendor/manifest b/vendor/manifest +index 72d9c1c01..801a83ccb 100644 +--- a/vendor/manifest ++++ b/vendor/manifest +@@ -50,14 +50,6 @@ + "notests": true + }, + { +- "importpath": "github.com/calmh/luhn", +- "repository": "https://github.com/calmh/luhn", +- "vcs": "git", +- "revision": "c0f1d77264fb3d1bfc65b70eea6ee264058c57c0", +- "branch": "master", +- "notests": true +- }, +- { + "importpath": "github.com/calmh/xdr", + "repository": "https://github.com/calmh/xdr", + "vcs": "git", diff --git a/sources b/sources index 4d07f1c..f19f55d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.37.tar.gz) = 097fdc66c5f4454790a6962b51b40489ab8e88aff2a0ea2d063205292c37d28a41f4d038c7b1f87d978a40e490e6cbcd2dc5946d63343940aff15a04a61c390d +SHA512 (syncthing-source-v0.14.38.tar.gz) = 3cfdcd9b02c02b219263e42ada48ec0d65341ab8b0a7e427c945c3ef0d6db1cb21f566beba7decedab565e1a6e61743709d1ce72f12ec3232754917c9314745b diff --git a/syncthing.spec b/syncthing.spec index 654c5cc..14e2fbd 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -35,16 +35,16 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit c7221b035d94d459fe8bbe1e88df67b7d320b216 +%global commit a9aa375109184f0c124f8a1575c58baa2656a61b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit c7221b035d94d459fe8bbe1e88df67b7d320b216 == version 0.14.37 +# commit a9aa375109184f0c124f8a1575c58baa2656a61b == version 0.14.38 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.37 -Release: 2%{?dist} +Version: 0.14.38 +Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) License: MPLv2.0 and MIT and OFL @@ -57,6 +57,10 @@ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version} Patch0: 00-go-build-flags.patch Patch1: 00-go-build-flags-ppc64.patch +# golang(github.com/calmh/luhn) v2.0.0 has incompatible correctness fixes, +# so upstream syncthing decided to re-include an incorrect version. +Patch2: 02-luhn-fixes.patch + # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -67,10 +71,10 @@ BuildRequires: systemd %if ! 0%{?with_bundled} BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) +BuildRequires: golang(github.com/AudriusButkevicius/kcp-go) BuildRequires: golang(github.com/AudriusButkevicius/pfilter) BuildRequires: golang(github.com/bkaradzic/go-lz4) BuildRequires: golang(github.com/calmh/du) -BuildRequires: golang(github.com/calmh/luhn) BuildRequires: golang(github.com/calmh/xdr) BuildRequires: golang(github.com/ccding/go-stun/stun) BuildRequires: golang(github.com/chmduquesne/rollinghash/adler32) @@ -91,7 +95,6 @@ BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) BuildRequires: golang(github.com/thejerf/suture) BuildRequires: golang(github.com/vitrun/qart) -BuildRequires: golang(github.com/xtaci/kcp-go) BuildRequires: golang(github.com/xtaci/smux) BuildRequires: golang(golang.org/x/net/context) BuildRequires: golang(golang.org/x/net/ipv4) @@ -129,10 +132,10 @@ Provides: %{long_name}-devel = %{version}-%{release} BuildArch: noarch Requires: golang(github.com/AudriusButkevicius/go-nat-pmp) +Requires: golang(github.com/AudriusButkevicius/kcp-go) Requires: golang(github.com/AudriusButkevicius/pfilter) Requires: golang(github.com/bkaradzic/go-lz4) Requires: golang(github.com/calmh/du) -Requires: golang(github.com/calmh/luhn) Requires: golang(github.com/calmh/xdr) Requires: golang(github.com/ccding/go-stun/stun) Requires: golang(github.com/chmduquesne/rollinghash/adler32) @@ -153,7 +156,6 @@ Requires: golang(github.com/syndtr/goleveldb/leveldb/storage) Requires: golang(github.com/syndtr/goleveldb/leveldb/util) Requires: golang(github.com/thejerf/suture) Requires: golang(github.com/vitrun/qart) -Requires: golang(github.com/xtaci/kcp-go) Requires: golang(github.com/xtaci/smux) Requires: golang(golang.org/x/net/context) Requires: golang(golang.org/x/net/ipv4) @@ -197,10 +199,10 @@ Provides: golang(%{import_path}/lib/weakhash) = %{version}-%{release} %if 0%{?with_bundled} Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca +Provides: bundled(golang(github.com/AudriusButkevicius/kcp-go)) = d17218ba2121268b854dd84f2bb54679541c4048 Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 09b3cfdd04de89f0196caecb0b335d7149a6593a Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be -Provides: bundled(golang(github.com/calmh/luhn)) = 0c8388ff95fa92d4094011e5a04fc99dea3d1632 Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f Provides: bundled(golang(github.com/ccding/go-stun/stun)) = 04a4eed61c57ecc9903f8983d1d2c17b88d2e9e1 Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 043b8fdecc9816f0011a056f6d92f9a091ab63dd @@ -241,11 +243,11 @@ Provides: bundled(golang(github.com/remyoudompheng/bigfft)) = a8e77ddfb932 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 341000892f3dd25f440e6231e8533eb3688ed7ec Provides: bundled(golang(github.com/stathat/go)) = 74669b9f388d9d788c97399a0824adbfee78400e Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 3c5717caf1475fd25964109a0fc640bd150fce43 +Provides: bundled(golang(github.com/templexxx/xor)) = 42f9c041c330b560afb991153bf183c25444bcdc Provides: bundled(golang(github.com/thejerf/suture)) = 0ac47afae95ad5bc5184ed346bc945168e883f5d Provides: bundled(golang(github.com/vitrun/qart/coding)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa Provides: bundled(golang(github.com/vitrun/qart/gf256)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa Provides: bundled(golang(github.com/vitrun/qart/qr)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa -Provides: bundled(golang(github.com/xtaci/kcp-go)) = 0b0731ef3f184a8985edcb4ca26a4b0598c6dc1a Provides: bundled(golang(github.com/xtaci/smux)) = 0f6b9aaecaaf354357adc7def9239011ad276776 Provides: bundled(golang(golang.org/x/crypto/bcrypt)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd Provides: bundled(golang(golang.org/x/crypto/blowfish)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd @@ -349,6 +351,9 @@ This package contains the main syncthing server tools: %patch0 -p1 %endif +# re-import luhn code +%patch2 -p1 + %build %if ! 0%{?with_bundled} @@ -642,6 +647,10 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Wed Sep 20 2017 Fabio Valentini - 0.14.38-1 +- Update to version 0.14.38. +- Add patch to use internal luhn version again. + * Mon Sep 18 2017 Fabio Valentini - 0.14.37-2 - Rebuild for updated dependencies, fixing crashes. From 39c782cc587bc2a2eed52db2abf0f5b631355c3e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 11 Oct 2017 18:52:46 +0200 Subject: [PATCH 009/133] update to version 0.14.39 --- .gitignore | 1 + 02-luhn-fixes.patch | 280 -------------------------------------------- sources | 2 +- syncthing.spec | 16 +-- 4 files changed, 8 insertions(+), 291 deletions(-) delete mode 100644 02-luhn-fixes.patch diff --git a/.gitignore b/.gitignore index a808b4f..1377b56 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /syncthing-source-v0.14.36.tar.gz /syncthing-source-v0.14.37.tar.gz /syncthing-source-v0.14.38.tar.gz +/syncthing-source-v0.14.39.tar.gz diff --git a/02-luhn-fixes.patch b/02-luhn-fixes.patch deleted file mode 100644 index 79e780e..0000000 --- a/02-luhn-fixes.patch +++ /dev/null @@ -1,280 +0,0 @@ -From 2dd94507937276cae93ca17a8518c12b55e8ae6e Mon Sep 17 00:00:00 2001 -From: Jakob Borg -Date: Wed, 20 Sep 2017 21:34:32 +0200 -Subject: [PATCH] lib/protocol, vendor: Import luhn code directly - -I've changed it incompatibly to fix a correctness bug. Nonetheless, we -should remain incorrect indefinitely. ---- - lib/protocol/deviceid.go | 5 ++- - lib/protocol/luhn.go | 53 ++++++++++++++++++++++++++++ - lib/protocol/luhn_test.go | 48 ++++++++++++++++++++++++++ - vendor/github.com/calmh/luhn/LICENSE | 19 ---------- - vendor/github.com/calmh/luhn/luhn.go | 67 ------------------------------------ - vendor/manifest | 8 ----- - 6 files changed, 103 insertions(+), 97 deletions(-) - create mode 100644 lib/protocol/luhn.go - create mode 100644 lib/protocol/luhn_test.go - delete mode 100644 vendor/github.com/calmh/luhn/LICENSE - delete mode 100644 vendor/github.com/calmh/luhn/luhn.go - -diff --git a/lib/protocol/deviceid.go b/lib/protocol/deviceid.go -index df1cbdece..c2a30b286 100644 ---- a/lib/protocol/deviceid.go -+++ b/lib/protocol/deviceid.go -@@ -10,7 +10,6 @@ import ( - "fmt" - "strings" - -- "github.com/calmh/luhn" - "github.com/syncthing/syncthing/lib/sha256" - ) - -@@ -158,7 +157,7 @@ func luhnify(s string) (string, error) { - for i := 0; i < 4; i++ { - p := s[i*13 : (i+1)*13] - copy(res[i*(13+1):], p) -- l, err := luhn.Base32.Generate(p) -+ l, err := luhnBase32.generate(p) - if err != nil { - return "", err - } -@@ -176,7 +175,7 @@ func unluhnify(s string) (string, error) { - for i := 0; i < 4; i++ { - p := s[i*(13+1) : (i+1)*(13+1)-1] - copy(res[i*13:], p) -- l, err := luhn.Base32.Generate(p) -+ l, err := luhnBase32.generate(p) - if err != nil { - return "", err - } -diff --git a/lib/protocol/luhn.go b/lib/protocol/luhn.go -new file mode 100644 -index 000000000..ee5155f09 ---- /dev/null -+++ b/lib/protocol/luhn.go -@@ -0,0 +1,53 @@ -+// Copyright (C) 2014 The Protocol Authors. -+ -+package protocol -+ -+import ( -+ "fmt" -+ "strings" -+) -+ -+// An alphabet is a string of N characters, representing the digits of a given -+// base N. -+type luhnAlphabet string -+ -+var ( -+ luhnBase32 luhnAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567" -+) -+ -+// generate returns a check digit for the string s, which should be composed -+// of characters from the Alphabet a. -+func (a luhnAlphabet) generate(s string) (rune, error) { -+ factor := 1 -+ sum := 0 -+ n := len(a) -+ -+ for i := range s { -+ codepoint := strings.IndexByte(string(a), s[i]) -+ if codepoint == -1 { -+ return 0, fmt.Errorf("Digit %q not valid in alphabet %q", s[i], a) -+ } -+ addend := factor * codepoint -+ if factor == 2 { -+ factor = 1 -+ } else { -+ factor = 2 -+ } -+ addend = (addend / n) + (addend % n) -+ sum += addend -+ } -+ remainder := sum % n -+ checkCodepoint := (n - remainder) % n -+ return rune(a[checkCodepoint]), nil -+} -+ -+// luhnValidate returns true if the last character of the string s is correct, for -+// a string s composed of characters in the alphabet a. -+func (a luhnAlphabet) luhnValidate(s string) bool { -+ t := s[:len(s)-1] -+ c, err := a.generate(t) -+ if err != nil { -+ return false -+ } -+ return rune(s[len(s)-1]) == c -+} -diff --git a/lib/protocol/luhn_test.go b/lib/protocol/luhn_test.go -new file mode 100644 -index 000000000..fe7f80c11 ---- /dev/null -+++ b/lib/protocol/luhn_test.go -@@ -0,0 +1,48 @@ -+// Copyright (C) 2014 The Protocol Authors. -+ -+package protocol -+ -+import ( -+ "testing" -+) -+ -+func TestGenerate(t *testing.T) { -+ // Base 6 Luhn -+ a := luhnAlphabet("abcdef") -+ c, err := a.generate("abcdef") -+ if err != nil { -+ t.Fatal(err) -+ } -+ if c != 'e' { -+ t.Errorf("Incorrect check digit %c != e", c) -+ } -+ -+ // Base 10 Luhn -+ a = luhnAlphabet("0123456789") -+ c, err = a.generate("7992739871") -+ if err != nil { -+ t.Fatal(err) -+ } -+ if c != '3' { -+ t.Errorf("Incorrect check digit %c != 3", c) -+ } -+} -+ -+func TestInvalidString(t *testing.T) { -+ a := luhnAlphabet("ABC") -+ _, err := a.generate("7992739871") -+ t.Log(err) -+ if err == nil { -+ t.Error("Unexpected nil error") -+ } -+} -+ -+func TestValidate(t *testing.T) { -+ a := luhnAlphabet("abcdef") -+ if !a.luhnValidate("abcdefe") { -+ t.Errorf("Incorrect validation response for abcdefe") -+ } -+ if a.luhnValidate("abcdefd") { -+ t.Errorf("Incorrect validation response for abcdefd") -+ } -+} -diff --git a/vendor/github.com/calmh/luhn/LICENSE b/vendor/github.com/calmh/luhn/LICENSE -deleted file mode 100644 -index 0e07d0e10..000000000 ---- a/vendor/github.com/calmh/luhn/LICENSE -+++ /dev/null -@@ -1,19 +0,0 @@ --Copyright (C) 2014 Jakob Borg -- --Permission is hereby granted, free of charge, to any person obtaining a copy of --this software and associated documentation files (the "Software"), to deal in --the Software without restriction, including without limitation the rights to --use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies --of the Software, and to permit persons to whom the Software is furnished to do --so, subject to the following conditions: -- --- The above copyright notice and this permission notice shall be included in -- all copies or substantial portions of the Software. -- --THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --SOFTWARE. -diff --git a/vendor/github.com/calmh/luhn/luhn.go b/vendor/github.com/calmh/luhn/luhn.go -deleted file mode 100644 -index f09f3f298..000000000 ---- a/vendor/github.com/calmh/luhn/luhn.go -+++ /dev/null -@@ -1,67 +0,0 @@ --// Copyright (C) 2014 Jakob Borg -- --// Package luhn generates and validates Luhn mod N check digits. --package luhn -- --import ( -- "fmt" -- "strings" --) -- --// An alphabet is a string of N characters, representing the digits of a given --// base N. --type Alphabet string -- --var ( -- Base32 Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567" --) -- --// Generate returns a check digit for the string s, which should be composed --// of characters from the Alphabet a. --func (a Alphabet) Generate(s string) (rune, error) { -- factor := 1 -- sum := 0 -- n := len(a) -- -- for i := range s { -- codepoint := strings.IndexByte(string(a), s[i]) -- if codepoint == -1 { -- return 0, fmt.Errorf("Digit %q not valid in alphabet %q", s[i], a) -- } -- addend := factor * codepoint -- if factor == 2 { -- factor = 1 -- } else { -- factor = 2 -- } -- addend = (addend / n) + (addend % n) -- sum += addend -- } -- remainder := sum % n -- checkCodepoint := (n - remainder) % n -- return rune(a[checkCodepoint]), nil --} -- --// Validate returns true if the last character of the string s is correct, for --// a string s composed of characters in the alphabet a. --func (a Alphabet) Validate(s string) bool { -- t := s[:len(s)-1] -- c, err := a.Generate(t) -- if err != nil { -- return false -- } -- return rune(s[len(s)-1]) == c --} -- --// NewAlphabet converts the given string an an Alphabet, verifying that it --// is correct. --func NewAlphabet(s string) (Alphabet, error) { -- cm := make(map[byte]bool, len(s)) -- for i := range s { -- if cm[s[i]] { -- return "", fmt.Errorf("Digit %q non-unique in alphabet %q", s[i], s) -- } -- cm[s[i]] = true -- } -- return Alphabet(s), nil --} -diff --git a/vendor/manifest b/vendor/manifest -index 72d9c1c01..801a83ccb 100644 ---- a/vendor/manifest -+++ b/vendor/manifest -@@ -50,14 +50,6 @@ - "notests": true - }, - { -- "importpath": "github.com/calmh/luhn", -- "repository": "https://github.com/calmh/luhn", -- "vcs": "git", -- "revision": "c0f1d77264fb3d1bfc65b70eea6ee264058c57c0", -- "branch": "master", -- "notests": true -- }, -- { - "importpath": "github.com/calmh/xdr", - "repository": "https://github.com/calmh/xdr", - "vcs": "git", diff --git a/sources b/sources index f19f55d..ffda390 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.38.tar.gz) = 3cfdcd9b02c02b219263e42ada48ec0d65341ab8b0a7e427c945c3ef0d6db1cb21f566beba7decedab565e1a6e61743709d1ce72f12ec3232754917c9314745b +SHA512 (syncthing-source-v0.14.39.tar.gz) = 8147b635a86372269758f09112a8220f514f5367e3179b6bd7afc5ec397abf1b34b0564358fad2876dd4f99207d22bfa1a0e450efd07db91adaa923cc6ba0c00 diff --git a/syncthing.spec b/syncthing.spec index 14e2fbd..859c87f 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -35,15 +35,15 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit a9aa375109184f0c124f8a1575c58baa2656a61b +%global commit 5aade9a4a5506e5b71b2a9ab863790dca488700e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit a9aa375109184f0c124f8a1575c58baa2656a61b == version 0.14.38 +# commit 5aade9a4a5506e5b71b2a9ab863790dca488700e == version 0.14.39 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.38 +Version: 0.14.39 Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) @@ -57,10 +57,6 @@ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version} Patch0: 00-go-build-flags.patch Patch1: 00-go-build-flags-ppc64.patch -# golang(github.com/calmh/luhn) v2.0.0 has incompatible correctness fixes, -# so upstream syncthing decided to re-include an incorrect version. -Patch2: 02-luhn-fixes.patch - # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -351,9 +347,6 @@ This package contains the main syncthing server tools: %patch0 -p1 %endif -# re-import luhn code -%patch2 -p1 - %build %if ! 0%{?with_bundled} @@ -647,6 +640,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Wed Oct 11 2017 Fabio Valentini - 0.14.39-1 +- Update to version 0.14.39. + * Wed Sep 20 2017 Fabio Valentini - 0.14.38-1 - Update to version 0.14.38. - Add patch to use internal luhn version again. From ba4b6d76774f990a7b45f875964a3158b358b58a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 7 Nov 2017 22:09:18 +0100 Subject: [PATCH 010/133] update to version 0.14.40 --- .gitignore | 1 + 00-go-build-flags-ppc64.patch | 12 ++++++------ 00-go-build-flags.patch | 12 ++++++------ sources | 2 +- syncthing.spec | 22 ++++++++++++++++------ 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 1377b56..d4dfd6c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /syncthing-source-v0.14.37.tar.gz /syncthing-source-v0.14.38.tar.gz /syncthing-source-v0.14.39.tar.gz +/syncthing-source-v0.14.40.tar.gz diff --git a/00-go-build-flags-ppc64.patch b/00-go-build-flags-ppc64.patch index 4605292..7177de3 100644 --- a/00-go-build-flags-ppc64.patch +++ b/00-go-build-flags-ppc64.patch @@ -1,8 +1,8 @@ diff --git a/build.go b/build.go -index d8e7f00..bdceb0d 100644 +index 3744feb..7a4494a 100644 --- a/build.go +++ b/build.go -@@ -424,9 +424,16 @@ func build(target target, tags []string) { +@@ -443,9 +443,16 @@ func build(target target, tags []string) { lazyRebuildAssets() tags = append(target.tags, tags...) @@ -15,12 +15,12 @@ index d8e7f00..bdceb0d 100644 + ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", + ldflags(), os.Getenv("LDFLAGS"), build_id) + -+ args := []string{"build", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} ++ args := []string{"build", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} + - if len(tags) > 0 { - args = append(args, "-tags", strings.Join(tags, " ")) + if pkgdir != "" { + args = append(args, "-pkgdir", pkgdir) } -@@ -702,11 +709,10 @@ func ldflags() string { +@@ -724,11 +731,10 @@ func ldflags() string { } b := new(bytes.Buffer) diff --git a/00-go-build-flags.patch b/00-go-build-flags.patch index ea6df26..f69d1aa 100644 --- a/00-go-build-flags.patch +++ b/00-go-build-flags.patch @@ -1,8 +1,8 @@ diff --git a/build.go b/build.go -index d8e7f00..bdceb0d 100644 +index 3744feb..7a4494a 100644 --- a/build.go +++ b/build.go -@@ -424,9 +424,16 @@ func build(target target, tags []string) { +@@ -443,9 +443,16 @@ func build(target target, tags []string) { lazyRebuildAssets() tags = append(target.tags, tags...) @@ -15,12 +15,12 @@ index d8e7f00..bdceb0d 100644 + ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", + ldflags(), os.Getenv("LDFLAGS"), build_id) + -+ args := []string{"build", "-buildmode", "pie", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} ++ args := []string{"build", "-buildmode", "pie", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} + - if len(tags) > 0 { - args = append(args, "-tags", strings.Join(tags, " ")) + if pkgdir != "" { + args = append(args, "-pkgdir", pkgdir) } -@@ -702,11 +709,10 @@ func ldflags() string { +@@ -724,11 +731,10 @@ func ldflags() string { } b := new(bytes.Buffer) diff --git a/sources b/sources index ffda390..f881259 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.39.tar.gz) = 8147b635a86372269758f09112a8220f514f5367e3179b6bd7afc5ec397abf1b34b0564358fad2876dd4f99207d22bfa1a0e450efd07db91adaa923cc6ba0c00 +SHA512 (syncthing-source-v0.14.40.tar.gz) = a4e93b110e9b31d3e09b6efb3723105c2ea95ed30a85ec9f6206069ee00fe11b7daf05043ab9f2cf07311467742ed7310e22e14077241b00212ad28b79afba42 diff --git a/syncthing.spec b/syncthing.spec index 859c87f..06409e6 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -35,15 +35,15 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 5aade9a4a5506e5b71b2a9ab863790dca488700e +%global commit 5f8c0ca932e8d737a0616ec449e82cff3732afcf %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 5aade9a4a5506e5b71b2a9ab863790dca488700e == version 0.14.39 +# commit 5f8c0ca932e8d737a0616ec449e82cff3732afcf == version 0.14.39 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.39 +Version: 0.14.40 Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) @@ -65,7 +65,7 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: systemd %{?systemd_requires} -%if ! 0%{?with_bundled} +%if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) BuildRequires: golang(github.com/AudriusButkevicius/kcp-go) BuildRequires: golang(github.com/AudriusButkevicius/pfilter) @@ -92,6 +92,7 @@ BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) BuildRequires: golang(github.com/thejerf/suture) BuildRequires: golang(github.com/vitrun/qart) BuildRequires: golang(github.com/xtaci/smux) +BuildRequires: golang(github.com/zillode/notify) BuildRequires: golang(golang.org/x/net/context) BuildRequires: golang(golang.org/x/net/ipv4) BuildRequires: golang(golang.org/x/net/ipv6) @@ -153,6 +154,7 @@ Requires: golang(github.com/syndtr/goleveldb/leveldb/util) Requires: golang(github.com/thejerf/suture) Requires: golang(github.com/vitrun/qart) Requires: golang(github.com/xtaci/smux) +Requires: golang(github.com/zillode/notify) Requires: golang(golang.org/x/net/context) Requires: golang(golang.org/x/net/ipv4) Requires: golang(golang.org/x/net/ipv6) @@ -190,12 +192,13 @@ Provides: golang(%{import_path}/lib/upgrade) = %{version}-%{release} Provides: golang(%{import_path}/lib/upnp) = %{version}-%{release} Provides: golang(%{import_path}/lib/util) = %{version}-%{release} Provides: golang(%{import_path}/lib/versioner) = %{version}-%{release} +Provides: golang(%{import_path}/lib/watchaggregator) = %{version}-%{release} Provides: golang(%{import_path}/lib/weakhash) = %{version}-%{release} %if 0%{?with_bundled} Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca -Provides: bundled(golang(github.com/AudriusButkevicius/kcp-go)) = d17218ba2121268b854dd84f2bb54679541c4048 +Provides: bundled(golang(github.com/AudriusButkevicius/kcp-go)) = 8ae5f528469c6ab76110f41eb7a51341b7efb946 Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 09b3cfdd04de89f0196caecb0b335d7149a6593a Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be @@ -225,7 +228,6 @@ Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e01d3fa Provides: bundled(golang(github.com/kardianos/osext)) = 9d302b58e975387d0b4d9be876622c86cefe64be Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657ff3dc51de0b4f55dd299a3e136f2 Provides: bundled(golang(github.com/klauspost/cpuid)) = 09cded8978dc9e80714c4d85b0322337b0a1e5e0 -Provides: bundled(golang(github.com/klauspost/reedsolomon)) = 5abf0ee302ccf4834e84f63ff74eca3e8b88e4e2 Provides: bundled(golang(github.com/lib/pq)) = 2704adc878c21e1329f46f6e56a1c387d788ff94 Provides: bundled(golang(github.com/minio/sha256-simd)) = 6124d070eb4e7001c244b6ccc282620a5dce44a0 Provides: bundled(golang(github.com/onsi/ginkgo)) = 77a8c1e5c40d6bb6c5eb4dd4bdce9763564f6298 @@ -239,12 +241,16 @@ Provides: bundled(golang(github.com/remyoudompheng/bigfft)) = a8e77ddfb932 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 341000892f3dd25f440e6231e8533eb3688ed7ec Provides: bundled(golang(github.com/stathat/go)) = 74669b9f388d9d788c97399a0824adbfee78400e Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 3c5717caf1475fd25964109a0fc640bd150fce43 +Provides: bundled(golang(github.com/templexxx/cpufeat)) = 3794dfbfb04749f896b521032f69383f24c3687e +Provides: bundled(golang(github.com/templexxx/reedsolomon)) = 7092926d7d05c415fabb892b1464a03f8228ab80 Provides: bundled(golang(github.com/templexxx/xor)) = 42f9c041c330b560afb991153bf183c25444bcdc Provides: bundled(golang(github.com/thejerf/suture)) = 0ac47afae95ad5bc5184ed346bc945168e883f5d +Provides: bundled(golang(github.com/tjfoc/gmsm/sm4)) = 0f4904804c0f24f1784e10195a4144fcffa86a85 Provides: bundled(golang(github.com/vitrun/qart/coding)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa Provides: bundled(golang(github.com/vitrun/qart/gf256)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa Provides: bundled(golang(github.com/vitrun/qart/qr)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa Provides: bundled(golang(github.com/xtaci/smux)) = 0f6b9aaecaaf354357adc7def9239011ad276776 +Provides: bundled(golang(github.com/zillode/notify)) = 54e3093eb7377fd139c4605f475cc78e83610b9d Provides: bundled(golang(golang.org/x/crypto/bcrypt)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd Provides: bundled(golang(golang.org/x/crypto/blowfish)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd Provides: bundled(golang(golang.org/x/crypto/cast5)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd @@ -566,6 +572,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} # https://github.com/syncthing/syncthing/issues/4351 %gotest %{import_path}/lib/versioner || : +%gotest %{import_path}/lib/watchaggregator %gotest %{import_path}/lib/weakhash # Clean up after the tests @@ -640,6 +647,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Nov 07 2017 Fabio Valentini - 0.14.40-1 +- Update to version 0.14.40. + * Wed Oct 11 2017 Fabio Valentini - 0.14.39-1 - Update to version 0.14.39. From b1491bc32e959b4ad54476d68f8bee1f4f399fa4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 5 Dec 2017 11:56:49 +0100 Subject: [PATCH 011/133] update to version 0.14.41 and enable building the CLI program --- .gitignore | 1 + sources | 2 +- syncthing.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 56 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d4dfd6c..94fd679 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /syncthing-source-v0.14.38.tar.gz /syncthing-source-v0.14.39.tar.gz /syncthing-source-v0.14.40.tar.gz +/syncthing-source-v0.14.41.tar.gz diff --git a/sources b/sources index f881259..666ff4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.40.tar.gz) = a4e93b110e9b31d3e09b6efb3723105c2ea95ed30a85ec9f6206069ee00fe11b7daf05043ab9f2cf07311467742ed7310e22e14077241b00212ad28b79afba42 +SHA512 (syncthing-source-v0.14.41.tar.gz) = 9b0e036b1ffa6b3bd1f5217d31a6090d68096dcb4ee37485a86d3d634c1c090c58bd8026d8de9bfe6bf17917af5c58e3860789b989d8533812586feeef06d2fc diff --git a/syncthing.spec b/syncthing.spec index 06409e6..ac0b677 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -20,6 +20,9 @@ # Build server tools %global with_tools 1 +# Build CLI program +%global with_cli 1 + %if 0%{?with_debug} %global _dwz_low_mem_die_limit 0 @@ -27,6 +30,14 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%ifnarch ppc64 +%global gobuild(o:) go build -buildmode pie -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +%else +%global gobuild(o:) go build -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +%endif +%endif + %global provider github %global provider_tld com %global project syncthing @@ -35,15 +46,15 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 5f8c0ca932e8d737a0616ec449e82cff3732afcf +%global commit 99b00b6a5e723f7b8214273d694d4ffc7a609bbc %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 5f8c0ca932e8d737a0616ec449e82cff3732afcf == version 0.14.39 +# commit 99b00b6a5e723f7b8214273d694d4ffc7a609bbc == version 0.14.41 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.40 +Version: 0.14.41 Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) @@ -199,11 +210,11 @@ Provides: golang(%{import_path}/lib/weakhash) = %{version}-%{release} Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca Provides: bundled(golang(github.com/AudriusButkevicius/kcp-go)) = 8ae5f528469c6ab76110f41eb7a51341b7efb946 -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 09b3cfdd04de89f0196caecb0b335d7149a6593a +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 56143fe9cebe95636de1275acf30fcca36a1383d Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f -Provides: bundled(golang(github.com/ccding/go-stun/stun)) = 04a4eed61c57ecc9903f8983d1d2c17b88d2e9e1 +Provides: bundled(golang(github.com/ccding/go-stun/stun)) = 9d33469f1f20a1674659be94ac9ca94ab5f06f58 Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 043b8fdecc9816f0011a056f6d92f9a091ab63dd Provides: bundled(golang(github.com/cznic/b)) = aaaa43c92e509a827e63540510bc94c3003ef2e1 Provides: bundled(golang(github.com/cznic/fileutil)) = 90cf820aafe8f7df39416fdbb932029ff99bd1ab @@ -240,7 +251,7 @@ Provides: bundled(golang(github.com/rcrowley/go-metrics)) = 1f30fe9094a513 Provides: bundled(golang(github.com/remyoudompheng/bigfft)) = a8e77ddfb93284b9d58881f597c820a2875af336 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 341000892f3dd25f440e6231e8533eb3688ed7ec Provides: bundled(golang(github.com/stathat/go)) = 74669b9f388d9d788c97399a0824adbfee78400e -Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 3c5717caf1475fd25964109a0fc640bd150fce43 +Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 549b6d6b1c0419617182954dd77770f2e2685ed5 Provides: bundled(golang(github.com/templexxx/cpufeat)) = 3794dfbfb04749f896b521032f69383f24c3687e Provides: bundled(golang(github.com/templexxx/reedsolomon)) = 7092926d7d05c415fabb892b1464a03f8228ab80 Provides: bundled(golang(github.com/templexxx/xor)) = 42f9c041c330b560afb991153bf183c25444bcdc @@ -343,6 +354,26 @@ This package contains the main syncthing server tools: %endif +%if 0%{?with_cli} +%package cli +Summary: Continuous File Synchronization (CLI) +Requires: %{name}%{?_isa} = %{version}-%{release} + +%if ! 0%{?with_bundled} +BuildRequires: golang(github.com/AudriusButkevicius/cli) +%endif + +%description cli +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 CLI program. +%endif + + %prep %setup -q -n syncthing @@ -399,6 +430,10 @@ go run build.go -no-upgrade build strelaypoolsrv popd +%if 0%{?with_cli} +%gobuild -o stcli %{import_path}/cmd/stcli +%endif + # remove build script so it doesn't get picked up later %if 0%{?with_devel} rm build.go @@ -417,6 +452,10 @@ cp -pav ./strelaysrv %{buildroot}/%{_bindir}/ cp -pav ./strelaypoolsrv %{buildroot}/%{_bindir}/ %endif +%if 0%{?with_cli} +cp -pav ./stcli %{buildroot}/%{_bindir}/ +%endif + # install man pages mkdir -p %{buildroot}/%{_mandir}/man1 mkdir -p %{buildroot}/%{_mandir}/man5 @@ -631,6 +670,12 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %endif +%if 0%{?with_cli} +%files cli +%{_bindir}/stcli +%endif + + %if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE @@ -647,6 +692,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Dec 05 2017 Fabio Valentini - 0.14.41-1 +- Update to version 0.14.41. + * Tue Nov 07 2017 Fabio Valentini - 0.14.40-1 - Update to version 0.14.40. From 2ad7ae82b24a0a033d8383277fb8fbbd84c5ee9a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 26 Dec 2017 23:30:54 +0100 Subject: [PATCH 012/133] update to version 0.14.42 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 94fd679..00b047a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /syncthing-source-v0.14.39.tar.gz /syncthing-source-v0.14.40.tar.gz /syncthing-source-v0.14.41.tar.gz +/syncthing-source-v0.14.42.tar.gz diff --git a/sources b/sources index 666ff4d..3bf8d66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.41.tar.gz) = 9b0e036b1ffa6b3bd1f5217d31a6090d68096dcb4ee37485a86d3d634c1c090c58bd8026d8de9bfe6bf17917af5c58e3860789b989d8533812586feeef06d2fc +SHA512 (syncthing-source-v0.14.42.tar.gz) = 83d5eec2458a99c4a2c2051ef85e6ad4370a0a54bfff4399977c5f0d7a0ea69222e8bb5dd970c1fbfbd09cdb9fcfc2ba31d75fcfdd86b0a0bc875ee5abe224a4 diff --git a/syncthing.spec b/syncthing.spec index ac0b677..a39f1d9 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -46,15 +46,15 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 99b00b6a5e723f7b8214273d694d4ffc7a609bbc +%global commit 8fd2937a583edc39f4a65eb47063b2ddcb407728 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 99b00b6a5e723f7b8214273d694d4ffc7a609bbc == version 0.14.41 +# commit 8fd2937a583edc39f4a65eb47063b2ddcb407728 == version 0.14.41 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.41 +Version: 0.14.42 Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) @@ -210,11 +210,11 @@ Provides: golang(%{import_path}/lib/weakhash) = %{version}-%{release} Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca Provides: bundled(golang(github.com/AudriusButkevicius/kcp-go)) = 8ae5f528469c6ab76110f41eb7a51341b7efb946 -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 56143fe9cebe95636de1275acf30fcca36a1383d +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 9dca34a5b530bfc9843fa8aa2ff08ff9821032cb Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f -Provides: bundled(golang(github.com/ccding/go-stun/stun)) = 9d33469f1f20a1674659be94ac9ca94ab5f06f58 +Provides: bundled(golang(github.com/ccding/go-stun)) = d9bbe8f8fa7bf7ed03e6cfc6a2796bb36139e1f4 Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 043b8fdecc9816f0011a056f6d92f9a091ab63dd Provides: bundled(golang(github.com/cznic/b)) = aaaa43c92e509a827e63540510bc94c3003ef2e1 Provides: bundled(golang(github.com/cznic/fileutil)) = 90cf820aafe8f7df39416fdbb932029ff99bd1ab @@ -692,6 +692,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Dec 26 2017 Fabio Valentini - 0.14.42-1 +- Update to version 0.14.42. + * Tue Dec 05 2017 Fabio Valentini - 0.14.41-1 - Update to version 0.14.41. From 637592cdd14e7f6ebf3ae6b9764c3f1c26a442d8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 18 Jan 2018 16:43:37 +0100 Subject: [PATCH 013/133] update to version 0.14.43 This commit also removes conditionals for building with bundled sources, and introduces Provides and Obsoletes for the (in rawhide) retired syncthing-inotify package. --- .gitignore | 1 + sources | 2 +- syncthing.spec | 143 +++++-------------------------------------------- 3 files changed, 16 insertions(+), 130 deletions(-) diff --git a/.gitignore b/.gitignore index 00b047a..5ea46a1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /syncthing-source-v0.14.40.tar.gz /syncthing-source-v0.14.41.tar.gz /syncthing-source-v0.14.42.tar.gz +/syncthing-source-v0.14.43.tar.gz diff --git a/sources b/sources index 3bf8d66..e283a64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.42.tar.gz) = 83d5eec2458a99c4a2c2051ef85e6ad4370a0a54bfff4399977c5f0d7a0ea69222e8bb5dd970c1fbfbd09cdb9fcfc2ba31d75fcfdd86b0a0bc875ee5abe224a4 +SHA512 (syncthing-source-v0.14.43.tar.gz) = f2c8b0ca5971cd2fbbcba193917ba73c0d7932937a8c18821348a6bfe6a4df854284336694591dba4aba0b8eeb16452dc5887535035c81a8c66c85bd711f16db diff --git a/syncthing.spec b/syncthing.spec index a39f1d9..529fb9d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,43 +1,24 @@ # Generate devel rpm %global with_devel 1 - # Build project from bundled dependencies -%if 0%{?rhel} -%global with_bundled 1 -%else %global with_bundled 0 -%endif - # Build with debug info rpm %global with_debug 1 - # Run tests in check section %global with_check 1 - # Generate unit-test rpm %global with_unit_test 1 - # Build server tools %global with_tools 1 - # Build CLI program %global with_cli 1 - %if 0%{?with_debug} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} -%ifnarch ppc64 -%global gobuild(o:) go build -buildmode pie -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; -%else -%global gobuild(o:) go build -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; -%endif -%endif - %global provider github %global provider_tld com %global project syncthing @@ -46,15 +27,15 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 8fd2937a583edc39f4a65eb47063b2ddcb407728 +%global commit a9f0659f2f4bf910f82b652fd27a864074ec7ab8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 8fd2937a583edc39f4a65eb47063b2ddcb407728 == version 0.14.41 +# commit a9f0659f2f4bf910f82b652fd27a864074ec7ab8 == version 0.14.43 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.42 +Version: 0.14.43 Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) @@ -78,7 +59,6 @@ BuildRequires: systemd %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) -BuildRequires: golang(github.com/AudriusButkevicius/kcp-go) BuildRequires: golang(github.com/AudriusButkevicius/pfilter) BuildRequires: golang(github.com/bkaradzic/go-lz4) BuildRequires: golang(github.com/calmh/du) @@ -102,6 +82,7 @@ BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) BuildRequires: golang(github.com/thejerf/suture) BuildRequires: golang(github.com/vitrun/qart) +BuildRequires: golang(github.com/xtaci/kcp-go) BuildRequires: golang(github.com/xtaci/smux) BuildRequires: golang(github.com/zillode/notify) BuildRequires: golang(golang.org/x/net/context) @@ -122,6 +103,10 @@ Provides: bundled(bootstrap) = 3.3.6 Provides: bundled(font-awesome) = 4.5.0 Provides: bundled(jquery) = 2.2.2 +# an inotify filesystem watcher is integrated with syncthing now +Provides: syncthing-inotify = 0.8.7-5 +Obsoletes: syncthing-inotify < 0.8.7-5 + %description Syncthing replaces other file synchronization services with something @@ -140,7 +125,6 @@ Provides: %{long_name}-devel = %{version}-%{release} BuildArch: noarch Requires: golang(github.com/AudriusButkevicius/go-nat-pmp) -Requires: golang(github.com/AudriusButkevicius/kcp-go) Requires: golang(github.com/AudriusButkevicius/pfilter) Requires: golang(github.com/bkaradzic/go-lz4) Requires: golang(github.com/calmh/du) @@ -164,6 +148,7 @@ Requires: golang(github.com/syndtr/goleveldb/leveldb/storage) Requires: golang(github.com/syndtr/goleveldb/leveldb/util) Requires: golang(github.com/thejerf/suture) Requires: golang(github.com/vitrun/qart) +Requires: golang(github.com/xtaci/kcp-go) Requires: golang(github.com/xtaci/smux) Requires: golang(github.com/zillode/notify) Requires: golang(golang.org/x/net/context) @@ -206,89 +191,6 @@ Provides: golang(%{import_path}/lib/versioner) = %{version}-%{release} Provides: golang(%{import_path}/lib/watchaggregator) = %{version}-%{release} Provides: golang(%{import_path}/lib/weakhash) = %{version}-%{release} -%if 0%{?with_bundled} -Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb -Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca -Provides: bundled(golang(github.com/AudriusButkevicius/kcp-go)) = 8ae5f528469c6ab76110f41eb7a51341b7efb946 -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 9dca34a5b530bfc9843fa8aa2ff08ff9821032cb -Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a -Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be -Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f -Provides: bundled(golang(github.com/ccding/go-stun)) = d9bbe8f8fa7bf7ed03e6cfc6a2796bb36139e1f4 -Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 043b8fdecc9816f0011a056f6d92f9a091ab63dd -Provides: bundled(golang(github.com/cznic/b)) = aaaa43c92e509a827e63540510bc94c3003ef2e1 -Provides: bundled(golang(github.com/cznic/fileutil)) = 90cf820aafe8f7df39416fdbb932029ff99bd1ab -Provides: bundled(golang(github.com/cznic/internal/buffer)) = e5e1c3e9165d0a72507c2bbb0ffac1c02b8d3f7c -Provides: bundled(golang(github.com/cznic/internal/file)) = e5e1c3e9165d0a72507c2bbb0ffac1c02b8d3f7c -Provides: bundled(golang(github.com/cznic/internal/slice)) = e5e1c3e9165d0a72507c2bbb0ffac1c02b8d3f7c -Provides: bundled(golang(github.com/cznic/lldb)) = bea8611dd5c407f3c5eab9f9c68e887a27dc6f0e -Provides: bundled(golang(github.com/cznic/mathutil)) = 1447ad269d64ca91aa8d7079baa40b6fc8b965e7 -Provides: bundled(golang(github.com/cznic/ql)) = bd2055c7674ac80c520815dfe85082844cd246d4 -Provides: bundled(golang(github.com/cznic/sortutil)) = 4c7342852e65c2088c981288f2c5610d10b9f7f4 -Provides: bundled(golang(github.com/cznic/strutil)) = 43a89592ed56c227c7fdb1fcaf7d1d08be02ec54 -Provides: bundled(golang(github.com/cznic/zappy)) = 2533cb5b45cc6c07421468ce262899ddc9d53fb7 -Provides: bundled(golang(github.com/d4l3k/messagediff)) = 2fe2a1d40db6c23619ae5bcc8f80a5b43c40581b -Provides: bundled(golang(github.com/edsrzf/mmap-go)) = 0bce6a6887123b67a60366d2c9fe2dfb74289d2e -Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d931c66d229ceeb7c31b985563420 -Provides: bundled(golang(github.com/gogo/protobuf)) = efccd33a0c20aa078705571d5ddbfa14c8395a63 -Provides: bundled(golang(github.com/golang/groupcache/lru)) = 72d04f9fcdec7d3821820cc4a6f150eae553639a -Provides: bundled(golang(github.com/golang/protobuf/proto)) = 2bba0603135d7d7f5cb73b2125beeda19c09f4ef -Provides: bundled(golang(github.com/golang/protobuf/ptypes/any)) = 2bba0603135d7d7f5cb73b2125beeda19c09f4ef -Provides: bundled(golang(github.com/golang/snappy)) = 553a641470496b2327abcac10b36396bd98e45c9 -Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e01d3fab7bcf21c043c3d6a32b006 -Provides: bundled(golang(github.com/kardianos/osext)) = 9d302b58e975387d0b4d9be876622c86cefe64be -Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657ff3dc51de0b4f55dd299a3e136f2 -Provides: bundled(golang(github.com/klauspost/cpuid)) = 09cded8978dc9e80714c4d85b0322337b0a1e5e0 -Provides: bundled(golang(github.com/lib/pq)) = 2704adc878c21e1329f46f6e56a1c387d788ff94 -Provides: bundled(golang(github.com/minio/sha256-simd)) = 6124d070eb4e7001c244b6ccc282620a5dce44a0 -Provides: bundled(golang(github.com/onsi/ginkgo)) = 77a8c1e5c40d6bb6c5eb4dd4bdce9763564f6298 -Provides: bundled(golang(github.com/onsi/gomega)) = 334b8f472b3af5d541c5642701c1e29e2126f486 -Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 0fd242da7906550802871efe101abfdb1cc550a8 -Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 697da8075d2061aa8ed639346443f5d3e8c80b30 -Provides: bundled(golang(github.com/petermattis/goid)) = caab6446a35a918488a0f52d4b0bd088a60f3511 -Provides: bundled(golang(github.com/pkg/errors)) = ff09b135c25aae272398c51a07235b90a75aa4f0 -Provides: bundled(golang(github.com/rcrowley/go-metrics)) = 1f30fe9094a513ce4c700b9a54458bbb0c96996c -Provides: bundled(golang(github.com/remyoudompheng/bigfft)) = a8e77ddfb93284b9d58881f597c820a2875af336 -Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 341000892f3dd25f440e6231e8533eb3688ed7ec -Provides: bundled(golang(github.com/stathat/go)) = 74669b9f388d9d788c97399a0824adbfee78400e -Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 549b6d6b1c0419617182954dd77770f2e2685ed5 -Provides: bundled(golang(github.com/templexxx/cpufeat)) = 3794dfbfb04749f896b521032f69383f24c3687e -Provides: bundled(golang(github.com/templexxx/reedsolomon)) = 7092926d7d05c415fabb892b1464a03f8228ab80 -Provides: bundled(golang(github.com/templexxx/xor)) = 42f9c041c330b560afb991153bf183c25444bcdc -Provides: bundled(golang(github.com/thejerf/suture)) = 0ac47afae95ad5bc5184ed346bc945168e883f5d -Provides: bundled(golang(github.com/tjfoc/gmsm/sm4)) = 0f4904804c0f24f1784e10195a4144fcffa86a85 -Provides: bundled(golang(github.com/vitrun/qart/coding)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa -Provides: bundled(golang(github.com/vitrun/qart/gf256)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa -Provides: bundled(golang(github.com/vitrun/qart/qr)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa -Provides: bundled(golang(github.com/xtaci/smux)) = 0f6b9aaecaaf354357adc7def9239011ad276776 -Provides: bundled(golang(github.com/zillode/notify)) = 54e3093eb7377fd139c4605f475cc78e83610b9d -Provides: bundled(golang(golang.org/x/crypto/bcrypt)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/crypto/blowfish)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/crypto/cast5)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/crypto/pbkdf2)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/crypto/salsa20)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/crypto/tea)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/crypto/twofish)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/crypto/xtea)) = c78caca803c95773f48a844d3dcab04b9bc4d6dd -Provides: bundled(golang(golang.org/x/net/bpf)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d -Provides: bundled(golang(golang.org/x/net/context)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d -Provides: bundled(golang(golang.org/x/net/internal/iana)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d -Provides: bundled(golang(golang.org/x/net/internal/netreflect)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d -Provides: bundled(golang(golang.org/x/net/ipv4)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d -Provides: bundled(golang(golang.org/x/net/ipv6)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d -Provides: bundled(golang(golang.org/x/net/proxy)) = ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d -Provides: bundled(golang(golang.org/x/sys/unix)) = f3918c30c5c2cb527c0b071a27c35120a6c0719a -Provides: bundled(golang(golang.org/x/sys/windows)) = 493114f68206f85e7e333beccfabc11e98cba8dd -Provides: bundled(golang(golang.org/x/text/internal/gen)) = f4b4367115ec2de254587813edaa901bc1c723a8 -Provides: bundled(golang(golang.org/x/text/internal/triegen)) = f4b4367115ec2de254587813edaa901bc1c723a8 -Provides: bundled(golang(golang.org/x/text/internal/ucd)) = f4b4367115ec2de254587813edaa901bc1c723a8 -Provides: bundled(golang(golang.org/x/text/transform)) = f4b4367115ec2de254587813edaa901bc1c723a8 -Provides: bundled(golang(golang.org/x/text/unicode/cldr)) = f4b4367115ec2de254587813edaa901bc1c723a8 -Provides: bundled(golang(golang.org/x/text/unicode/norm)) = f4b4367115ec2de254587813edaa901bc1c723a8 -Provides: bundled(golang(golang.org/x/time/rate)) = f51c12702a4d776e4c1fa9b0fabab841babae631 -Provides: bundled(golang(gopkg.in/yaml.v2)) = a3f3340b5840cee44f372bddb5880fcbc419b46a -%endif - %description devel Syncthing replaces other file synchronization services with something open, trustworthy and decentralized. Your data is your data alone and @@ -386,16 +288,8 @@ This package contains the CLI program. %build -%if ! 0%{?with_bundled} # remove bundled libraries rm -r vendor -%endif - -# Replace usage of "context" package (go 1.7+ only) with the old -# "golang.org/x/net/context" package if only an old compiler is available -%if 0%{?fedora} == 24 || 0%{?rhel} -sed -i 's/"context"/"golang.org\/x\/net\/context"/' cmd/syncthing/*.go lib/*/*.go -%endif # prepare build environment mkdir -p ./_build/src/%{provider}.%{provider_tld}/%{project} @@ -435,9 +329,7 @@ popd %endif # remove build script so it doesn't get picked up later -%if 0%{?with_devel} rm build.go -%endif %install @@ -480,7 +372,7 @@ cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ # install systemd preset disabling the service per default mkdir -p %{buildroot}/%{_prefix}/lib/systemd/user-preset -echo "disable syncthing*" > %{buildroot}/%{_prefix}/lib/systemd/user-preset/90-syncthing.preset +echo "disable syncthing*" > %{buildroot}/%{_userpresetdir}/90-syncthing.preset # Unmark source files as executable @@ -559,16 +451,7 @@ sort -u -o unit-test-devel.file-list unit-test-devel.file-list %check %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# Since we aren't packaging up the vendor directory we need to link -# back to it somehow. Hack it up so that we can add the vendor -# directory from BUILD dir as a gopath to be searched when executing -# tests from the BUILDROOT dir. -ln -s ./ ./vendor/src # ./vendor/src -> ./vendor -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} -%endif %if ! 0%{?gotest:1} %global gotest go test @@ -652,8 +535,7 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %{_unitdir}/syncthing@.service %{_unitdir}/syncthing-resume.service %{_userunitdir}/syncthing.service - -%{_prefix}/lib/systemd/user-preset/90-syncthing.preset +%{_userpresetdir}/90-syncthing.preset %if 0%{?with_tools} @@ -692,6 +574,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Jan 09 2018 Fabio Valentini - 0.14.43-1 +- Update to version 0.14.43. + * Tue Dec 26 2017 Fabio Valentini - 0.14.42-1 - Update to version 0.14.42. From 21fa27409e95eacf8507d11d75971eab0aa419a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 18:18:09 +0000 Subject: [PATCH 014/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 529fb9d..8d30fd5 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -36,7 +36,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 0.14.43 -Release: 1%{?dist} +Release: 2%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) License: MPLv2.0 and MIT and OFL @@ -574,6 +574,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.14.43-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 09 2018 Fabio Valentini - 0.14.43-1 - Update to version 0.14.43. From 33bd6bfc3180c1c5346785991879b598d1209c51 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 13 Feb 2018 12:08:37 +0100 Subject: [PATCH 015/133] update to version 0.14.44 This build also includes a completely refreshed set of BuildRequires and Requires (since upstream likes to change what they depend on a lot). The patches to the upstream build script were rebased (again). The plan is to drop those patches and to inject upstream's custom build flags/tags directly in the .spec file in the future, and to only use the upstream build script to generate the resource files, not to build the binaries. I had to disable the "NoSync" feature in the rewritten "stdiscosrv" database backend, because the goleveldb package in fedora is too old to support it - this probably leads to worse performance there. I also re-enabled checks on some tests that were previously failing randomly. If they re-surface at some point in the future, I'll ignore them again. --- .gitignore | 1 + 00-go-build-flags-ppc64.patch | 21 ++++++------- 00-go-build-flags.patch | 21 ++++++------- 02-leveldb-nonosync.patch | 13 ++++++++ sources | 2 +- syncthing.spec | 59 +++++++++++++++++++++++++++++------ 6 files changed, 84 insertions(+), 33 deletions(-) create mode 100644 02-leveldb-nonosync.patch diff --git a/.gitignore b/.gitignore index 5ea46a1..8f3850f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /syncthing-source-v0.14.41.tar.gz /syncthing-source-v0.14.42.tar.gz /syncthing-source-v0.14.43.tar.gz +/syncthing-source-v0.14.44.tar.gz diff --git a/00-go-build-flags-ppc64.patch b/00-go-build-flags-ppc64.patch index 7177de3..c1457d7 100644 --- a/00-go-build-flags-ppc64.patch +++ b/00-go-build-flags-ppc64.patch @@ -1,26 +1,25 @@ diff --git a/build.go b/build.go -index 3744feb..7a4494a 100644 +index 7d400d6..d0b246f 100644 --- a/build.go +++ b/build.go -@@ -443,9 +443,16 @@ func build(target target, tags []string) { +@@ -434,10 +434,15 @@ func build(target target, tags []string) { lazyRebuildAssets() tags = append(target.tags, tags...) + tags = append(tags, "rpm_crashtraceback") rmr(target.BinaryName()) -- args := []string{"build", "-i", "-v", "-ldflags", ldflags()} -+ + +- args := []string{"build", "-i", "-v"} + build_id, _ := ioutil.ReadFile("build_id") -+ ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", ++ fedora_ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", + ldflags(), os.Getenv("LDFLAGS"), build_id) + -+ args := []string{"build", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} -+ - if pkgdir != "" { - args = append(args, "-pkgdir", pkgdir) - } -@@ -724,11 +731,10 @@ func ldflags() string { ++ args := []string{"build", "-compiler", "gc", "-ldflags", fedora_ldflags, "-a", "-v", "-x"} + args = appendParameters(args, tags, target) + + os.Setenv("GOOS", goos) +@@ -736,11 +741,10 @@ func ldflags() string { } b := new(bytes.Buffer) diff --git a/00-go-build-flags.patch b/00-go-build-flags.patch index f69d1aa..22c59e3 100644 --- a/00-go-build-flags.patch +++ b/00-go-build-flags.patch @@ -1,26 +1,25 @@ diff --git a/build.go b/build.go -index 3744feb..7a4494a 100644 +index 7d400d6..76bb340 100644 --- a/build.go +++ b/build.go -@@ -443,9 +443,16 @@ func build(target target, tags []string) { +@@ -434,10 +434,15 @@ func build(target target, tags []string) { lazyRebuildAssets() tags = append(target.tags, tags...) + tags = append(tags, "rpm_crashtraceback") rmr(target.BinaryName()) -- args := []string{"build", "-i", "-v", "-ldflags", ldflags()} -+ + +- args := []string{"build", "-i", "-v"} + build_id, _ := ioutil.ReadFile("build_id") -+ ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", ++ fedora_ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", + ldflags(), os.Getenv("LDFLAGS"), build_id) + -+ args := []string{"build", "-buildmode", "pie", "-compiler", "gc", "-ldflags", ldflags, "-a", "-v", "-x"} -+ - if pkgdir != "" { - args = append(args, "-pkgdir", pkgdir) - } -@@ -724,11 +731,10 @@ func ldflags() string { ++ args := []string{"build", "-buildmode", "pie", "-compiler", "gc", "-ldflags", fedora_ldflags, "-a", "-v", "-x"} + args = appendParameters(args, tags, target) + + os.Setenv("GOOS", goos) +@@ -736,11 +741,10 @@ func ldflags() string { } b := new(bytes.Buffer) diff --git a/02-leveldb-nonosync.patch b/02-leveldb-nonosync.patch new file mode 100644 index 0000000..f474e8d --- /dev/null +++ b/02-leveldb-nonosync.patch @@ -0,0 +1,13 @@ +diff --git a/cmd/stdiscosrv/main.go b/cmd/stdiscosrv/main.go +index b74fcee..346b81b 100644 +--- a/cmd/stdiscosrv/main.go ++++ b/cmd/stdiscosrv/main.go +@@ -61,7 +61,7 @@ const ( + // the expense of some memory usage and risk of losing writes in a (system) + // crash. + var levelDBOptions = &opt.Options{ +- NoSync: true, ++// NoSync: true, + WriteBuffer: 32 << 20, // default 4<<20 + } + diff --git a/sources b/sources index e283a64..801963c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.43.tar.gz) = f2c8b0ca5971cd2fbbcba193917ba73c0d7932937a8c18821348a6bfe6a4df854284336694591dba4aba0b8eeb16452dc5887535035c81a8c66c85bd711f16db +SHA512 (syncthing-source-v0.14.44.tar.gz) = 89d4660c043cf60bdb53cd6e38992e72808b302766c3c7e57b882ac4fe608bf4bb02117a9e16031627a8d5b75b2f8cbe90d9336532d16cd7f85be52f4cea4e13 diff --git a/syncthing.spec b/syncthing.spec index 8d30fd5..75af5fb 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -27,16 +27,16 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit a9f0659f2f4bf910f82b652fd27a864074ec7ab8 +%global commit 27d5b17096847d16d01421c30151969adda36628 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit a9f0659f2f4bf910f82b652fd27a864074ec7ab8 == version 0.14.43 +# commit 27d5b17096847d16d01421c30151969adda36628 == version 0.14.44 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.43 -Release: 2%{?dist} +Version: 0.14.44 +Release: 1%{?dist} # syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) License: MPLv2.0 and MIT and OFL @@ -49,6 +49,9 @@ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version} Patch0: 00-go-build-flags.patch Patch1: 00-go-build-flags-ppc64.patch +# goleveldb in fedora is too old to have the nosync option, so disable it +Patch2: 02-leveldb-nonosync.patch + # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -72,6 +75,7 @@ BuildRequires: golang(github.com/jackpal/gateway) BuildRequires: golang(github.com/kardianos/osext) BuildRequires: golang(github.com/kballard/go-shellquote) BuildRequires: golang(github.com/minio/sha256-simd) +BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/rcrowley/go-metrics) BuildRequires: golang(github.com/sasha-s/go-deadlock) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) @@ -85,6 +89,7 @@ BuildRequires: golang(github.com/vitrun/qart) BuildRequires: golang(github.com/xtaci/kcp-go) BuildRequires: golang(github.com/xtaci/smux) BuildRequires: golang(github.com/zillode/notify) +BuildRequires: golang(golang.org/x/crypto/bcrypt) BuildRequires: golang(golang.org/x/net/context) BuildRequires: golang(golang.org/x/net/ipv4) BuildRequires: golang(golang.org/x/net/ipv6) @@ -138,6 +143,7 @@ Requires: golang(github.com/jackpal/gateway) Requires: golang(github.com/kardianos/osext) Requires: golang(github.com/kballard/go-shellquote) Requires: golang(github.com/minio/sha256-simd) +Requires: golang(github.com/pkg/errors) Requires: golang(github.com/rcrowley/go-metrics) Requires: golang(github.com/sasha-s/go-deadlock) Requires: golang(github.com/syndtr/goleveldb/leveldb) @@ -158,6 +164,19 @@ Requires: golang(golang.org/x/net/proxy) Requires: golang(golang.org/x/text/unicode/norm) Requires: golang(golang.org/x/time/rate) +%if %{with_tools} +Requires: golang(github.com/AudriusButkevicius/cli) +Requires: golang(github.com/cznic/ql) +Requires: golang(github.com/golang/groupcache/lru) +Requires: golang(github.com/lib/pq) +Requires: golang(github.com/oschwald/geoip2-golang) +Requires: golang(github.com/prometheus/client_golang/prometheus) +%endif + +%if %{with_cli} +Requires: golang(github.com/AudriusButkevicius/cli) +%endif + Provides: golang(%{import_path}/lib/auto) = %{version}-%{release} Provides: golang(%{import_path}/lib/beacon) = %{version}-%{release} Provides: golang(%{import_path}/lib/config) = %{version}-%{release} @@ -234,10 +253,10 @@ Summary: Continuous File Synchronization (server tools) %if ! 0%{?with_bundled} BuildRequires: golang(github.com/AudriusButkevicius/cli) -BuildRequires: golang(github.com/cznic/ql) BuildRequires: golang(github.com/golang/groupcache/lru) -BuildRequires: golang(github.com/lib/pq) BuildRequires: golang(github.com/oschwald/geoip2-golang) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp) %endif %description tools @@ -286,6 +305,8 @@ This package contains the CLI program. %patch0 -p1 %endif +%patch2 -p1 + %build # remove bundled libraries @@ -324,6 +345,20 @@ go run build.go -no-upgrade build strelaypoolsrv popd +# TODO: Build process cleanup +# - drop patch to build.go +# - build only assets +# - inject custom upstream build flags here directly +#pushd $BUILDDIR +#go run build.go assets +#popd +#%%gobuild -o syncthing %%{import_path}/cmd/syncthing # FIXME flags +#%%if 0%%{?with_tools} +#%%gobuild -o stdiscosrv %%{import_path}/cmd/stdiscosrv # FIXME flags +#%%gobuild -o strelaysrv %%{import_path}/cmd/strelaysrv # FIXME flags +#%%gobuild -o strelaypoolsrv %%{import_path}/cmd/strelaypoolsrv # FIXME flags +#%%endif + %if 0%{?with_cli} %gobuild -o stcli %{import_path}/cmd/stcli %endif @@ -457,6 +492,7 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} %global gotest go test %endif +%gotest %{import_path}/cmd/stdiscosrv %gotest %{import_path}/cmd/syncthing %gotest %{import_path}/lib/auto %gotest %{import_path}/lib/beacon @@ -470,9 +506,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} %gotest %{import_path}/lib/ignore %gotest %{import_path}/lib/logger -# This test is a bit flaky on some architectures, issue is tracked at: +# This test used to be a bit flaky on some architectures, issue was tracked at: # https://github.com/syncthing/syncthing/issues/4370 -%gotest %{import_path}/lib/model || : +%gotest %{import_path}/lib/model %gotest %{import_path}/lib/nat %gotest %{import_path}/lib/osutil @@ -490,9 +526,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} %gotest %{import_path}/lib/upnp %gotest %{import_path}/lib/util -# This test is failing randomly right now. Issue is tracked upstream at: +# This test used to fail randomly. Issue was tracked upstream at: # https://github.com/syncthing/syncthing/issues/4351 -%gotest %{import_path}/lib/versioner || : +%gotest %{import_path}/lib/versioner %gotest %{import_path}/lib/watchaggregator %gotest %{import_path}/lib/weakhash @@ -574,6 +610,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Feb 13 2018 Fabio Valentini - 0.14.44-1 +- Update to version 0.14.44. + * Fri Feb 09 2018 Fedora Release Engineering - 0.14.43-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a26527295785b865db31c14f1a89f6dd85347eb5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 6 Mar 2018 21:14:28 +0100 Subject: [PATCH 016/133] update to version 0.14.45 This build also includes an up-to-date and pruned set of BuildRequires and Requires. --- .gitignore | 1 + sources | 2 +- syncthing.spec | 35 +++++++++++++++++------------------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 8f3850f..b153445 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /syncthing-source-v0.14.42.tar.gz /syncthing-source-v0.14.43.tar.gz /syncthing-source-v0.14.44.tar.gz +/syncthing-source-v0.14.45.tar.gz diff --git a/sources b/sources index 801963c..ba08df9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.44.tar.gz) = 89d4660c043cf60bdb53cd6e38992e72808b302766c3c7e57b882ac4fe608bf4bb02117a9e16031627a8d5b75b2f8cbe90d9336532d16cd7f85be52f4cea4e13 +SHA512 (syncthing-source-v0.14.45.tar.gz) = 4e6c82062a6d38706d820855633439abec1bf37b2fb43578dfd6bfa0285375e9dfb52257c92d3ce50c75693676bf60d8d75591f2dc1cc6ce827cbf612ebb3347 diff --git a/syncthing.spec b/syncthing.spec index 75af5fb..3f1c8b8 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -27,18 +27,22 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 27d5b17096847d16d01421c30151969adda36628 +%global commit 7a92f6c6b18230f74cc347f937fe81b44da6c9ee %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 27d5b17096847d16d01421c30151969adda36628 == version 0.14.44 +# commit 7a92f6c6b18230f74cc347f937fe81b44da6c9ee == version 0.14.45 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.44 +Version: 0.14.45 Release: 1%{?dist} -# syncthing (MPLv2.0) bundles angular (MIT), bootstrap (MIT), and font-awesome (MIT/OFL) +# syncthing (MPLv2.0) bundles +# - angular (MIT), +# - bootstrap (MIT), +# - font-awesome (MIT/OFL), and +# - moment (MIT) License: MPLv2.0 and MIT and OFL URL: https://syncthing.net @@ -62,11 +66,9 @@ BuildRequires: systemd %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) -BuildRequires: golang(github.com/AudriusButkevicius/pfilter) BuildRequires: golang(github.com/bkaradzic/go-lz4) BuildRequires: golang(github.com/calmh/du) BuildRequires: golang(github.com/calmh/xdr) -BuildRequires: golang(github.com/ccding/go-stun/stun) BuildRequires: golang(github.com/chmduquesne/rollinghash/adler32) BuildRequires: golang(github.com/gobwas/glob) BuildRequires: golang(github.com/gogo/protobuf/gogoproto) @@ -85,9 +87,7 @@ BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/opt) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) BuildRequires: golang(github.com/thejerf/suture) -BuildRequires: golang(github.com/vitrun/qart) -BuildRequires: golang(github.com/xtaci/kcp-go) -BuildRequires: golang(github.com/xtaci/smux) +BuildRequires: golang(github.com/vitrun/qart/qr) BuildRequires: golang(github.com/zillode/notify) BuildRequires: golang(golang.org/x/crypto/bcrypt) BuildRequires: golang(golang.org/x/net/context) @@ -107,6 +107,9 @@ Provides: bundled(angular-translate-loader-static-files) = 2.11.0 Provides: bundled(bootstrap) = 3.3.6 Provides: bundled(font-awesome) = 4.5.0 Provides: bundled(jquery) = 2.2.2 +Provides: bundled(jquery-fancytree) = 2.26.0 +Provides: bundled(jquery-ui) = 1.12.1 +Provides: bundled(moment) = 2.19.4 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -130,11 +133,9 @@ Provides: %{long_name}-devel = %{version}-%{release} BuildArch: noarch Requires: golang(github.com/AudriusButkevicius/go-nat-pmp) -Requires: golang(github.com/AudriusButkevicius/pfilter) Requires: golang(github.com/bkaradzic/go-lz4) Requires: golang(github.com/calmh/du) Requires: golang(github.com/calmh/xdr) -Requires: golang(github.com/ccding/go-stun/stun) Requires: golang(github.com/chmduquesne/rollinghash/adler32) Requires: golang(github.com/gobwas/glob) Requires: golang(github.com/gogo/protobuf/gogoproto) @@ -153,9 +154,7 @@ Requires: golang(github.com/syndtr/goleveldb/leveldb/opt) Requires: golang(github.com/syndtr/goleveldb/leveldb/storage) Requires: golang(github.com/syndtr/goleveldb/leveldb/util) Requires: golang(github.com/thejerf/suture) -Requires: golang(github.com/vitrun/qart) -Requires: golang(github.com/xtaci/kcp-go) -Requires: golang(github.com/xtaci/smux) +Requires: golang(github.com/vitrun/qart/qr) Requires: golang(github.com/zillode/notify) Requires: golang(golang.org/x/net/context) Requires: golang(golang.org/x/net/ipv4) @@ -165,12 +164,10 @@ Requires: golang(golang.org/x/text/unicode/norm) Requires: golang(golang.org/x/time/rate) %if %{with_tools} -Requires: golang(github.com/AudriusButkevicius/cli) -Requires: golang(github.com/cznic/ql) Requires: golang(github.com/golang/groupcache/lru) -Requires: golang(github.com/lib/pq) Requires: golang(github.com/oschwald/geoip2-golang) Requires: golang(github.com/prometheus/client_golang/prometheus) +Requires: golang(github.com/prometheus/client_golang/prometheus/promhttp) %endif %if %{with_cli} @@ -252,7 +249,6 @@ This package contains the syncthing unit tests. Summary: Continuous File Synchronization (server tools) %if ! 0%{?with_bundled} -BuildRequires: golang(github.com/AudriusButkevicius/cli) BuildRequires: golang(github.com/golang/groupcache/lru) BuildRequires: golang(github.com/oschwald/geoip2-golang) BuildRequires: golang(github.com/prometheus/client_golang/prometheus) @@ -610,6 +606,9 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %changelog +* Tue Mar 06 2018 Fabio Valentini - 0.14.45-1 +- Update to version 0.14.45. + * Tue Feb 13 2018 Fabio Valentini - 0.14.44-1 - Update to version 0.14.44. From 3cfc49b2e46a2ffed1c25ad8d8ee9081053b550a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 5 Apr 2018 12:45:35 +0200 Subject: [PATCH 017/133] update to version 0.14.46, clean up build process, use new go spec features --- .gitignore | 1 + 00-go-build-flags-ppc64.patch | 37 ------ 00-go-build-flags.patch | 37 ------ sources | 2 +- syncthing.spec | 222 +++++++--------------------------- 5 files changed, 44 insertions(+), 255 deletions(-) delete mode 100644 00-go-build-flags-ppc64.patch delete mode 100644 00-go-build-flags.patch diff --git a/.gitignore b/.gitignore index b153445..0639e88 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /syncthing-source-v0.14.43.tar.gz /syncthing-source-v0.14.44.tar.gz /syncthing-source-v0.14.45.tar.gz +/syncthing-source-v0.14.46.tar.gz diff --git a/00-go-build-flags-ppc64.patch b/00-go-build-flags-ppc64.patch deleted file mode 100644 index c1457d7..0000000 --- a/00-go-build-flags-ppc64.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/build.go b/build.go -index 7d400d6..d0b246f 100644 ---- a/build.go -+++ b/build.go -@@ -434,10 +434,15 @@ func build(target target, tags []string) { - lazyRebuildAssets() - - tags = append(target.tags, tags...) -+ tags = append(tags, "rpm_crashtraceback") - - rmr(target.BinaryName()) - -- args := []string{"build", "-i", "-v"} -+ build_id, _ := ioutil.ReadFile("build_id") -+ fedora_ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", -+ ldflags(), os.Getenv("LDFLAGS"), build_id) -+ -+ args := []string{"build", "-compiler", "gc", "-ldflags", fedora_ldflags, "-a", "-v", "-x"} - args = appendParameters(args, tags, target) - - os.Setenv("GOOS", goos) -@@ -736,11 +741,10 @@ func ldflags() string { - } - - b := new(bytes.Buffer) -- b.WriteString("-w") -- fmt.Fprintf(b, " -X main.Version%c%s", sep, version) -- fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp()) -- fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser()) -- fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost()) -+ fmt.Fprintf(b, "-X main.Version%c%s ", sep, version) -+ fmt.Fprintf(b, "-X main.BuildStamp%c%d ", sep, buildStamp()) -+ fmt.Fprintf(b, "-X main.BuildUser%c%s ", sep, buildUser()) -+ fmt.Fprintf(b, "-X main.BuildHost%c%s", sep, buildHost()) - return b.String() - } - diff --git a/00-go-build-flags.patch b/00-go-build-flags.patch deleted file mode 100644 index 22c59e3..0000000 --- a/00-go-build-flags.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/build.go b/build.go -index 7d400d6..76bb340 100644 ---- a/build.go -+++ b/build.go -@@ -434,10 +434,15 @@ func build(target target, tags []string) { - lazyRebuildAssets() - - tags = append(target.tags, tags...) -+ tags = append(tags, "rpm_crashtraceback") - - rmr(target.BinaryName()) - -- args := []string{"build", "-i", "-v"} -+ build_id, _ := ioutil.ReadFile("build_id") -+ fedora_ldflags := fmt.Sprintf("%s %s -B 0x%s -extldflags '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'", -+ ldflags(), os.Getenv("LDFLAGS"), build_id) -+ -+ args := []string{"build", "-buildmode", "pie", "-compiler", "gc", "-ldflags", fedora_ldflags, "-a", "-v", "-x"} - args = appendParameters(args, tags, target) - - os.Setenv("GOOS", goos) -@@ -736,11 +741,10 @@ func ldflags() string { - } - - b := new(bytes.Buffer) -- b.WriteString("-w") -- fmt.Fprintf(b, " -X main.Version%c%s", sep, version) -- fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp()) -- fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser()) -- fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost()) -+ fmt.Fprintf(b, "-X main.Version%c%s ", sep, version) -+ fmt.Fprintf(b, "-X main.BuildStamp%c%d ", sep, buildStamp()) -+ fmt.Fprintf(b, "-X main.BuildUser%c%s ", sep, buildUser()) -+ fmt.Fprintf(b, "-X main.BuildHost%c%s", sep, buildHost()) - return b.String() - } - diff --git a/sources b/sources index ba08df9..d252913 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.45.tar.gz) = 4e6c82062a6d38706d820855633439abec1bf37b2fb43578dfd6bfa0285375e9dfb52257c92d3ce50c75693676bf60d8d75591f2dc1cc6ce827cbf612ebb3347 +SHA512 (syncthing-source-v0.14.46.tar.gz) = 64fb6a2b769b930aacacd4a3f864346d18a64c5827910135d851f748a8cf4fbf0bf47547fec3fcfad09c1e0bb564c24d9b1580484493736a478c1e9095351929 diff --git a/syncthing.spec b/syncthing.spec index 3f1c8b8..b06ee6b 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -27,15 +27,16 @@ # https://github.com/syncthing/syncthing %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 7a92f6c6b18230f74cc347f937fe81b44da6c9ee +%global goipath %{provider_prefix} +%global commit bea6ecaf35d92c95d7b8a7e2145bb56cc4d74d05 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 7a92f6c6b18230f74cc347f937fe81b44da6c9ee == version 0.14.45 +# commit bea6ecaf35d92c95d7b8a7e2145bb56cc4d74d05 == version 0.14.46 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.45 +Version: 0.14.46 Release: 1%{?dist} # syncthing (MPLv2.0) bundles @@ -48,11 +49,6 @@ License: MPLv2.0 and MIT and OFL URL: https://syncthing.net Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz -# Patch build.go script so go build doesn't install deps -# and produces debug-enabled binaries for rpm -Patch0: 00-go-build-flags.patch -Patch1: 00-go-build-flags-ppc64.patch - # goleveldb in fedora is too old to have the nosync option, so disable it Patch2: 02-leveldb-nonosync.patch @@ -62,14 +58,15 @@ ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 % BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: systemd -%{?systemd_requires} %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) +BuildRequires: golang(github.com/Zillode/notify) BuildRequires: golang(github.com/bkaradzic/go-lz4) BuildRequires: golang(github.com/calmh/du) BuildRequires: golang(github.com/calmh/xdr) BuildRequires: golang(github.com/chmduquesne/rollinghash/adler32) +BuildRequires: golang(github.com/d4l3k/messagediff) BuildRequires: golang(github.com/gobwas/glob) BuildRequires: golang(github.com/gogo/protobuf/gogoproto) BuildRequires: golang(github.com/gogo/protobuf/proto) @@ -88,7 +85,6 @@ BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) BuildRequires: golang(github.com/thejerf/suture) BuildRequires: golang(github.com/vitrun/qart/qr) -BuildRequires: golang(github.com/zillode/notify) BuildRequires: golang(golang.org/x/crypto/bcrypt) BuildRequires: golang(golang.org/x/net/context) BuildRequires: golang(golang.org/x/net/ipv4) @@ -98,6 +94,8 @@ BuildRequires: golang(golang.org/x/text/unicode/norm) BuildRequires: golang(golang.org/x/time/rate) %endif +%{?systemd_requires} + Provides: %{long_name} = %{version}-%{release} Provides: bundled(angular) = 1.2.9 @@ -133,10 +131,12 @@ Provides: %{long_name}-devel = %{version}-%{release} BuildArch: noarch Requires: golang(github.com/AudriusButkevicius/go-nat-pmp) +Requires: golang(github.com/Zillode/notify) Requires: golang(github.com/bkaradzic/go-lz4) Requires: golang(github.com/calmh/du) Requires: golang(github.com/calmh/xdr) Requires: golang(github.com/chmduquesne/rollinghash/adler32) +Requires: golang(github.com/d4l3k/messagediff) Requires: golang(github.com/gobwas/glob) Requires: golang(github.com/gogo/protobuf/gogoproto) Requires: golang(github.com/gogo/protobuf/proto) @@ -155,7 +155,6 @@ Requires: golang(github.com/syndtr/goleveldb/leveldb/storage) Requires: golang(github.com/syndtr/goleveldb/leveldb/util) Requires: golang(github.com/thejerf/suture) Requires: golang(github.com/vitrun/qart/qr) -Requires: golang(github.com/zillode/notify) Requires: golang(golang.org/x/net/context) Requires: golang(golang.org/x/net/ipv4) Requires: golang(golang.org/x/net/ipv6) @@ -219,31 +218,6 @@ dependency for building packages using syncthing. %endif -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Continuous File Synchronization (unit tests) -Provides: %{long_name}-unit-test-devel = %{version}-%{release} - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/d4l3k/messagediff) -%endif - -Requires: golang(github.com/d4l3k/messagediff) - -%description unit-test-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 unit tests. -%endif - - %if 0%{?with_tools} %package tools Summary: Continuous File Synchronization (server tools) @@ -292,16 +266,7 @@ This package contains the CLI program. %prep -%setup -q -n syncthing - -# PIE build mode isn't supported on ppc64 -%ifarch ppc64 -%patch1 -p1 -%else -%patch0 -p1 -%endif - -%patch2 -p1 +%autosetup -n syncthing -p1 %build @@ -309,74 +274,54 @@ This package contains the CLI program. rm -r vendor # prepare build environment -mkdir -p ./_build/src/%{provider}.%{provider_tld}/%{project} +mkdir -p ./_build/src/github.com/syncthing TOP=$(pwd) -pushd _build/src/%{provider}.%{provider_tld}/%{project} -ln -s $TOP ./syncthing +pushd _build/src/github.com/syncthing +ln -s $TOP syncthing popd export GOPATH=$(pwd)/_build:%{gopath} export BUILDDIR=$(pwd)/_build/src/%{import_path} -# set BUILD_HOST variable so syncthing knows where it was built -export BUILD_HOST=fedora-koji - -# run builds in appropriate directory -pushd $BUILDDIR - -head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id -go run build.go -no-upgrade build syncthing - -%if 0%{?with_tools} -head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id -go run build.go -no-upgrade build stdiscosrv - -head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id -go run build.go -no-upgrade build strelaysrv - -head -c20 /dev/urandom | od -An -tx1 | tr -d ' \n' > build_id -go run build.go -no-upgrade build strelaypoolsrv -%endif - +# compile assets used by the build process +pushd _build/src/%{import_path} +go run build.go assets +rm build.go popd -# TODO: Build process cleanup -# - drop patch to build.go -# - build only assets -# - inject custom upstream build flags here directly -#pushd $BUILDDIR -#go run build.go assets -#popd -#%%gobuild -o syncthing %%{import_path}/cmd/syncthing # FIXME flags -#%%if 0%%{?with_tools} -#%%gobuild -o stdiscosrv %%{import_path}/cmd/stdiscosrv # FIXME flags -#%%gobuild -o strelaysrv %%{import_path}/cmd/strelaysrv # FIXME flags -#%%gobuild -o strelaypoolsrv %%{import_path}/cmd/strelaypoolsrv # FIXME flags -#%%endif +# set variables expected by syncthing binaries as additional LDFLAGS +export BUILD_HOST=fedora-koji +export LDFLAGS="-X main.Version=v%{version} -X main.BuildStamp=$(date +%s) -X main.BuildUser=$USER -X main.BuildHost=$BUILD_HOST" +export BUILDTAGS="noupgrade" -%if 0%{?with_cli} -%gobuild -o stcli %{import_path}/cmd/stcli +%gobuild -o _bin/syncthing %{import_path}/cmd/syncthing + +%if 0%{?with_tools} +%gobuild -o _bin/stdiscosrv %{import_path}/cmd/stdiscosrv +%gobuild -o _bin/strelaysrv %{import_path}/cmd/strelaysrv +%gobuild -o _bin/strelaypoolsrv %{import_path}/cmd/strelaypoolsrv %endif -# remove build script so it doesn't get picked up later -rm build.go +%if 0%{?with_cli} +%gobuild -o _bin/stcli %{import_path}/cmd/stcli +%endif %install # install binaries mkdir -p %{buildroot}/%{_bindir} -cp -pav ./syncthing %{buildroot}/%{_bindir}/ +cp -pav _bin/syncthing %{buildroot}/%{_bindir}/ %if 0%{?with_tools} -cp -pav ./stdiscosrv %{buildroot}/%{_bindir}/ -cp -pav ./strelaysrv %{buildroot}/%{_bindir}/ -cp -pav ./strelaypoolsrv %{buildroot}/%{_bindir}/ +cp -pav _bin/stdiscosrv %{buildroot}/%{_bindir}/ +cp -pav _bin/strelaysrv %{buildroot}/%{_bindir}/ +cp -pav _bin/strelaypoolsrv %{buildroot}/%{_bindir}/ %endif %if 0%{?with_cli} -cp -pav ./stcli %{buildroot}/%{_bindir}/ +cp -pav _bin/stcli %{buildroot}/%{_bindir}/ %endif # install man pages @@ -409,80 +354,12 @@ echo "disable syncthing*" > %{buildroot}/%{_userpresetdir}/90-syncthing.preset # Unmark source files as executable for i in $(find -name "*.go" -executable -print); do chmod a-x $i; done - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list - -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ - -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done - -# add test data for unit test subpackage -cp -pavr cmd/syncthing/testdata %{buildroot}/%{gopath}/src/%{import_path}/cmd/syncthing/ -echo "%%{gopath}/src/%%{import_path}/cmd/syncthing/testdata" >> unit-test-devel.file-list - -cp -pavr test/h* %{buildroot}/%{gopath}/src/%{import_path}/test/ - -cp -pavr lib/config/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/config/ -echo "%%{gopath}/src/%%{import_path}/lib/config/testdata" >> unit-test-devel.file-list - -cp -pavr lib/db/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/db/ -echo "%%{gopath}/src/%%{import_path}/lib/db/testdata" >> unit-test-devel.file-list - -cp -pavr lib/ignore/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/ignore/ -echo "%%{gopath}/src/%%{import_path}/lib/ignore/testdata" >> unit-test-devel.file-list - -cp -pavr lib/model/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/model/ -echo "%%{gopath}/src/%%{import_path}/lib/model/testdata" >> unit-test-devel.file-list - -cp -pavr lib/scanner/testdata %{buildroot}/%{gopath}/src/%{import_path}/lib/scanner/ -echo "%%{gopath}/src/%%{import_path}/lib/scanner/testdata" >> unit-test-devel.file-list - -cp -pavr lib/versioner/_external_test %{buildroot}/%{gopath}/src/%{import_path}/lib/versioner/ -echo "%%{gopath}/src/%%{import_path}/lib/versioner/_external_test" >> unit-test-devel.file-list -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%if 0%{?with_unit_test} -sort -u -o unit-test-devel.file-list unit-test-devel.file-list -%endif +%goinstall %check %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} +export GOPATH=$(pwd)/_build:%{gopath} %if ! 0%{?gotest:1} %global gotest go test @@ -528,14 +405,6 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} %gotest %{import_path}/lib/watchaggregator %gotest %{import_path}/lib/weakhash - -# Clean up after the tests -rm %{buildroot}/%{gopath}/src/%{import_path}/lib/model/testdata/empty -rm -r %{buildroot}/%{gopath}/src/%{import_path}/test/h*/ - -find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".gitignore" -print -delete -find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stignore" -print -delete -find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %endif @@ -552,10 +421,6 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %systemd_user_postun_with_restart syncthing.service -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - - %files %license LICENSE %doc README.md AUTHORS @@ -598,14 +463,11 @@ find %{buildroot}/%{gopath}/src/%{import_path}/ -name ".stfolder" -print -delete %endif -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md AUTHORS -%endif - - %changelog +* Wed Apr 04 2018 Fabio Valentini - 0.14.46-1 +- Update to version 0.14.46. +- Simplify .spec file and build process, and drop build system patches. + * Tue Mar 06 2018 Fabio Valentini - 0.14.45-1 - Update to version 0.14.45. From 3f6ca17a7d2b90a78999e0af01c53a5af5cdacb9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 5 Jun 2018 18:12:59 +0200 Subject: [PATCH 018/133] update to version 0.14.48 --- .gitignore | 1 + 01-replace-deprecated-osext.patch | 36 +++++++++++++++++++++++++++ sources | 2 +- syncthing.spec | 41 +++++++++++++++++++------------ 4 files changed, 63 insertions(+), 17 deletions(-) create mode 100644 01-replace-deprecated-osext.patch diff --git a/.gitignore b/.gitignore index 0639e88..55fcaa3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /syncthing-source-v0.14.44.tar.gz /syncthing-source-v0.14.45.tar.gz /syncthing-source-v0.14.46.tar.gz +/syncthing-source-v0.14.48.tar.gz diff --git a/01-replace-deprecated-osext.patch b/01-replace-deprecated-osext.patch new file mode 100644 index 0000000..6ce3d47 --- /dev/null +++ b/01-replace-deprecated-osext.patch @@ -0,0 +1,36 @@ +diff --git a/lib/upgrade/upgrade_common.go b/lib/upgrade/upgrade_common.go +index 76a1953..41b95dc 100644 +--- a/lib/upgrade/upgrade_common.go ++++ b/lib/upgrade/upgrade_common.go +@@ -10,12 +10,11 @@ package upgrade + import ( + "errors" + "fmt" ++ "os" + "path" + "runtime" + "strconv" + "strings" +- +- "github.com/kardianos/osext" + ) + + type Release struct { +@@ -45,7 +44,7 @@ func init() { + func To(rel Release) error { + select { + case <-upgradeUnlocked: +- path, err := osext.Executable() ++ path, err := os.Executable() + if err != nil { + upgradeUnlocked <- true + return err +@@ -64,7 +63,7 @@ func To(rel Release) error { + func ToURL(url string) error { + select { + case <-upgradeUnlocked: +- binary, err := osext.Executable() ++ binary, err := os.Executable() + if err != nil { + upgradeUnlocked <- true + return err diff --git a/sources b/sources index d252913..8564b78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.46.tar.gz) = 64fb6a2b769b930aacacd4a3f864346d18a64c5827910135d851f748a8cf4fbf0bf47547fec3fcfad09c1e0bb564c24d9b1580484493736a478c1e9095351929 +SHA512 (syncthing-source-v0.14.48.tar.gz) = 40208cea6c54efd733368854621b07844a826512df7f8de42e089bb567950f172a04e01828b34e15529a85f5b9a6771c82e24c1bd05cf0ebd3ea8e35a899fcb3 diff --git a/syncthing.spec b/syncthing.spec index b06ee6b..2c17f6d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -28,15 +28,15 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global goipath %{provider_prefix} -%global commit bea6ecaf35d92c95d7b8a7e2145bb56cc4d74d05 +%global commit 92602485434d17b473b2034b4291d29d869c4076 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit bea6ecaf35d92c95d7b8a7e2145bb56cc4d74d05 == version 0.14.46 +# commit 92602485434d17b473b2034b4291d29d869c4076 == version 0.14.48 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.46 +Version: 0.14.48 Release: 1%{?dist} # syncthing (MPLv2.0) bundles @@ -49,6 +49,9 @@ License: MPLv2.0 and MIT and OFL URL: https://syncthing.net Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz +# replace usage of deprecated "github.com/kardianos/osext" by stdlib's "os" +Patch1: 01-replace-deprecated-osext.patch + # goleveldb in fedora is too old to have the nosync option, so disable it Patch2: 02-leveldb-nonosync.patch @@ -61,7 +64,6 @@ BuildRequires: systemd %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) -BuildRequires: golang(github.com/Zillode/notify) BuildRequires: golang(github.com/bkaradzic/go-lz4) BuildRequires: golang(github.com/calmh/du) BuildRequires: golang(github.com/calmh/xdr) @@ -71,12 +73,12 @@ BuildRequires: golang(github.com/gobwas/glob) BuildRequires: golang(github.com/gogo/protobuf/gogoproto) BuildRequires: golang(github.com/gogo/protobuf/proto) BuildRequires: golang(github.com/jackpal/gateway) -BuildRequires: golang(github.com/kardianos/osext) BuildRequires: golang(github.com/kballard/go-shellquote) BuildRequires: golang(github.com/minio/sha256-simd) BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/rcrowley/go-metrics) BuildRequires: golang(github.com/sasha-s/go-deadlock) +BuildRequires: golang(github.com/syncthing/notify) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/errors) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/iterator) @@ -86,7 +88,6 @@ BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) BuildRequires: golang(github.com/thejerf/suture) BuildRequires: golang(github.com/vitrun/qart/qr) BuildRequires: golang(golang.org/x/crypto/bcrypt) -BuildRequires: golang(golang.org/x/net/context) BuildRequires: golang(golang.org/x/net/ipv4) BuildRequires: golang(golang.org/x/net/ipv6) BuildRequires: golang(golang.org/x/net/proxy) @@ -98,7 +99,7 @@ BuildRequires: golang(golang.org/x/time/rate) Provides: %{long_name} = %{version}-%{release} -Provides: bundled(angular) = 1.2.9 +Provides: bundled(angular) = 1.3.20 Provides: bundled(angular-dirPagination) = 759009c Provides: bundled(angular-translate) = 2.9.0.1 Provides: bundled(angular-translate-loader-static-files) = 2.11.0 @@ -131,7 +132,6 @@ Provides: %{long_name}-devel = %{version}-%{release} BuildArch: noarch Requires: golang(github.com/AudriusButkevicius/go-nat-pmp) -Requires: golang(github.com/Zillode/notify) Requires: golang(github.com/bkaradzic/go-lz4) Requires: golang(github.com/calmh/du) Requires: golang(github.com/calmh/xdr) @@ -141,12 +141,12 @@ Requires: golang(github.com/gobwas/glob) Requires: golang(github.com/gogo/protobuf/gogoproto) Requires: golang(github.com/gogo/protobuf/proto) Requires: golang(github.com/jackpal/gateway) -Requires: golang(github.com/kardianos/osext) Requires: golang(github.com/kballard/go-shellquote) Requires: golang(github.com/minio/sha256-simd) Requires: golang(github.com/pkg/errors) Requires: golang(github.com/rcrowley/go-metrics) Requires: golang(github.com/sasha-s/go-deadlock) +Requires: golang(github.com/syncthing/notify) Requires: golang(github.com/syndtr/goleveldb/leveldb) Requires: golang(github.com/syndtr/goleveldb/leveldb/errors) Requires: golang(github.com/syndtr/goleveldb/leveldb/iterator) @@ -155,7 +155,6 @@ Requires: golang(github.com/syndtr/goleveldb/leveldb/storage) Requires: golang(github.com/syndtr/goleveldb/leveldb/util) Requires: golang(github.com/thejerf/suture) Requires: golang(github.com/vitrun/qart/qr) -Requires: golang(golang.org/x/net/context) Requires: golang(golang.org/x/net/ipv4) Requires: golang(golang.org/x/net/ipv6) Requires: golang(golang.org/x/net/proxy) @@ -266,7 +265,7 @@ This package contains the CLI program. %prep -%autosetup -n syncthing -p1 +%autosetup -n %{name} -p1 %build @@ -379,14 +378,18 @@ export GOPATH=$(pwd)/_build:%{gopath} %gotest %{import_path}/lib/ignore %gotest %{import_path}/lib/logger -# This test used to be a bit flaky on some architectures, issue was tracked at: +# This test sometimes fails dependent on load on some architectures: # https://github.com/syncthing/syncthing/issues/4370 -%gotest %{import_path}/lib/model +%gotest %{import_path}/lib/model || : %gotest %{import_path}/lib/nat %gotest %{import_path}/lib/osutil %gotest %{import_path}/lib/pmp -%gotest %{import_path}/lib/protocol + +# This test seems to fail on 32 bit architectures only, ignore for now: +# https://github.com/syncthing/syncthing/issues/4990 +%gotest %{import_path}/lib/protocol || : + %gotest %{import_path}/lib/rand %gotest %{import_path}/lib/relay/client %gotest %{import_path}/lib/relay/protocol @@ -399,9 +402,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %gotest %{import_path}/lib/upnp %gotest %{import_path}/lib/util -# This test used to fail randomly. Issue was tracked upstream at: +# This test sometimes fails dependent on load on some architectures: # https://github.com/syncthing/syncthing/issues/4351 -%gotest %{import_path}/lib/versioner +%gotest %{import_path}/lib/versioner || : %gotest %{import_path}/lib/watchaggregator %gotest %{import_path}/lib/weakhash @@ -464,6 +467,12 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Tue Jun 05 2018 Fabio Valentini - 0.14.48-1 +- Update to version 0.14.48. + +* Tue May 01 2018 Fabio Valentini - 0.14.47-1 +- Update to version 0.14.47. + * Wed Apr 04 2018 Fabio Valentini - 0.14.46-1 - Update to version 0.14.46. - Simplify .spec file and build process, and drop build system patches. From aec291aa2495b399dc7be13a1ed8565f28abd212 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:09:07 +0000 Subject: [PATCH 019/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 2c17f6d..e3b8bf0 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -37,7 +37,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 0.14.48 -Release: 1%{?dist} +Release: 2%{?dist} # syncthing (MPLv2.0) bundles # - angular (MIT), @@ -467,6 +467,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.14.48-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 05 2018 Fabio Valentini - 0.14.48-1 - Update to version 0.14.48. From 4e35d8e5c367fb22081023a7d118e3274270104f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 25 Jul 2018 10:59:14 +0200 Subject: [PATCH 020/133] update to version 0.14.49 --- .gitignore | 1 + 01-replace-deprecated-osext.patch | 36 ------------------------------- 03-fix-go-111-type-error.patch | 22 +++++++++++++++++++ sources | 2 +- syncthing.spec | 24 ++++++++++++++------- 5 files changed, 40 insertions(+), 45 deletions(-) delete mode 100644 01-replace-deprecated-osext.patch create mode 100644 03-fix-go-111-type-error.patch diff --git a/.gitignore b/.gitignore index 55fcaa3..36e4288 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /syncthing-source-v0.14.45.tar.gz /syncthing-source-v0.14.46.tar.gz /syncthing-source-v0.14.48.tar.gz +/syncthing-source-v0.14.49.tar.gz diff --git a/01-replace-deprecated-osext.patch b/01-replace-deprecated-osext.patch deleted file mode 100644 index 6ce3d47..0000000 --- a/01-replace-deprecated-osext.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/lib/upgrade/upgrade_common.go b/lib/upgrade/upgrade_common.go -index 76a1953..41b95dc 100644 ---- a/lib/upgrade/upgrade_common.go -+++ b/lib/upgrade/upgrade_common.go -@@ -10,12 +10,11 @@ package upgrade - import ( - "errors" - "fmt" -+ "os" - "path" - "runtime" - "strconv" - "strings" -- -- "github.com/kardianos/osext" - ) - - type Release struct { -@@ -45,7 +44,7 @@ func init() { - func To(rel Release) error { - select { - case <-upgradeUnlocked: -- path, err := osext.Executable() -+ path, err := os.Executable() - if err != nil { - upgradeUnlocked <- true - return err -@@ -64,7 +63,7 @@ func To(rel Release) error { - func ToURL(url string) error { - select { - case <-upgradeUnlocked: -- binary, err := osext.Executable() -+ binary, err := os.Executable() - if err != nil { - upgradeUnlocked <- true - return err diff --git a/03-fix-go-111-type-error.patch b/03-fix-go-111-type-error.patch new file mode 100644 index 0000000..8773667 --- /dev/null +++ b/03-fix-go-111-type-error.patch @@ -0,0 +1,22 @@ +From 3d8344003ef7724a00e37f59d3fd5fa2b13973a1 Mon Sep 17 00:00:00 2001 +From: Jakob Borg +Date: Thu, 19 Jul 2018 20:49:05 +0200 +Subject: [PATCH] lib/logger: Add missing dots (fixes #5073) + +--- + lib/logger/logger.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/logger/logger.go b/lib/logger/logger.go +index e5656ff7e..e4c62b49b 100644 +--- a/lib/logger/logger.go ++++ b/lib/logger/logger.go +@@ -106,7 +106,7 @@ func (l *logger) callHandlers(level LogLevel, s string) { + + // Debugln logs a line with a DEBUG prefix. + func (l *logger) Debugln(vals ...interface{}) { +- l.debugln(3, vals) ++ l.debugln(3, vals...) + } + func (l *logger) debugln(level int, vals ...interface{}) { + s := fmt.Sprintln(vals...) diff --git a/sources b/sources index 8564b78..aa23342 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.48.tar.gz) = 40208cea6c54efd733368854621b07844a826512df7f8de42e089bb567950f172a04e01828b34e15529a85f5b9a6771c82e24c1bd05cf0ebd3ea8e35a899fcb3 +SHA512 (syncthing-source-v0.14.49.tar.gz) = d22a47f1bc5605f5fbf553a751699823f3fb963da501f91c19c84f9b0a8428ab0b4d2f250f6c32d96b8fa5077e8f00b3dddd51ab5eaf648b1a5a3947d8f63e8d diff --git a/syncthing.spec b/syncthing.spec index e3b8bf0..8993c9f 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -31,13 +31,13 @@ %global commit 92602485434d17b473b2034b4291d29d869c4076 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 92602485434d17b473b2034b4291d29d869c4076 == version 0.14.48 +# commit 6b82538e623feb4df2bef9fc4b37d581de96309a == version 0.14.49 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.48 -Release: 2%{?dist} +Version: 0.14.49 +Release: 1%{?dist} # syncthing (MPLv2.0) bundles # - angular (MIT), @@ -49,12 +49,13 @@ License: MPLv2.0 and MIT and OFL URL: https://syncthing.net Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz -# replace usage of deprecated "github.com/kardianos/osext" by stdlib's "os" -Patch1: 01-replace-deprecated-osext.patch - # goleveldb in fedora is too old to have the nosync option, so disable it Patch2: 02-leveldb-nonosync.patch +# Upstream patch to fix building tests with go 1.11+ +# https://github.com/syncthing/syncthing/commit/3d83440 +Patch3: 03-fix-go-111-type-error.patch + # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -101,12 +102,14 @@ Provides: %{long_name} = %{version}-%{release} Provides: bundled(angular) = 1.3.20 Provides: bundled(angular-dirPagination) = 759009c +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(font-awesome) = 4.5.0 +Provides: bundled(daterangepicker) = 3.0.0 +Provides: bundled(font-awesome) = 5.0.13 Provides: bundled(jquery) = 2.2.2 -Provides: bundled(jquery-fancytree) = 2.26.0 +Provides: bundled(jquery-fancytree) = 2.28.1 Provides: bundled(jquery-ui) = 1.12.1 Provides: bundled(moment) = 2.19.4 @@ -467,6 +470,11 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Wed Jul 25 2018 Fabio Valentini - 0.14.49-1 +- Update to version 0.14.49. +- Drop upstreamed osext patch. +- Add upstream patch to fix building tests with go 1.11. + * Sat Jul 14 2018 Fedora Release Engineering - 0.14.48-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0de2e5d37d7c3b8e7a51cd4afe5721c5e258d6ea Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 11 Sep 2018 11:33:55 +0200 Subject: [PATCH 021/133] update to version 0.14.50 - clean up spec file, use new macros - drop upstreamed go1.11 patch --- .gitignore | 1 + 03-fix-go-111-type-error.patch | 22 --- sources | 2 +- syncthing.spec | 270 +++++++-------------------------- 4 files changed, 59 insertions(+), 236 deletions(-) delete mode 100644 03-fix-go-111-type-error.patch diff --git a/.gitignore b/.gitignore index 36e4288..d09dcde 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /syncthing-source-v0.14.46.tar.gz /syncthing-source-v0.14.48.tar.gz /syncthing-source-v0.14.49.tar.gz +/syncthing-source-v0.14.50.tar.gz diff --git a/03-fix-go-111-type-error.patch b/03-fix-go-111-type-error.patch deleted file mode 100644 index 8773667..0000000 --- a/03-fix-go-111-type-error.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3d8344003ef7724a00e37f59d3fd5fa2b13973a1 Mon Sep 17 00:00:00 2001 -From: Jakob Borg -Date: Thu, 19 Jul 2018 20:49:05 +0200 -Subject: [PATCH] lib/logger: Add missing dots (fixes #5073) - ---- - lib/logger/logger.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/logger/logger.go b/lib/logger/logger.go -index e5656ff7e..e4c62b49b 100644 ---- a/lib/logger/logger.go -+++ b/lib/logger/logger.go -@@ -106,7 +106,7 @@ func (l *logger) callHandlers(level LogLevel, s string) { - - // Debugln logs a line with a DEBUG prefix. - func (l *logger) Debugln(vals ...interface{}) { -- l.debugln(3, vals) -+ l.debugln(3, vals...) - } - func (l *logger) debugln(level int, vals ...interface{}) { - s := fmt.Sprintln(vals...) diff --git a/sources b/sources index aa23342..5d593d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.49.tar.gz) = d22a47f1bc5605f5fbf553a751699823f3fb963da501f91c19c84f9b0a8428ab0b4d2f250f6c32d96b8fa5077e8f00b3dddd51ab5eaf648b1a5a3947d8f63e8d +SHA512 (syncthing-source-v0.14.50.tar.gz) = a3a34a77399a9790261abce045f81cb3b24ff435bfc0062d57b92b05c323dfb66102447122107227c63449c55f2056a8d6c4a3700a1ab57f0d93abf05b59996a diff --git a/syncthing.spec b/syncthing.spec index 8993c9f..98ad060 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,44 +1,13 @@ -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 1 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 -# Build server tools -%global with_tools 1 -# Build CLI program -%global with_cli 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%global provider github -%global provider_tld com -%global project syncthing -%global repo syncthing -%global long_name golang-%{provider}-%{project}-%{repo} -# https://github.com/syncthing/syncthing -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global goipath %{provider_prefix} -%global commit 92602485434d17b473b2034b4291d29d869c4076 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -# commit 6b82538e623feb4df2bef9fc4b37d581de96309a == version 0.14.49 - +%global goipath github.com/syncthing/syncthing +%global tag v0.14.50 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.49 +Version: 0.14.50 Release: 1%{?dist} +%gometa + # syncthing (MPLv2.0) bundles # - angular (MIT), # - bootstrap (MIT), @@ -52,18 +21,9 @@ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version} # goleveldb in fedora is too old to have the nosync option, so disable it Patch2: 02-leveldb-nonosync.patch -# Upstream patch to fix building tests with go 1.11+ -# https://github.com/syncthing/syncthing/commit/3d83440 -Patch3: 03-fix-go-111-type-error.patch - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - BuildRequires: systemd -%if 0%{?with_check} && ! 0%{?with_bundled} +BuildRequires: golang(github.com/AudriusButkevicius/cli) BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) BuildRequires: golang(github.com/bkaradzic/go-lz4) BuildRequires: golang(github.com/calmh/du) @@ -73,9 +33,13 @@ BuildRequires: golang(github.com/d4l3k/messagediff) BuildRequires: golang(github.com/gobwas/glob) BuildRequires: golang(github.com/gogo/protobuf/gogoproto) BuildRequires: golang(github.com/gogo/protobuf/proto) +BuildRequires: golang(github.com/golang/groupcache/lru) BuildRequires: golang(github.com/jackpal/gateway) BuildRequires: golang(github.com/kballard/go-shellquote) BuildRequires: golang(github.com/minio/sha256-simd) +BuildRequires: golang(github.com/oschwald/geoip2-golang) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp) BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/rcrowley/go-metrics) BuildRequires: golang(github.com/sasha-s/go-deadlock) @@ -94,12 +58,9 @@ BuildRequires: golang(golang.org/x/net/ipv6) BuildRequires: golang(golang.org/x/net/proxy) BuildRequires: golang(golang.org/x/text/unicode/norm) BuildRequires: golang(golang.org/x/time/rate) -%endif %{?systemd_requires} -Provides: %{long_name} = %{version}-%{release} - Provides: bundled(angular) = 1.3.20 Provides: bundled(angular-dirPagination) = 759009c Provides: bundled(angular-sanitize) = 1.3.20 @@ -128,86 +89,10 @@ that control is returned to you. This package contains the syncthing client binary and systemd services. -%if 0%{?with_devel} %package devel Summary: Continuous File Synchronization (development files) -Provides: %{long_name}-devel = %{version}-%{release} BuildArch: noarch -Requires: golang(github.com/AudriusButkevicius/go-nat-pmp) -Requires: golang(github.com/bkaradzic/go-lz4) -Requires: golang(github.com/calmh/du) -Requires: golang(github.com/calmh/xdr) -Requires: golang(github.com/chmduquesne/rollinghash/adler32) -Requires: golang(github.com/d4l3k/messagediff) -Requires: golang(github.com/gobwas/glob) -Requires: golang(github.com/gogo/protobuf/gogoproto) -Requires: golang(github.com/gogo/protobuf/proto) -Requires: golang(github.com/jackpal/gateway) -Requires: golang(github.com/kballard/go-shellquote) -Requires: golang(github.com/minio/sha256-simd) -Requires: golang(github.com/pkg/errors) -Requires: golang(github.com/rcrowley/go-metrics) -Requires: golang(github.com/sasha-s/go-deadlock) -Requires: golang(github.com/syncthing/notify) -Requires: golang(github.com/syndtr/goleveldb/leveldb) -Requires: golang(github.com/syndtr/goleveldb/leveldb/errors) -Requires: golang(github.com/syndtr/goleveldb/leveldb/iterator) -Requires: golang(github.com/syndtr/goleveldb/leveldb/opt) -Requires: golang(github.com/syndtr/goleveldb/leveldb/storage) -Requires: golang(github.com/syndtr/goleveldb/leveldb/util) -Requires: golang(github.com/thejerf/suture) -Requires: golang(github.com/vitrun/qart/qr) -Requires: golang(golang.org/x/net/ipv4) -Requires: golang(golang.org/x/net/ipv6) -Requires: golang(golang.org/x/net/proxy) -Requires: golang(golang.org/x/text/unicode/norm) -Requires: golang(golang.org/x/time/rate) - -%if %{with_tools} -Requires: golang(github.com/golang/groupcache/lru) -Requires: golang(github.com/oschwald/geoip2-golang) -Requires: golang(github.com/prometheus/client_golang/prometheus) -Requires: golang(github.com/prometheus/client_golang/prometheus/promhttp) -%endif - -%if %{with_cli} -Requires: golang(github.com/AudriusButkevicius/cli) -%endif - -Provides: golang(%{import_path}/lib/auto) = %{version}-%{release} -Provides: golang(%{import_path}/lib/beacon) = %{version}-%{release} -Provides: golang(%{import_path}/lib/config) = %{version}-%{release} -Provides: golang(%{import_path}/lib/connections) = %{version}-%{release} -Provides: golang(%{import_path}/lib/db) = %{version}-%{release} -Provides: golang(%{import_path}/lib/dialer) = %{version}-%{release} -Provides: golang(%{import_path}/lib/discover) = %{version}-%{release} -Provides: golang(%{import_path}/lib/events) = %{version}-%{release} -Provides: golang(%{import_path}/lib/fs) = %{version}-%{release} -Provides: golang(%{import_path}/lib/ignore) = %{version}-%{release} -Provides: golang(%{import_path}/lib/logger) = %{version}-%{release} -Provides: golang(%{import_path}/lib/model) = %{version}-%{release} -Provides: golang(%{import_path}/lib/nat) = %{version}-%{release} -Provides: golang(%{import_path}/lib/osutil) = %{version}-%{release} -Provides: golang(%{import_path}/lib/pmp) = %{version}-%{release} -Provides: golang(%{import_path}/lib/protocol) = %{version}-%{release} -Provides: golang(%{import_path}/lib/rand) = %{version}-%{release} -Provides: golang(%{import_path}/lib/rc) = %{version}-%{release} -Provides: golang(%{import_path}/lib/relay/client) = %{version}-%{release} -Provides: golang(%{import_path}/lib/relay/protocol) = %{version}-%{release} -Provides: golang(%{import_path}/lib/scanner) = %{version}-%{release} -Provides: golang(%{import_path}/lib/sha256) = %{version}-%{release} -Provides: golang(%{import_path}/lib/signature) = %{version}-%{release} -Provides: golang(%{import_path}/lib/stats) = %{version}-%{release} -Provides: golang(%{import_path}/lib/sync) = %{version}-%{release} -Provides: golang(%{import_path}/lib/tlsutil) = %{version}-%{release} -Provides: golang(%{import_path}/lib/upgrade) = %{version}-%{release} -Provides: golang(%{import_path}/lib/upnp) = %{version}-%{release} -Provides: golang(%{import_path}/lib/util) = %{version}-%{release} -Provides: golang(%{import_path}/lib/versioner) = %{version}-%{release} -Provides: golang(%{import_path}/lib/watchaggregator) = %{version}-%{release} -Provides: golang(%{import_path}/lib/weakhash) = %{version}-%{release} - %description devel Syncthing replaces other file synchronization services with something open, trustworthy and decentralized. Your data is your data alone and @@ -217,20 +102,11 @@ that control is returned to you. This package contains the syncthing sources, which are needed as dependency for building packages using syncthing. -%endif -%if 0%{?with_tools} %package tools Summary: Continuous File Synchronization (server tools) -%if ! 0%{?with_bundled} -BuildRequires: golang(github.com/golang/groupcache/lru) -BuildRequires: golang(github.com/oschwald/geoip2-golang) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp) -%endif - %description tools Syncthing replaces other file synchronization services with something open, trustworthy and decentralized. Your data is your data alone and @@ -244,17 +120,10 @@ This package contains the main syncthing server tools: file transfers between client nodes, and * stdiscosrv, the syncthing discovery server for discovering nodes to connect to indirectly over the internet. -%endif -%if 0%{?with_cli} %package cli Summary: Continuous File Synchronization (CLI) -Requires: %{name}%{?_isa} = %{version}-%{release} - -%if ! 0%{?with_bundled} -BuildRequires: golang(github.com/AudriusButkevicius/cli) -%endif %description cli Syncthing replaces other file synchronization services with something @@ -264,7 +133,6 @@ third party and how it's transmitted over the Internet. Using syncthing, that control is returned to you. This package contains the CLI program. -%endif %prep @@ -284,10 +152,10 @@ ln -s $TOP syncthing popd export GOPATH=$(pwd)/_build:%{gopath} -export BUILDDIR=$(pwd)/_build/src/%{import_path} +export BUILDDIR=$(pwd)/_build/src/%{goipath} # compile assets used by the build process -pushd _build/src/%{import_path} +pushd _build/src/%{goipath} go run build.go assets rm build.go popd @@ -297,17 +165,11 @@ export BUILD_HOST=fedora-koji export LDFLAGS="-X main.Version=v%{version} -X main.BuildStamp=$(date +%s) -X main.BuildUser=$USER -X main.BuildHost=$BUILD_HOST" export BUILDTAGS="noupgrade" -%gobuild -o _bin/syncthing %{import_path}/cmd/syncthing - -%if 0%{?with_tools} -%gobuild -o _bin/stdiscosrv %{import_path}/cmd/stdiscosrv -%gobuild -o _bin/strelaysrv %{import_path}/cmd/strelaysrv -%gobuild -o _bin/strelaypoolsrv %{import_path}/cmd/strelaypoolsrv -%endif - -%if 0%{?with_cli} -%gobuild -o _bin/stcli %{import_path}/cmd/stcli -%endif +%gobuild -o _bin/syncthing %{goipath}/cmd/syncthing +%gobuild -o _bin/stdiscosrv %{goipath}/cmd/stdiscosrv +%gobuild -o _bin/strelaysrv %{goipath}/cmd/strelaysrv +%gobuild -o _bin/strelaypoolsrv %{goipath}/cmd/strelaypoolsrv +%gobuild -o _bin/stcli %{goipath}/cmd/stcli %install @@ -315,16 +177,10 @@ export BUILDTAGS="noupgrade" mkdir -p %{buildroot}/%{_bindir} cp -pav _bin/syncthing %{buildroot}/%{_bindir}/ - -%if 0%{?with_tools} cp -pav _bin/stdiscosrv %{buildroot}/%{_bindir}/ cp -pav _bin/strelaysrv %{buildroot}/%{_bindir}/ cp -pav _bin/strelaypoolsrv %{buildroot}/%{_bindir}/ -%endif - -%if 0%{?with_cli} cp -pav _bin/stcli %{buildroot}/%{_bindir}/ -%endif # install man pages mkdir -p %{buildroot}/%{_mandir}/man1 @@ -334,11 +190,8 @@ mkdir -p %{buildroot}/%{_mandir}/man7 cp -pav ./man/syncthing.1 %{buildroot}/%{_mandir}/man1/ cp -pav ./man/*.5 %{buildroot}/%{_mandir}/man5/ cp -pav ./man/*.7 %{buildroot}/%{_mandir}/man7/ - -%if 0%{?with_tools} cp -pav ./man/stdiscosrv.1 %{buildroot}/%{_mandir}/man1/ cp -pav ./man/strelaysrv.1 %{buildroot}/%{_mandir}/man1/ -%endif # install systemd units mkdir -p %{buildroot}/%{_unitdir} @@ -360,58 +213,48 @@ for i in $(find -name "*.go" -executable -print); do chmod a-x $i; done %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} export GOPATH=$(pwd)/_build:%{gopath} -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path}/cmd/stdiscosrv -%gotest %{import_path}/cmd/syncthing -%gotest %{import_path}/lib/auto -%gotest %{import_path}/lib/beacon -%gotest %{import_path}/lib/config -%gotest %{import_path}/lib/connections -%gotest %{import_path}/lib/db -%gotest %{import_path}/lib/dialer -%gotest %{import_path}/lib/discover -%gotest %{import_path}/lib/events -%gotest %{import_path}/lib/fs -%gotest %{import_path}/lib/ignore -%gotest %{import_path}/lib/logger +%gotest %{goipath}/cmd/stdiscosrv +%gotest %{goipath}/cmd/syncthing +%gotest %{goipath}/lib/auto +%gotest %{goipath}/lib/beacon +%gotest %{goipath}/lib/config +%gotest %{goipath}/lib/connections +%gotest %{goipath}/lib/db +%gotest %{goipath}/lib/dialer +%gotest %{goipath}/lib/discover +%gotest %{goipath}/lib/events +%gotest %{goipath}/lib/fs +%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 %{import_path}/lib/model || : +%gotest %{goipath}/lib/model || : -%gotest %{import_path}/lib/nat -%gotest %{import_path}/lib/osutil -%gotest %{import_path}/lib/pmp - -# This test seems to fail on 32 bit architectures only, ignore for now: -# https://github.com/syncthing/syncthing/issues/4990 -%gotest %{import_path}/lib/protocol || : - -%gotest %{import_path}/lib/rand -%gotest %{import_path}/lib/relay/client -%gotest %{import_path}/lib/relay/protocol -%gotest %{import_path}/lib/scanner -%gotest %{import_path}/lib/signature -%gotest %{import_path}/lib/stats -%gotest %{import_path}/lib/sync -%gotest %{import_path}/lib/tlsutil -%gotest %{import_path}/lib/upgrade -%gotest %{import_path}/lib/upnp -%gotest %{import_path}/lib/util +%gotest %{goipath}/lib/nat +%gotest %{goipath}/lib/osutil +%gotest %{goipath}/lib/pmp +%gotest %{goipath}/lib/protocol +%gotest %{goipath}/lib/rand +%gotest %{goipath}/lib/relay/client +%gotest %{goipath}/lib/relay/protocol +%gotest %{goipath}/lib/scanner +%gotest %{goipath}/lib/signature +%gotest %{goipath}/lib/stats +%gotest %{goipath}/lib/sync +%gotest %{goipath}/lib/tlsutil +%gotest %{goipath}/lib/upgrade +%gotest %{goipath}/lib/upnp +%gotest %{goipath}/lib/util # This test sometimes fails dependent on load on some architectures: # https://github.com/syncthing/syncthing/issues/4351 -%gotest %{import_path}/lib/versioner || : +%gotest %{goipath}/lib/versioner || : -%gotest %{import_path}/lib/watchaggregator -%gotest %{import_path}/lib/weakhash -%endif +%gotest %{goipath}/lib/watchaggregator +%gotest %{goipath}/lib/weakhash %post @@ -441,7 +284,6 @@ export GOPATH=$(pwd)/_build:%{gopath} %{_userpresetdir}/90-syncthing.preset -%if 0%{?with_tools} %files tools %license LICENSE %doc README.md AUTHORS @@ -452,24 +294,26 @@ export GOPATH=$(pwd)/_build:%{gopath} %{_mandir}/man1/stdiscosrv* %{_mandir}/man1/strelaysrv* -%endif -%if 0%{?with_cli} %files cli +%license LICENSE +%doc README.md AUTHORS + %{_bindir}/stcli -%endif -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc README.md AUTHORS -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif %changelog +* Tue Sep 11 2018 Fabio Valentini - 0.14.50-1 +- Update to version 0.14.50. +- Clean up .spec file and use new macros. +- Drop upstreamed go1.11 patch. + * Wed Jul 25 2018 Fabio Valentini - 0.14.49-1 - Update to version 0.14.49. - Drop upstreamed osext patch. From 8dfbfc96c938b544a60f84ffbf3d95325d550e40 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 30 Sep 2018 18:23:57 +0200 Subject: [PATCH 022/133] adapt to changed behaviour with rollonghash v4.0.0 --- .gitignore | 2 ++ 01-rollinghash-behaviour-changes.patch | 32 ++++++++++++++++++++++++++ syncthing.spec | 9 +++++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 01-rollinghash-behaviour-changes.patch diff --git a/.gitignore b/.gitignore index d09dcde..013e703 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/results* +/*.src.rpm /syncthing-source-v0.14.35.tar.gz /syncthing-source-v0.14.36.tar.gz /syncthing-source-v0.14.37.tar.gz diff --git a/01-rollinghash-behaviour-changes.patch b/01-rollinghash-behaviour-changes.patch new file mode 100644 index 0000000..8e19ed0 --- /dev/null +++ b/01-rollinghash-behaviour-changes.patch @@ -0,0 +1,32 @@ +From 8d745e076d52612b346209828ca81cc0fc026c3b Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Sun, 30 Sep 2018 18:07:55 +0200 +Subject: [PATCH] lib/scanner/blocks_test.go: adapt to rollinghash changes + +--- + lib/scanner/blocks_test.go | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/scanner/blocks_test.go b/lib/scanner/blocks_test.go +index 311dbdd..99f1a71 100644 +--- a/lib/scanner/blocks_test.go ++++ b/lib/scanner/blocks_test.go +@@ -144,14 +144,13 @@ func TestAdler32Variants(t *testing.T) { + + windowSize := 128 + +- hf2.Reset() +- + hf3 := rollingAdler32.New() + hf3.Write(data[:windowSize]) + + for i := windowSize; i < len(data); i++ { + if i%windowSize == 0 { + // let the reference function catch up ++ hf2.Reset() + hf2.Write(data[i-windowSize : i]) + + // verify that they are in sync with the rolling function +-- +2.17.1 + diff --git a/syncthing.spec b/syncthing.spec index 98ad060..abb293e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -4,7 +4,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 0.14.50 -Release: 1%{?dist} +Release: 2%{?dist} %gometa @@ -18,6 +18,9 @@ License: MPLv2.0 and MIT and OFL URL: https://syncthing.net Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz +# rollinghash behavior changed with version 4.0.0 +Patch1: 01-rollinghash-behaviour-changes.patch + # goleveldb in fedora is too old to have the nosync option, so disable it Patch2: 02-leveldb-nonosync.patch @@ -213,6 +216,7 @@ for i in $(find -name "*.go" -executable -print); do chmod a-x $i; done %check +export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} %gotest %{goipath}/cmd/stdiscosrv @@ -309,6 +313,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Sun Sep 30 2018 Fabio Valentini - 0.14.50-2 +- Adapt to rollinghash v4.0.0 changes. + * Tue Sep 11 2018 Fabio Valentini - 0.14.50-1 - Update to version 0.14.50. - Clean up .spec file and use new macros. From a9d8a06cb2664a9e9b6456a151dce4279fe10d67 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 3 Oct 2018 19:06:14 +0200 Subject: [PATCH 023/133] update to version 0.14.51 --- .gitignore | 4 +++- sources | 2 +- syncthing.spec | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 013e703..499d943 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -/results* +/results_* /*.src.rpm + /syncthing-source-v0.14.35.tar.gz /syncthing-source-v0.14.36.tar.gz /syncthing-source-v0.14.37.tar.gz @@ -15,3 +16,4 @@ /syncthing-source-v0.14.48.tar.gz /syncthing-source-v0.14.49.tar.gz /syncthing-source-v0.14.50.tar.gz +/syncthing-source-v0.14.51.tar.gz diff --git a/sources b/sources index 5d593d9..d2d543f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.50.tar.gz) = a3a34a77399a9790261abce045f81cb3b24ff435bfc0062d57b92b05c323dfb66102447122107227c63449c55f2056a8d6c4a3700a1ab57f0d93abf05b59996a +SHA512 (syncthing-source-v0.14.51.tar.gz) = 3b28d45cbd01809dfa425f650fec370df349684f2007516a689fb5fb95bbb915913289410eec7c7f06998edf3c3d5b9754224624650c862d15a114e2aae8b691 diff --git a/syncthing.spec b/syncthing.spec index abb293e..de2a8a6 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,10 +1,10 @@ %global goipath github.com/syncthing/syncthing -%global tag v0.14.50 +%global tag v0.14.51 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.50 -Release: 2%{?dist} +Version: 0.14.51 +Release: 1%{?dist} %gometa @@ -61,6 +61,7 @@ BuildRequires: golang(golang.org/x/net/ipv6) BuildRequires: golang(golang.org/x/net/proxy) BuildRequires: golang(golang.org/x/text/unicode/norm) BuildRequires: golang(golang.org/x/time/rate) +BuildRequires: golang(gopkg.in/ldap.v2) %{?systemd_requires} @@ -205,12 +206,14 @@ cp -pav etc/linux-systemd/system/syncthing-resume.service %{buildroot}/%{_unitdi cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ # install systemd preset disabling the service per default -mkdir -p %{buildroot}/%{_prefix}/lib/systemd/user-preset +mkdir -p %{buildroot}/%{_userpresetdir} echo "disable syncthing*" > %{buildroot}/%{_userpresetdir}/90-syncthing.preset # Unmark source files as executable -for i in $(find -name "*.go" -executable -print); do chmod a-x $i; done +for i in $(find -name "*.go" -executable -print); do + chmod a-x $i; +done %goinstall @@ -220,6 +223,7 @@ export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} %gotest %{goipath}/cmd/stdiscosrv +%gotest %{goipath}/cmd/strelaypoolsrv %gotest %{goipath}/cmd/syncthing %gotest %{goipath}/lib/auto %gotest %{goipath}/lib/beacon @@ -313,6 +317,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Tue Oct 02 2018 Fabio Valentini - 0.14.51-1 +- Update to version 0.14.51. + * Sun Sep 30 2018 Fabio Valentini - 0.14.50-2 - Adapt to rollinghash v4.0.0 changes. From 11e06678f4fbc6a6c07b23b1786f907fb6b6055d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 6 Nov 2018 18:21:19 +0100 Subject: [PATCH 024/133] update to version 0.14.52 --- .gitignore | 1 + sources | 2 +- syncthing.rpmlintrc | 5 +++++ syncthing.spec | 13 ++++++++----- 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 syncthing.rpmlintrc diff --git a/.gitignore b/.gitignore index 499d943..77d703b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /syncthing-source-v0.14.49.tar.gz /syncthing-source-v0.14.50.tar.gz /syncthing-source-v0.14.51.tar.gz +/syncthing-source-v0.14.52.tar.gz diff --git a/sources b/sources index d2d543f..7f67eb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.51.tar.gz) = 3b28d45cbd01809dfa425f650fec370df349684f2007516a689fb5fb95bbb915913289410eec7c7f06998edf3c3d5b9754224624650c862d15a114e2aae8b691 +SHA512 (syncthing-source-v0.14.52.tar.gz) = 1c832fc47ebe06d1ec90cffb904734ed68e468876907be815da20c77037046f57143f455763572013f4de249cb4c14e5a395c8febf1d3ea29c8754352cba05eb diff --git a/syncthing.rpmlintrc b/syncthing.rpmlintrc new file mode 100644 index 0000000..3e9a54e --- /dev/null +++ b/syncthing.rpmlintrc @@ -0,0 +1,5 @@ +# 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 de2a8a6..673c0f3 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,9 +1,9 @@ %global goipath github.com/syncthing/syncthing -%global tag v0.14.51 +%global tag v0.14.52 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.51 +Version: 0.14.52 Release: 1%{?dist} %gometa @@ -11,9 +11,9 @@ Release: 1%{?dist} # syncthing (MPLv2.0) bundles # - angular (MIT), # - bootstrap (MIT), -# - font-awesome (MIT/OFL), and +# - ForkAwesome (MIT/OFL/CC-BY 3.0), and # - moment (MIT) -License: MPLv2.0 and MIT and OFL +License: MPLv2.0 and MIT and OFL and CC-BY URL: https://syncthing.net Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz @@ -72,7 +72,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.0.0 -Provides: bundled(font-awesome) = 5.0.13 +Provides: bundled(ForkAwesome) = 1.1.2 Provides: bundled(jquery) = 2.2.2 Provides: bundled(jquery-fancytree) = 2.28.1 Provides: bundled(jquery-ui) = 1.12.1 @@ -317,6 +317,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Tue Nov 06 2018 Fabio Valentini - 0.14.52-1 +- Update to version 0.14.52. + * Tue Oct 02 2018 Fabio Valentini - 0.14.51-1 - Update to version 0.14.51. From d379ef8e0189e398f744bac9b86696f2b0895380 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 26 Dec 2018 11:45:37 +0100 Subject: [PATCH 025/133] update to version 0.14.54 --- .gitignore | 2 + 01-rollinghash-behaviour-changes.patch | 32 ---- sources | 2 +- syncthing.spec | 197 +++++++++++++++++++------ 4 files changed, 156 insertions(+), 77 deletions(-) delete mode 100644 01-rollinghash-behaviour-changes.patch diff --git a/.gitignore b/.gitignore index 77d703b..64d14c0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /syncthing-source-v0.14.50.tar.gz /syncthing-source-v0.14.51.tar.gz /syncthing-source-v0.14.52.tar.gz +/syncthing-source-v0.14.53.tar.gz +/syncthing-source-v0.14.54.tar.gz diff --git a/01-rollinghash-behaviour-changes.patch b/01-rollinghash-behaviour-changes.patch deleted file mode 100644 index 8e19ed0..0000000 --- a/01-rollinghash-behaviour-changes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8d745e076d52612b346209828ca81cc0fc026c3b Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Sun, 30 Sep 2018 18:07:55 +0200 -Subject: [PATCH] lib/scanner/blocks_test.go: adapt to rollinghash changes - ---- - lib/scanner/blocks_test.go | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/scanner/blocks_test.go b/lib/scanner/blocks_test.go -index 311dbdd..99f1a71 100644 ---- a/lib/scanner/blocks_test.go -+++ b/lib/scanner/blocks_test.go -@@ -144,14 +144,13 @@ func TestAdler32Variants(t *testing.T) { - - windowSize := 128 - -- hf2.Reset() -- - hf3 := rollingAdler32.New() - hf3.Write(data[:windowSize]) - - for i := windowSize; i < len(data); i++ { - if i%windowSize == 0 { - // let the reference function catch up -+ hf2.Reset() - hf2.Write(data[i-windowSize : i]) - - // verify that they are in sync with the rolling function --- -2.17.1 - diff --git a/sources b/sources index 7f67eb6..8979094 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.52.tar.gz) = 1c832fc47ebe06d1ec90cffb904734ed68e468876907be815da20c77037046f57143f455763572013f4de249cb4c14e5a395c8febf1d3ea29c8754352cba05eb +SHA512 (syncthing-source-v0.14.54.tar.gz) = 67436bc22029fe3a1617ca612081e596ec7775d8012f779184576aea5748d7969fb16f45aeea53553af3380b7bce9a9b9040aa001de5df3f4e8ac0bfdb27128f diff --git a/syncthing.spec b/syncthing.spec index 673c0f3..d4d1fab 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,9 +1,9 @@ %global goipath github.com/syncthing/syncthing -%global tag v0.14.52 +%global tag v0.14.54 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.52 +Version: 0.14.54 Release: 1%{?dist} %gometa @@ -16,52 +16,50 @@ Release: 1%{?dist} License: MPLv2.0 and MIT and OFL and CC-BY URL: https://syncthing.net -Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz - -# rollinghash behavior changed with version 4.0.0 -Patch1: 01-rollinghash-behaviour-changes.patch +Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz # goleveldb in fedora is too old to have the nosync option, so disable it -Patch2: 02-leveldb-nonosync.patch +#Patch2: 02-leveldb-nonosync.patch +BuildRequires: desktop-file-utils BuildRequires: systemd -BuildRequires: golang(github.com/AudriusButkevicius/cli) -BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) -BuildRequires: golang(github.com/bkaradzic/go-lz4) -BuildRequires: golang(github.com/calmh/du) -BuildRequires: golang(github.com/calmh/xdr) -BuildRequires: golang(github.com/chmduquesne/rollinghash/adler32) -BuildRequires: golang(github.com/d4l3k/messagediff) -BuildRequires: golang(github.com/gobwas/glob) -BuildRequires: golang(github.com/gogo/protobuf/gogoproto) -BuildRequires: golang(github.com/gogo/protobuf/proto) -BuildRequires: golang(github.com/golang/groupcache/lru) -BuildRequires: golang(github.com/jackpal/gateway) -BuildRequires: golang(github.com/kballard/go-shellquote) -BuildRequires: golang(github.com/minio/sha256-simd) -BuildRequires: golang(github.com/oschwald/geoip2-golang) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp) -BuildRequires: golang(github.com/pkg/errors) -BuildRequires: golang(github.com/rcrowley/go-metrics) -BuildRequires: golang(github.com/sasha-s/go-deadlock) -BuildRequires: golang(github.com/syncthing/notify) -BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) -BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/errors) -BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/iterator) -BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/opt) -BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) -BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) -BuildRequires: golang(github.com/thejerf/suture) -BuildRequires: golang(github.com/vitrun/qart/qr) -BuildRequires: golang(golang.org/x/crypto/bcrypt) -BuildRequires: golang(golang.org/x/net/ipv4) -BuildRequires: golang(golang.org/x/net/ipv6) -BuildRequires: golang(golang.org/x/net/proxy) -BuildRequires: golang(golang.org/x/text/unicode/norm) -BuildRequires: golang(golang.org/x/time/rate) -BuildRequires: golang(gopkg.in/ldap.v2) +#BuildRequires: golang(github.com/AudriusButkevicius/cli) +#BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) +#BuildRequires: golang(github.com/bkaradzic/go-lz4) +#BuildRequires: golang(github.com/calmh/du) +#BuildRequires: golang(github.com/calmh/xdr) +#BuildRequires: golang(github.com/chmduquesne/rollinghash/adler32) +#BuildRequires: golang(github.com/d4l3k/messagediff) +#BuildRequires: golang(github.com/gobwas/glob) +#BuildRequires: golang(github.com/gogo/protobuf/gogoproto) +#BuildRequires: golang(github.com/gogo/protobuf/proto) +#BuildRequires: golang(github.com/golang/groupcache/lru) +#BuildRequires: golang(github.com/jackpal/gateway) +#BuildRequires: golang(github.com/kballard/go-shellquote) +#BuildRequires: golang(github.com/minio/sha256-simd) +#BuildRequires: golang(github.com/oschwald/geoip2-golang) +#BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +#BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp) +#BuildRequires: golang(github.com/pkg/errors) +#BuildRequires: golang(github.com/rcrowley/go-metrics) +#BuildRequires: golang(github.com/sasha-s/go-deadlock) +#BuildRequires: golang(github.com/syncthing/notify) +#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) +#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/errors) +#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/iterator) +#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/opt) +#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) +#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) +#BuildRequires: golang(github.com/thejerf/suture) +#BuildRequires: golang(github.com/vitrun/qart/qr) +#BuildRequires: golang(golang.org/x/crypto/bcrypt) +#BuildRequires: golang(golang.org/x/net/ipv4) +#BuildRequires: golang(golang.org/x/net/ipv6) +#BuildRequires: golang(golang.org/x/net/proxy) +#BuildRequires: golang(golang.org/x/text/unicode/norm) +#BuildRequires: golang(golang.org/x/time/rate) +#BuildRequires: golang(gopkg.in/ldap.v2) %{?systemd_requires} @@ -78,6 +76,100 @@ Provides: bundled(jquery-fancytree) = 2.28.1 Provides: bundled(jquery-ui) = 1.12.1 Provides: bundled(moment) = 2.19.4 +Provides: bundled(golang(code.cloudfoundry.org/bytefmt)) = a052d587819f45f719a22e344a8ad7858deb3733 +Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb +Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 9dca34a5b530bfc9843fa8aa2ff08ff9821032cb +Provides: bundled(golang(github.com/BurntSushi/toml)) = a368813c5e648fee92e5f6c30e3944ff9d5e8895 +Provides: bundled(golang(github.com/a8m/mark)) = 44f2db6188458162890ca13980819247418d8e45 +Provides: bundled(golang(github.com/beorn7/perks/quantile)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a +Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be +Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f +Provides: bundled(golang(github.com/cheggaaa/pb)) = 18d384da9bdc1e5a08fc2a62a494c321d9ae74ea +Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = abb8cbaf9915e48ee20cae94bcd94221b61707a2 +Provides: bundled(golang(github.com/d4l3k/messagediff)) = 29f32d820d112dbd66e58492a6ffb7cc3106312b +Provides: bundled(golang(github.com/dustin/go-humanize)) = bb3d318650d48840a39aa21a027c6630e198e626 +Provides: bundled(golang(github.com/gernest/wow)) = 7e0b2a2398989a5d220eebac5742d45422ba7de8 +Provides: bundled(golang(github.com/go-ini/ini)) = 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a +Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d931c66d229ceeb7c31b985563420 +Provides: bundled(golang(github.com/gogo/protobuf)) = 160de10b2537169b5ae3e7e221d28269ef40d311 +Provides: bundled(golang(github.com/golang/groupcache/lru)) = 84a468cf14b4376def5d68c722b139b881c450a4 +Provides: bundled(golang(github.com/golang/protobuf/proto)) = 1e59b77b52bf8e4b449a57e6f79f21226d571845 +Provides: bundled(golang(github.com/golang/protobuf/ptypes/any)) = 1e59b77b52bf8e4b449a57e6f79f21226d571845 +Provides: bundled(golang(github.com/golang/snappy)) = 553a641470496b2327abcac10b36396bd98e45c9 +Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e01d3fab7bcf21c043c3d6a32b006 +Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657ff3dc51de0b4f55dd299a3e136f2 +Provides: bundled(golang(github.com/klauspost/cpuid)) = eae9b3e628d72774e13bdf024e78c0802f85a5b9 +Provides: bundled(golang(github.com/lib/pq)) = 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79 +Provides: bundled(golang(github.com/magefile/mage/mg)) = 63768081a3236a7c6c53ef72e402ae1fe1664b61 +Provides: bundled(golang(github.com/magefile/mage/sh)) = 63768081a3236a7c6c53ef72e402ae1fe1664b61 +Provides: bundled(golang(github.com/magefile/mage/types)) = 63768081a3236a7c6c53ef72e402ae1fe1664b61 +Provides: bundled(golang(github.com/mattn/go-runewidth)) = 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions/pbutil)) = c12348ce28de40eed0136aa2b644d0ee0650e56c +Provides: bundled(golang(github.com/minio/cli)) = 45db1f8a055198ad8c12754026cb2c51c584c756 +Provides: bundled(golang(github.com/minio/sha256-simd)) = ad98a36ba0da87206e3378c556abbfeaeaa98668 +Provides: bundled(golang(github.com/mitchellh/go-homedir)) = b8bc1bf767474819792c23f32d8286a45736f1c6 +Provides: bundled(golang(github.com/onsi/ginkgo)) = 6c46eb8334b30dc55b42f1a1c725d5ce97375390 +Provides: bundled(golang(github.com/onsi/gomega)) = ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64 +Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 5b1dc16861f81d05d9836bb21c2d0d65282fc0b8 +Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 26fe5ace1c706491c2936119e1dc69c1a9c04d7f +Provides: bundled(golang(github.com/petermattis/goid)) = 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02 +Provides: bundled(golang(github.com/pkg/errors)) = e881fd58d78e04cf6d0de1217f8707c8cc2249bc +Provides: bundled(golang(github.com/prometheus/client_golang/prometheus)) = 1cafe34db7fdec6022e17e00e1c1ea501022f3e4 +Provides: bundled(golang(github.com/prometheus/client_model/go)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(golang(github.com/prometheus/common/expfmt)) = 2e54d0b93cba2fd133edc32211dcc32c06ef72ca +Provides: bundled(golang(github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg)) = 2e54d0b93cba2fd133edc32211dcc32c06ef72ca +Provides: bundled(golang(github.com/prometheus/common/model)) = 2e54d0b93cba2fd133edc32211dcc32c06ef72ca +Provides: bundled(golang(github.com/prometheus/procfs)) = b15cd069a83443be3154b719d0cc9fe8117f09fb +Provides: bundled(golang(github.com/rcrowley/go-metrics)) = e181e095bae94582363434144c61a9653aff6e50 +Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 03d40e5dbd5488667a13b3c2600b2f7c2886f02f +Provides: bundled(golang(github.com/sirupsen/logrus)) = d682213848ed68c0a260ca37d6dd5ace8423f5ba +Provides: bundled(golang(github.com/stathat/go)) = 74669b9f388d9d788c97399a0824adbfee78400e +Provides: bundled(golang(github.com/syncthing/notify)) = 116c45bb5ad48777321e4984d1320d56889b6097 +Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 34011bf325bce385408353a30b101fe5e923eb6e +Provides: bundled(golang(github.com/templexxx/cpufeat)) = 3794dfbfb04749f896b521032f69383f24c3687e +Provides: bundled(golang(github.com/thejerf/suture)) = bf6ee6a0b047ebbe9ae07d847f750dd18c6a9276 +Provides: bundled(golang(github.com/tjfoc/gmsm/sm4)) = 98aa888b79d8de04afe0fccf45ed10594efc858b +Provides: bundled(golang(github.com/vitrun/qart/coding)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa +Provides: bundled(golang(github.com/vitrun/qart/gf256)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa +Provides: bundled(golang(github.com/vitrun/qart/qr)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa +Provides: bundled(golang(golang.org/x/crypto/bcrypt)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/crypto/blowfish)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/crypto/cast5)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/crypto/pbkdf2)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/crypto/salsa20)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/crypto/ssh/terminal)) = 0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8 +Provides: bundled(golang(golang.org/x/crypto/tea)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/crypto/twofish)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/crypto/xtea)) = 95a4943f35d008beabde8c11e5075a1b714e6419 +Provides: bundled(golang(golang.org/x/net/bpf)) = d866cfc389cec985d6fda2859936a575a55a3ab6 +Provides: bundled(golang(golang.org/x/net/html)) = d866cfc389cec985d6fda2859936a575a55a3ab6 +Provides: bundled(golang(golang.org/x/net/internal/iana)) = d866cfc389cec985d6fda2859936a575a55a3ab6 +Provides: bundled(golang(golang.org/x/net/internal/socket)) = d866cfc389cec985d6fda2859936a575a55a3ab6 +Provides: bundled(golang(golang.org/x/net/ipv4)) = d866cfc389cec985d6fda2859936a575a55a3ab6 +Provides: bundled(golang(golang.org/x/net/ipv6)) = d866cfc389cec985d6fda2859936a575a55a3ab6 +Provides: bundled(golang(golang.org/x/net/proxy)) = d866cfc389cec985d6fda2859936a575a55a3ab6 +Provides: bundled(golang(golang.org/x/sys/unix)) = 83801418e1b59fb1880e363299581ee543af32ca +Provides: bundled(golang(golang.org/x/sys/windows)) = 83801418e1b59fb1880e363299581ee543af32ca +Provides: bundled(golang(golang.org/x/text/encoding)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/internal/format)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/internal/gen)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/internal/tag)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/internal/triegen)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/internal/ucd)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/internal/utf8internal)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/language)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/runes)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/transform)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/unicode/cldr)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/text/unicode/norm)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 +Provides: bundled(golang(golang.org/x/time/rate)) = 6dc17368e09b0e8634d71cac8168d853e869a0c7 +Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225df7a432012b8df0355c2a2063ac0 +Provides: bundled(golang(gopkg.in/ldap.v2)) = bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9 +Provides: bundled(golang(gopkg.in/urfave/cli.v1)) = cfb38830724cc34fedffe9a2a29fb54fa9169cd1 +Provides: bundled(golang(gopkg.in/yaml.v2)) = 287cf08546ab5e7e37d55a84f7ed3fd1db036de5 + # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 Obsoletes: syncthing-inotify < 0.8.7-5 @@ -145,7 +237,7 @@ This package contains the CLI program. %build # remove bundled libraries -rm -r vendor +#rm -r vendor # prepare build environment mkdir -p ./_build/src/github.com/syncthing @@ -209,6 +301,11 @@ cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ mkdir -p %{buildroot}/%{_userpresetdir} echo "disable syncthing*" > %{buildroot}/%{_userpresetdir}/90-syncthing.preset +# install .desktop files +mkdir -p %{buildroot}/%{_datadir}/applications + +cp -pav etc/linux-desktop/*.desktop %{buildroot}/%{_datadir}/applications/ + # Unmark source files as executable for i in $(find -name "*.go" -executable -print); do @@ -219,6 +316,9 @@ done %check +desktop-file-validate \ + %{buildroot}/%{_datadir}/applications/syncthing*.desktop + export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} @@ -291,6 +391,8 @@ export GOPATH=$(pwd)/_build:%{gopath} %{_userunitdir}/syncthing.service %{_userpresetdir}/90-syncthing.preset +%{_datadir}/applications/syncthing*.desktop + %files tools %license LICENSE @@ -317,6 +419,13 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Wed Dec 26 2018 Fabio Valentini - 0.14.54-1 +- Update to version 0.14.54. +- Switch back to using bundled dependencies. + +* Tue Dec 04 2018 Fabio Valentini - 0.14.53-1 +- Update to version 0.14.53. + * Tue Nov 06 2018 Fabio Valentini - 0.14.52-1 - Update to version 0.14.52. From ebb5fc7f8cc11530afb2cc2b169e8d57fa5b14de Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 7 Jan 2019 23:37:26 +0100 Subject: [PATCH 026/133] update to version 1.0.0 (equivalent to 0.14.55) --- .gitignore | 1 + 02-leveldb-nonosync.patch | 13 ------------- sources | 2 +- syncthing.spec | 9 ++++++--- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 02-leveldb-nonosync.patch diff --git a/.gitignore b/.gitignore index 64d14c0..6aac50a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /syncthing-source-v0.14.52.tar.gz /syncthing-source-v0.14.53.tar.gz /syncthing-source-v0.14.54.tar.gz +/syncthing-source-v1.0.0.tar.gz diff --git a/02-leveldb-nonosync.patch b/02-leveldb-nonosync.patch deleted file mode 100644 index f474e8d..0000000 --- a/02-leveldb-nonosync.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmd/stdiscosrv/main.go b/cmd/stdiscosrv/main.go -index b74fcee..346b81b 100644 ---- a/cmd/stdiscosrv/main.go -+++ b/cmd/stdiscosrv/main.go -@@ -61,7 +61,7 @@ const ( - // the expense of some memory usage and risk of losing writes in a (system) - // crash. - var levelDBOptions = &opt.Options{ -- NoSync: true, -+// NoSync: true, - WriteBuffer: 32 << 20, // default 4<<20 - } - diff --git a/sources b/sources index 8979094..4870fb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v0.14.54.tar.gz) = 67436bc22029fe3a1617ca612081e596ec7775d8012f779184576aea5748d7969fb16f45aeea53553af3380b7bce9a9b9040aa001de5df3f4e8ac0bfdb27128f +SHA512 (syncthing-source-v1.0.0.tar.gz) = d0b0df285096aa32bd9d364b590d66716d9af7c1f9284973828a0254d11a632b1e2499f44f98bde2c62c44036f01eb013421efdf14d5af918ec29bf40d851cdf diff --git a/syncthing.spec b/syncthing.spec index d4d1fab..8f19207 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,9 +1,9 @@ %global goipath github.com/syncthing/syncthing -%global tag v0.14.54 +%global tag v1.0.0 Name: syncthing Summary: Continuous File Synchronization -Version: 0.14.54 +Version: 1.0.0 Release: 1%{?dist} %gometa @@ -87,7 +87,7 @@ Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f Provides: bundled(golang(github.com/cheggaaa/pb)) = 18d384da9bdc1e5a08fc2a62a494c321d9ae74ea -Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = abb8cbaf9915e48ee20cae94bcd94221b61707a2 +Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142b536ea61bb5d84014171189eeaaa81 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 29f32d820d112dbd66e58492a6ffb7cc3106312b Provides: bundled(golang(github.com/dustin/go-humanize)) = bb3d318650d48840a39aa21a027c6630e198e626 Provides: bundled(golang(github.com/gernest/wow)) = 7e0b2a2398989a5d220eebac5742d45422ba7de8 @@ -419,6 +419,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Mon Jan 07 2019 Fabio Valentini - 1.0.0-1 +- Update to version 1.0.0. + * Wed Dec 26 2018 Fabio Valentini - 0.14.54-1 - Update to version 0.14.54. - Switch back to using bundled dependencies. From 7ed4bf06549bb57a172e5ef8661a24625206fb64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 09:14:21 +0000 Subject: [PATCH 027/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 8f19207..161081d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -4,7 +4,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} %gometa @@ -419,6 +419,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 07 2019 Fabio Valentini - 1.0.0-1 - Update to version 1.0.0. From 0713fcee02a776f3c81a2d44146f9dddd1daa273 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 5 Feb 2019 11:44:03 +0100 Subject: [PATCH 028/133] update to version 1.0.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 14 +++++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6aac50a..803b7dc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /syncthing-source-v0.14.53.tar.gz /syncthing-source-v0.14.54.tar.gz /syncthing-source-v1.0.0.tar.gz +/syncthing-source-v1.0.1.tar.gz diff --git a/sources b/sources index 4870fb9..e99e3e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.0.0.tar.gz) = d0b0df285096aa32bd9d364b590d66716d9af7c1f9284973828a0254d11a632b1e2499f44f98bde2c62c44036f01eb013421efdf14d5af918ec29bf40d851cdf +SHA512 (syncthing-source-v1.0.1.tar.gz) = c5e1b98376d4b6ff377dfabcc686926a42e0d3db84911b3b5b5b93ec0e0542d037cafeee9fb0b4f673f99ed25fb974e14c02ca64f1be5a0a23bd6cfb2ed978b9 diff --git a/syncthing.spec b/syncthing.spec index 161081d..c41e584 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,10 +1,10 @@ %global goipath github.com/syncthing/syncthing -%global tag v1.0.0 +%global tag v1.0.1 Name: syncthing Summary: Continuous File Synchronization -Version: 1.0.0 -Release: 2%{?dist} +Version: 1.0.1 +Release: 1%{?dist} %gometa @@ -236,6 +236,8 @@ This package contains the CLI program. %build +export GO111MODULE=off + # remove bundled libraries #rm -r vendor @@ -269,6 +271,8 @@ export BUILDTAGS="noupgrade" %install +export GO111MODULE=off + # install binaries mkdir -p %{buildroot}/%{_bindir} @@ -321,6 +325,7 @@ desktop-file-validate \ export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} +export GO111MODULE=off %gotest %{goipath}/cmd/stdiscosrv %gotest %{goipath}/cmd/strelaypoolsrv @@ -419,6 +424,9 @@ export GOPATH=$(pwd)/_build:%{gopath} %changelog +* Tue Feb 05 2019 Fabio Valentini - 1.0.1-1 +- Update to version 1.0.1. + * Sun Feb 03 2019 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d51a4db810cb7249947487cade9ca1f90a224dd2 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 5 Mar 2019 22:46:04 +0100 Subject: [PATCH 029/133] update to version 1.1.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 191 ++++++++++++++----------------------------------- 3 files changed, 56 insertions(+), 138 deletions(-) diff --git a/.gitignore b/.gitignore index 803b7dc..99b1820 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /syncthing-source-v0.14.54.tar.gz /syncthing-source-v1.0.0.tar.gz /syncthing-source-v1.0.1.tar.gz +/syncthing-source-v1.1.0.tar.gz diff --git a/sources b/sources index e99e3e3..092b47a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.0.1.tar.gz) = c5e1b98376d4b6ff377dfabcc686926a42e0d3db84911b3b5b5b93ec0e0542d037cafeee9fb0b4f673f99ed25fb974e14c02ca64f1be5a0a23bd6cfb2ed978b9 +SHA512 (syncthing-source-v1.1.0.tar.gz) = 7a287d943be134f895f28d2c3e661a860f0e8929a79dcd1b6956e11d2aac41edd9fba0f3ab5e358e67e940fd7456fb08e3b3cf529c333d71c144cfa7eb2abb63 diff --git a/syncthing.spec b/syncthing.spec index c41e584..77e4593 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,11 +1,11 @@ -%global goipath github.com/syncthing/syncthing -%global tag v1.0.1 - Name: syncthing Summary: Continuous File Synchronization -Version: 1.0.1 +Version: 1.1.0 Release: 1%{?dist} +%global goipath github.com/syncthing/syncthing +%global tag v%{version} + %gometa # syncthing (MPLv2.0) bundles @@ -13,56 +13,18 @@ Release: 1%{?dist} # - bootstrap (MIT), # - ForkAwesome (MIT/OFL/CC-BY 3.0), and # - moment (MIT) +# - a number of go packages (see below) License: MPLv2.0 and MIT and OFL and CC-BY URL: https://syncthing.net Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz -# goleveldb in fedora is too old to have the nosync option, so disable it -#Patch2: 02-leveldb-nonosync.patch - BuildRequires: desktop-file-utils BuildRequires: systemd -#BuildRequires: golang(github.com/AudriusButkevicius/cli) -#BuildRequires: golang(github.com/AudriusButkevicius/go-nat-pmp) -#BuildRequires: golang(github.com/bkaradzic/go-lz4) -#BuildRequires: golang(github.com/calmh/du) -#BuildRequires: golang(github.com/calmh/xdr) -#BuildRequires: golang(github.com/chmduquesne/rollinghash/adler32) -#BuildRequires: golang(github.com/d4l3k/messagediff) -#BuildRequires: golang(github.com/gobwas/glob) -#BuildRequires: golang(github.com/gogo/protobuf/gogoproto) -#BuildRequires: golang(github.com/gogo/protobuf/proto) -#BuildRequires: golang(github.com/golang/groupcache/lru) -#BuildRequires: golang(github.com/jackpal/gateway) -#BuildRequires: golang(github.com/kballard/go-shellquote) -#BuildRequires: golang(github.com/minio/sha256-simd) -#BuildRequires: golang(github.com/oschwald/geoip2-golang) -#BuildRequires: golang(github.com/prometheus/client_golang/prometheus) -#BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp) -#BuildRequires: golang(github.com/pkg/errors) -#BuildRequires: golang(github.com/rcrowley/go-metrics) -#BuildRequires: golang(github.com/sasha-s/go-deadlock) -#BuildRequires: golang(github.com/syncthing/notify) -#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) -#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/errors) -#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/iterator) -#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/opt) -#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/storage) -#BuildRequires: golang(github.com/syndtr/goleveldb/leveldb/util) -#BuildRequires: golang(github.com/thejerf/suture) -#BuildRequires: golang(github.com/vitrun/qart/qr) -#BuildRequires: golang(golang.org/x/crypto/bcrypt) -#BuildRequires: golang(golang.org/x/net/ipv4) -#BuildRequires: golang(golang.org/x/net/ipv6) -#BuildRequires: golang(golang.org/x/net/proxy) -#BuildRequires: golang(golang.org/x/text/unicode/norm) -#BuildRequires: golang(golang.org/x/time/rate) -#BuildRequires: golang(gopkg.in/ldap.v2) - %{?systemd_requires} +# assets in gui/default/vendor/* Provides: bundled(angular) = 1.3.20 Provides: bundled(angular-dirPagination) = 759009c Provides: bundled(angular-sanitize) = 1.3.20 @@ -76,99 +38,51 @@ Provides: bundled(jquery-fancytree) = 2.28.1 Provides: bundled(jquery-ui) = 1.12.1 Provides: bundled(moment) = 2.19.4 -Provides: bundled(golang(code.cloudfoundry.org/bytefmt)) = a052d587819f45f719a22e344a8ad7858deb3733 -Provides: bundled(golang(github.com/AudriusButkevicius/cli)) = 7f561c78b5a4aad858d9fd550c92b5da6d55efbb -Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362b2ab5a7839b8d1704f0396b640ca -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 9dca34a5b530bfc9843fa8aa2ff08ff9821032cb -Provides: bundled(golang(github.com/BurntSushi/toml)) = a368813c5e648fee92e5f6c30e3944ff9d5e8895 -Provides: bundled(golang(github.com/a8m/mark)) = 44f2db6188458162890ca13980819247418d8e45 -Provides: bundled(golang(github.com/beorn7/perks/quantile)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 -Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a -Provides: bundled(golang(github.com/calmh/du)) = dd9dc2043353249b2910b29dcfd6f6d4e64f39be -Provides: bundled(golang(github.com/calmh/xdr)) = 08e072f9cb164f943a92eb59f90f3abc64ac6e8f -Provides: bundled(golang(github.com/cheggaaa/pb)) = 18d384da9bdc1e5a08fc2a62a494c321d9ae74ea -Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142b536ea61bb5d84014171189eeaaa81 -Provides: bundled(golang(github.com/d4l3k/messagediff)) = 29f32d820d112dbd66e58492a6ffb7cc3106312b -Provides: bundled(golang(github.com/dustin/go-humanize)) = bb3d318650d48840a39aa21a027c6630e198e626 -Provides: bundled(golang(github.com/gernest/wow)) = 7e0b2a2398989a5d220eebac5742d45422ba7de8 -Provides: bundled(golang(github.com/go-ini/ini)) = 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a -Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d931c66d229ceeb7c31b985563420 -Provides: bundled(golang(github.com/gogo/protobuf)) = 160de10b2537169b5ae3e7e221d28269ef40d311 -Provides: bundled(golang(github.com/golang/groupcache/lru)) = 84a468cf14b4376def5d68c722b139b881c450a4 -Provides: bundled(golang(github.com/golang/protobuf/proto)) = 1e59b77b52bf8e4b449a57e6f79f21226d571845 -Provides: bundled(golang(github.com/golang/protobuf/ptypes/any)) = 1e59b77b52bf8e4b449a57e6f79f21226d571845 -Provides: bundled(golang(github.com/golang/snappy)) = 553a641470496b2327abcac10b36396bd98e45c9 -Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e01d3fab7bcf21c043c3d6a32b006 -Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657ff3dc51de0b4f55dd299a3e136f2 -Provides: bundled(golang(github.com/klauspost/cpuid)) = eae9b3e628d72774e13bdf024e78c0802f85a5b9 -Provides: bundled(golang(github.com/lib/pq)) = 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79 -Provides: bundled(golang(github.com/magefile/mage/mg)) = 63768081a3236a7c6c53ef72e402ae1fe1664b61 -Provides: bundled(golang(github.com/magefile/mage/sh)) = 63768081a3236a7c6c53ef72e402ae1fe1664b61 -Provides: bundled(golang(github.com/magefile/mage/types)) = 63768081a3236a7c6c53ef72e402ae1fe1664b61 -Provides: bundled(golang(github.com/mattn/go-runewidth)) = 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions/pbutil)) = c12348ce28de40eed0136aa2b644d0ee0650e56c -Provides: bundled(golang(github.com/minio/cli)) = 45db1f8a055198ad8c12754026cb2c51c584c756 -Provides: bundled(golang(github.com/minio/sha256-simd)) = ad98a36ba0da87206e3378c556abbfeaeaa98668 -Provides: bundled(golang(github.com/mitchellh/go-homedir)) = b8bc1bf767474819792c23f32d8286a45736f1c6 -Provides: bundled(golang(github.com/onsi/ginkgo)) = 6c46eb8334b30dc55b42f1a1c725d5ce97375390 -Provides: bundled(golang(github.com/onsi/gomega)) = ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64 -Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 5b1dc16861f81d05d9836bb21c2d0d65282fc0b8 -Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 26fe5ace1c706491c2936119e1dc69c1a9c04d7f -Provides: bundled(golang(github.com/petermattis/goid)) = 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02 -Provides: bundled(golang(github.com/pkg/errors)) = e881fd58d78e04cf6d0de1217f8707c8cc2249bc -Provides: bundled(golang(github.com/prometheus/client_golang/prometheus)) = 1cafe34db7fdec6022e17e00e1c1ea501022f3e4 -Provides: bundled(golang(github.com/prometheus/client_model/go)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c -Provides: bundled(golang(github.com/prometheus/common/expfmt)) = 2e54d0b93cba2fd133edc32211dcc32c06ef72ca -Provides: bundled(golang(github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg)) = 2e54d0b93cba2fd133edc32211dcc32c06ef72ca -Provides: bundled(golang(github.com/prometheus/common/model)) = 2e54d0b93cba2fd133edc32211dcc32c06ef72ca -Provides: bundled(golang(github.com/prometheus/procfs)) = b15cd069a83443be3154b719d0cc9fe8117f09fb -Provides: bundled(golang(github.com/rcrowley/go-metrics)) = e181e095bae94582363434144c61a9653aff6e50 -Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 03d40e5dbd5488667a13b3c2600b2f7c2886f02f -Provides: bundled(golang(github.com/sirupsen/logrus)) = d682213848ed68c0a260ca37d6dd5ace8423f5ba -Provides: bundled(golang(github.com/stathat/go)) = 74669b9f388d9d788c97399a0824adbfee78400e -Provides: bundled(golang(github.com/syncthing/notify)) = 116c45bb5ad48777321e4984d1320d56889b6097 -Provides: bundled(golang(github.com/syndtr/goleveldb/leveldb)) = 34011bf325bce385408353a30b101fe5e923eb6e -Provides: bundled(golang(github.com/templexxx/cpufeat)) = 3794dfbfb04749f896b521032f69383f24c3687e -Provides: bundled(golang(github.com/thejerf/suture)) = bf6ee6a0b047ebbe9ae07d847f750dd18c6a9276 -Provides: bundled(golang(github.com/tjfoc/gmsm/sm4)) = 98aa888b79d8de04afe0fccf45ed10594efc858b -Provides: bundled(golang(github.com/vitrun/qart/coding)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa -Provides: bundled(golang(github.com/vitrun/qart/gf256)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa -Provides: bundled(golang(github.com/vitrun/qart/qr)) = bf64b92db6b05651d6c25a3dabf2d543b360c0aa -Provides: bundled(golang(golang.org/x/crypto/bcrypt)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/crypto/blowfish)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/crypto/cast5)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/crypto/pbkdf2)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/crypto/salsa20)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/crypto/ssh/terminal)) = 0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8 -Provides: bundled(golang(golang.org/x/crypto/tea)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/crypto/twofish)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/crypto/xtea)) = 95a4943f35d008beabde8c11e5075a1b714e6419 -Provides: bundled(golang(golang.org/x/net/bpf)) = d866cfc389cec985d6fda2859936a575a55a3ab6 -Provides: bundled(golang(golang.org/x/net/html)) = d866cfc389cec985d6fda2859936a575a55a3ab6 -Provides: bundled(golang(golang.org/x/net/internal/iana)) = d866cfc389cec985d6fda2859936a575a55a3ab6 -Provides: bundled(golang(golang.org/x/net/internal/socket)) = d866cfc389cec985d6fda2859936a575a55a3ab6 -Provides: bundled(golang(golang.org/x/net/ipv4)) = d866cfc389cec985d6fda2859936a575a55a3ab6 -Provides: bundled(golang(golang.org/x/net/ipv6)) = d866cfc389cec985d6fda2859936a575a55a3ab6 -Provides: bundled(golang(golang.org/x/net/proxy)) = d866cfc389cec985d6fda2859936a575a55a3ab6 -Provides: bundled(golang(golang.org/x/sys/unix)) = 83801418e1b59fb1880e363299581ee543af32ca -Provides: bundled(golang(golang.org/x/sys/windows)) = 83801418e1b59fb1880e363299581ee543af32ca -Provides: bundled(golang(golang.org/x/text/encoding)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/internal/format)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/internal/gen)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/internal/tag)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/internal/triegen)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/internal/ucd)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/internal/utf8internal)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/language)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/runes)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/transform)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/unicode/cldr)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/text/unicode/norm)) = e19ae1496984b1c655b8044a65c0300a3c878dd3 -Provides: bundled(golang(golang.org/x/time/rate)) = 6dc17368e09b0e8634d71cac8168d853e869a0c7 -Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225df7a432012b8df0355c2a2063ac0 -Provides: bundled(golang(gopkg.in/ldap.v2)) = bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9 -Provides: bundled(golang(gopkg.in/urfave/cli.v1)) = cfb38830724cc34fedffe9a2a29fb54fa9169cd1 -Provides: bundled(golang(gopkg.in/yaml.v2)) = 287cf08546ab5e7e37d55a84f7ed3fd1db036de5 +# vendored dependencies: automatically generated from go.mod +Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362 +Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 +Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27e +Provides: bundled(golang(github.com/calmh/du)) = 1.0.1 +Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 +Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142b5 +Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 +Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 +Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 +Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d +Provides: bundled(golang(github.com/gogo/protobuf)) = 1.2.0 +Provides: bundled(golang(github.com/golang/groupcache)) = 84a468cf14b4 +Provides: bundled(golang(github.com/golang/snappy)) = 553a64147049 +Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e +Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657 +Provides: bundled(golang(github.com/kr/pretty)) = 0.1.0 +Provides: bundled(golang(github.com/lib/pq)) = 1.0.0 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.4 +Provides: bundled(golang(github.com/minio/sha256-simd)) = cc1980cb0338 +Provides: bundled(golang(github.com/onsi/ginkgo)) = 6c46eb8334b3 +Provides: bundled(golang(github.com/onsi/gomega)) = ba3724c94e4d +Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.1.0 +Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 26fe5ace1c70 +Provides: bundled(golang(github.com/petermattis/goid)) = 3db12ebb2a59 +Provides: bundled(golang(github.com/pkg/errors)) = 0.8.1 +Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 0.9.2 +Provides: bundled(golang(github.com/rcrowley/go-metrics)) = e181e095bae9 +Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.2.0 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.2.2 +Provides: bundled(golang(github.com/syncthing/notify)) = 4e389ea6c0d8 +Provides: bundled(golang(github.com/syndtr/goleveldb)) = 34011bf325bc +Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible +Provides: bundled(golang(github.com/urfave/cli)) = 1.20.0 +Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 +Provides: bundled(golang(golang.org/x/crypto)) = 0fcca4842a8d +Provides: bundled(golang(golang.org/x/net)) = 351d144fa1fc +Provides: bundled(golang(golang.org/x/sys)) = 4d1cda033e06 +Provides: bundled(golang(golang.org/x/text)) = e19ae1496984 +Provides: bundled(golang(golang.org/x/time)) = 6dc17368e09b +Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225 +Provides: bundled(golang(gopkg.in/check.v1)) = 788fd7840127 +Provides: bundled(golang(gopkg.in/ldap.v2)) = 2.5.1 +Provides: bundled(golang(gopkg.in/yaml.v2)) = 287cf08546ab # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -424,6 +338,9 @@ export GO111MODULE=off %changelog +* Tue Mar 05 2019 Fabio Valentini - 1.1.0-1 +- Update to version 1.1.0. + * Tue Feb 05 2019 Fabio Valentini - 1.0.1-1 - Update to version 1.0.1. From 397a254c85e40fed9b696583f3eb915c1402e2ca Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 7 Mar 2019 20:15:32 +0100 Subject: [PATCH 030/133] fix build tags for changed variable names --- syncthing.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/syncthing.spec b/syncthing.spec index 77e4593..8c4bf6e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,7 +1,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -174,7 +174,7 @@ popd # set variables expected by syncthing binaries as additional LDFLAGS export BUILD_HOST=fedora-koji -export LDFLAGS="-X main.Version=v%{version} -X main.BuildStamp=$(date +%s) -X main.BuildUser=$USER -X main.BuildHost=$BUILD_HOST" +export LDFLAGS="-X %{goipath}/lib/build.Version=v%{version} -X %{goipath}/lib/build.Stamp=$(date +%s) -X %{goipath}/lib/build.User=$USER -X %{goipath}/lib/build.Host=$BUILD_HOST" export BUILDTAGS="noupgrade" %gobuild -o _bin/syncthing %{goipath}/cmd/syncthing @@ -338,6 +338,9 @@ export GO111MODULE=off %changelog +* Thu Mar 07 2019 Fabio Valentini - 1.1.0-2 +- Fix build tags for changed variable names. + * Tue Mar 05 2019 Fabio Valentini - 1.1.0-1 - Update to version 1.1.0. From edff14f3e7040ab6b503f73c42ce2177bee79896 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 5 Apr 2019 21:58:31 +0200 Subject: [PATCH 031/133] update to version 1.1.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 17 +++++------------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 99b1820..bfb6c88 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /syncthing-source-v1.0.0.tar.gz /syncthing-source-v1.0.1.tar.gz /syncthing-source-v1.1.0.tar.gz +/syncthing-source-v1.1.1.tar.gz diff --git a/sources b/sources index 092b47a..212d162 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.1.0.tar.gz) = 7a287d943be134f895f28d2c3e661a860f0e8929a79dcd1b6956e11d2aac41edd9fba0f3ab5e358e67e940fd7456fb08e3b3cf529c333d71c144cfa7eb2abb63 +SHA512 (syncthing-source-v1.1.1.tar.gz) = 50cecfc5a332bd666a373f3f33cf25f97128fd557e3ac8fced0dff1308df05644cbc2ae578de5b4d078b792daac01c2dee674cd14377ff47125849157c80c1f9 diff --git a/syncthing.spec b/syncthing.spec index 8c4bf6e..9412e2e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,7 +1,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -219,11 +219,6 @@ cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ mkdir -p %{buildroot}/%{_userpresetdir} echo "disable syncthing*" > %{buildroot}/%{_userpresetdir}/90-syncthing.preset -# install .desktop files -mkdir -p %{buildroot}/%{_datadir}/applications - -cp -pav etc/linux-desktop/*.desktop %{buildroot}/%{_datadir}/applications/ - # Unmark source files as executable for i in $(find -name "*.go" -executable -print); do @@ -234,9 +229,6 @@ done %check -desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/syncthing*.desktop - export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} export GO111MODULE=off @@ -310,8 +302,6 @@ export GO111MODULE=off %{_userunitdir}/syncthing.service %{_userpresetdir}/90-syncthing.preset -%{_datadir}/applications/syncthing*.desktop - %files tools %license LICENSE @@ -338,6 +328,9 @@ export GO111MODULE=off %changelog +* Fri Apr 05 2019 Fabio Valentini - 1.1.1-1 +- Update to version 1.1.1. + * Thu Mar 07 2019 Fabio Valentini - 1.1.0-2 - Fix build tags for changed variable names. From 73e426f8793b15748157abe668f96b9ab3d15882 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 21 May 2019 13:50:33 +0200 Subject: [PATCH 032/133] update to version 1.1.3 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index bfb6c88..43f2fbb 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /syncthing-source-v1.0.1.tar.gz /syncthing-source-v1.1.0.tar.gz /syncthing-source-v1.1.1.tar.gz +/syncthing-source-v1.1.3.tar.gz diff --git a/sources b/sources index 212d162..1ddb665 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.1.1.tar.gz) = 50cecfc5a332bd666a373f3f33cf25f97128fd557e3ac8fced0dff1308df05644cbc2ae578de5b4d078b792daac01c2dee674cd14377ff47125849157c80c1f9 +SHA512 (syncthing-source-v1.1.3.tar.gz) = f439635a26547fb92ef8de341e41a3a9c7e603c3c25df91b765a5d9ac614f647c19a8be2c789de1bd8334efeee29510805d1b3adc1113da04df2b76d0842fce5 diff --git a/syncthing.spec b/syncthing.spec index 9412e2e..90bad08 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.1.1 +Version: 1.1.3 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -9,12 +9,10 @@ Release: 1%{?dist} %gometa # syncthing (MPLv2.0) bundles -# - angular (MIT), -# - bootstrap (MIT), +# - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT), # - ForkAwesome (MIT/OFL/CC-BY 3.0), and -# - moment (MIT) -# - a number of go packages (see below) -License: MPLv2.0 and MIT and OFL and CC-BY +# - 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 URL: https://syncthing.net Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz @@ -74,9 +72,8 @@ Provides: bundled(golang(github.com/syndtr/goleveldb)) = 34011bf325bc Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible Provides: bundled(golang(github.com/urfave/cli)) = 1.20.0 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 -Provides: bundled(golang(golang.org/x/crypto)) = 0fcca4842a8d +Provides: bundled(golang(golang.org/x/crypto)) = c2843e01d9a2 Provides: bundled(golang(golang.org/x/net)) = 351d144fa1fc -Provides: bundled(golang(golang.org/x/sys)) = 4d1cda033e06 Provides: bundled(golang(golang.org/x/text)) = e19ae1496984 Provides: bundled(golang(golang.org/x/time)) = 6dc17368e09b Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225 @@ -328,6 +325,9 @@ export GO111MODULE=off %changelog +* Tue May 21 2019 Fabio Valentini - 1.1.3-1 +- Update to version 1.1.3. + * Fri Apr 05 2019 Fabio Valentini - 1.1.1-1 - Update to version 1.1.1. From 7b26978155342eb332330b1beff00e0c138c5bff Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 4 Jun 2019 11:58:20 +0200 Subject: [PATCH 033/133] update to version 1.1.4 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 43f2fbb..39652e6 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /syncthing-source-v1.1.0.tar.gz /syncthing-source-v1.1.1.tar.gz /syncthing-source-v1.1.3.tar.gz +/syncthing-source-v1.1.4.tar.gz diff --git a/sources b/sources index 1ddb665..dde6a42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.1.3.tar.gz) = f439635a26547fb92ef8de341e41a3a9c7e603c3c25df91b765a5d9ac614f647c19a8be2c789de1bd8334efeee29510805d1b3adc1113da04df2b76d0842fce5 +SHA512 (syncthing-source-v1.1.4.tar.gz) = 846c592622a06363a73e3b1d62480f3b303448367758ec1857369689615441ffc4afb00114e7b1398105fd09e82612a892b4cd7b369c3b79d573252ed1be8cc9 diff --git a/syncthing.spec b/syncthing.spec index 90bad08..11c9661 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.1.3 +Version: 1.1.4 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -47,18 +47,18 @@ Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d -Provides: bundled(golang(github.com/gogo/protobuf)) = 1.2.0 +Provides: bundled(golang(github.com/gogo/protobuf)) = 1.2.1 Provides: bundled(golang(github.com/golang/groupcache)) = 84a468cf14b4 Provides: bundled(golang(github.com/golang/snappy)) = 553a64147049 Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657 Provides: bundled(golang(github.com/kr/pretty)) = 0.1.0 -Provides: bundled(golang(github.com/lib/pq)) = 1.0.0 -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.4 +Provides: bundled(golang(github.com/lib/pq)) = 1.1.1 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.7 Provides: bundled(golang(github.com/minio/sha256-simd)) = cc1980cb0338 Provides: bundled(golang(github.com/onsi/ginkgo)) = 6c46eb8334b3 Provides: bundled(golang(github.com/onsi/gomega)) = ba3724c94e4d -Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.1.0 +Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.3.0 Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 26fe5ace1c70 Provides: bundled(golang(github.com/petermattis/goid)) = 3db12ebb2a59 Provides: bundled(golang(github.com/pkg/errors)) = 0.8.1 @@ -325,6 +325,9 @@ export GO111MODULE=off %changelog +* Tue Jun 04 2019 Fabio Valentini - 1.1.4-1 +- Update to version 1.1.4. + * Tue May 21 2019 Fabio Valentini - 1.1.3-1 - Update to version 1.1.3. From c715ffd8d44d696b4e6d5c39ddfda4159a2cebbb Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 16 Jun 2019 16:41:24 +0200 Subject: [PATCH 034/133] disable building -devel subpackage by default --- syncthing.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 11c9661..9a4a288 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,7 +1,9 @@ +%bcond_with devel + Name: syncthing Summary: Continuous File Synchronization Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -96,6 +98,7 @@ 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 @@ -109,6 +112,7 @@ 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 @@ -222,7 +226,9 @@ for i in $(find -name "*.go" -executable -print); do chmod a-x $i; done +%if %{with devel} %goinstall +%endif %check @@ -319,12 +325,17 @@ export GO111MODULE=off %{_bindir}/stcli +%if %{with devel} %files devel -f devel.file-list %license LICENSE %doc README.md AUTHORS +%endif %changelog +* Sun Jun 16 2019 Fabio Valentini - 1.1.4-2 +- Disable building -devel package by default. + * Tue Jun 04 2019 Fabio Valentini - 1.1.4-1 - Update to version 1.1.4. From 3c662927fe4c80da9624c951cc7ecacedd261d17 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 9 Jul 2019 22:26:54 +0200 Subject: [PATCH 035/133] update to version 1.2.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 36 ++++++++++++++++++++++-------------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 39652e6..355d9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /syncthing-source-v1.1.1.tar.gz /syncthing-source-v1.1.3.tar.gz /syncthing-source-v1.1.4.tar.gz +/syncthing-source-v1.2.0.tar.gz diff --git a/sources b/sources index dde6a42..10e0c09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.1.4.tar.gz) = 846c592622a06363a73e3b1d62480f3b303448367758ec1857369689615441ffc4afb00114e7b1398105fd09e82612a892b4cd7b369c3b79d573252ed1be8cc9 +SHA512 (syncthing-source-v1.2.0.tar.gz) = bbaaf99f6295686a36b11cf35f36bb0d08b10d4ecdc0282274cd0a16715d1acd2cd3f90b79d17d932b779d7a8aac7d562385497f4ed7cadad90d31dad3ccb2e0 diff --git a/syncthing.spec b/syncthing.spec index 9a4a288..2ab9509 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,8 +2,8 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.1.4 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -40,48 +40,51 @@ 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 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27e Provides: bundled(golang(github.com/calmh/du)) = 1.0.1 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)) = d2eda7129713 Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142b5 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 -Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 +Provides: bundled(golang(github.com/getsentry/raven-go)) = 0.2.0 Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d Provides: bundled(golang(github.com/gogo/protobuf)) = 1.2.1 Provides: bundled(golang(github.com/golang/groupcache)) = 84a468cf14b4 -Provides: bundled(golang(github.com/golang/snappy)) = 553a64147049 Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657 Provides: bundled(golang(github.com/kr/pretty)) = 0.1.0 Provides: bundled(golang(github.com/lib/pq)) = 1.1.1 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.11.2 +Provides: bundled(golang(github.com/maruel/panicparse)) = 1.2.1 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.7 Provides: bundled(golang(github.com/minio/sha256-simd)) = cc1980cb0338 -Provides: bundled(golang(github.com/onsi/ginkgo)) = 6c46eb8334b3 -Provides: bundled(golang(github.com/onsi/gomega)) = ba3724c94e4d +Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.8.0 +Provides: bundled(golang(github.com/onsi/gomega)) = 1.5.0 Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.3.0 Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 26fe5ace1c70 Provides: bundled(golang(github.com/petermattis/goid)) = 3db12ebb2a59 Provides: bundled(golang(github.com/pkg/errors)) = 0.8.1 -Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 0.9.2 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 0.9.4 Provides: bundled(golang(github.com/rcrowley/go-metrics)) = e181e095bae9 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.2.0 -Provides: bundled(golang(github.com/stretchr/testify)) = 1.2.2 Provides: bundled(golang(github.com/syncthing/notify)) = 4e389ea6c0d8 -Provides: bundled(golang(github.com/syndtr/goleveldb)) = 34011bf325bc +Provides: bundled(golang(github.com/syndtr/goleveldb)) = c3a204f8e965 Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible Provides: bundled(golang(github.com/urfave/cli)) = 1.20.0 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 -Provides: bundled(golang(golang.org/x/crypto)) = c2843e01d9a2 -Provides: bundled(golang(golang.org/x/net)) = 351d144fa1fc -Provides: bundled(golang(golang.org/x/text)) = e19ae1496984 +Provides: bundled(golang(golang.org/x/crypto)) = 5c40567a22f8 +Provides: bundled(golang(golang.org/x/net)) = d28f0bde5980 +Provides: bundled(golang(golang.org/x/sys)) = 5ed2794edfdc +Provides: bundled(golang(golang.org/x/text)) = 0.3.2 Provides: bundled(golang(golang.org/x/time)) = 6dc17368e09b Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225 Provides: bundled(golang(gopkg.in/check.v1)) = 788fd7840127 Provides: bundled(golang(gopkg.in/ldap.v2)) = 2.5.1 -Provides: bundled(golang(gopkg.in/yaml.v2)) = 287cf08546ab +Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.2.2 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -239,6 +242,8 @@ export GO111MODULE=off %gotest %{goipath}/cmd/stdiscosrv %gotest %{goipath}/cmd/strelaypoolsrv %gotest %{goipath}/cmd/syncthing + +%gotest %{goipath}/lib/api %gotest %{goipath}/lib/auto %gotest %{goipath}/lib/beacon %gotest %{goipath}/lib/config @@ -333,6 +338,9 @@ export GO111MODULE=off %changelog +* Tue Jul 09 2019 Fabio Valentini - 1.2.0-1 +- Update to version 1.2.0. + * Sun Jun 16 2019 Fabio Valentini - 1.1.4-2 - Disable building -devel package by default. From 5de6500f36eca0ff9fb2373914a957c1aae7898f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 00:49:37 +0000 Subject: [PATCH 036/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 2ab9509..5a05df7 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -3,7 +3,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -338,6 +338,9 @@ export GO111MODULE=off %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jul 09 2019 Fabio Valentini - 1.2.0-1 - Update to version 1.2.0. From d2673f7df4cdad3b6568e92c58a72f326fe6a465 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 15 Aug 2019 21:41:26 +0200 Subject: [PATCH 037/133] update to version 1.2.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 355d9d3..bc3ef58 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /syncthing-source-v1.1.3.tar.gz /syncthing-source-v1.1.4.tar.gz /syncthing-source-v1.2.0.tar.gz +/syncthing-source-v1.2.1.tar.gz diff --git a/sources b/sources index 10e0c09..d6e0b4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.2.0.tar.gz) = bbaaf99f6295686a36b11cf35f36bb0d08b10d4ecdc0282274cd0a16715d1acd2cd3f90b79d17d932b779d7a8aac7d562385497f4ed7cadad90d31dad3ccb2e0 +SHA512 (syncthing-source-v1.2.1.tar.gz) = cc6a61ea957edbb34252966bac172e70b1d1dec7e1dc6746dc2adef6b73c9d4168e526d9dad30600aa8a99765f860257a6691b1bb26fa26b116d1efdbb23e33f diff --git a/syncthing.spec b/syncthing.spec index 5a05df7..9726ff5 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,8 +2,8 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -57,9 +57,9 @@ Provides: bundled(golang(github.com/golang/groupcache)) = 84a468cf14b4 Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657 Provides: bundled(golang(github.com/kr/pretty)) = 0.1.0 -Provides: bundled(golang(github.com/lib/pq)) = 1.1.1 +Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.11.2 -Provides: bundled(golang(github.com/maruel/panicparse)) = 1.2.1 +Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.7 Provides: bundled(golang(github.com/minio/sha256-simd)) = cc1980cb0338 Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.8.0 @@ -71,14 +71,14 @@ Provides: bundled(golang(github.com/pkg/errors)) = 0.8.1 Provides: bundled(golang(github.com/prometheus/client_golang)) = 0.9.4 Provides: bundled(golang(github.com/rcrowley/go-metrics)) = e181e095bae9 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.2.0 -Provides: bundled(golang(github.com/syncthing/notify)) = 4e389ea6c0d8 +Provides: bundled(golang(github.com/syncthing/notify)) = 69c7a957d3e2 Provides: bundled(golang(github.com/syndtr/goleveldb)) = c3a204f8e965 Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible Provides: bundled(golang(github.com/urfave/cli)) = 1.20.0 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 Provides: bundled(golang(golang.org/x/crypto)) = 5c40567a22f8 Provides: bundled(golang(golang.org/x/net)) = d28f0bde5980 -Provides: bundled(golang(golang.org/x/sys)) = 5ed2794edfdc +Provides: bundled(golang(golang.org/x/sys)) = 04f50cda93cb Provides: bundled(golang(golang.org/x/text)) = 0.3.2 Provides: bundled(golang(golang.org/x/time)) = 6dc17368e09b Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225 @@ -338,6 +338,9 @@ export GO111MODULE=off %changelog +* Thu Aug 15 2019 Fabio Valentini - 1.2.1-1 +- Update to version 1.2.1. + * Sat Jul 27 2019 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ae536602c6313b361ffc6ca0d09ff43083d08b46 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 5 Sep 2019 23:17:27 +0200 Subject: [PATCH 038/133] update to version 1.2.2 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bc3ef58..ae81564 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /syncthing-source-v1.1.4.tar.gz /syncthing-source-v1.2.0.tar.gz /syncthing-source-v1.2.1.tar.gz +/syncthing-source-v1.2.2.tar.gz diff --git a/sources b/sources index d6e0b4b..fd9188b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.2.1.tar.gz) = cc6a61ea957edbb34252966bac172e70b1d1dec7e1dc6746dc2adef6b73c9d4168e526d9dad30600aa8a99765f860257a6691b1bb26fa26b116d1efdbb23e33f +SHA512 (syncthing-source-v1.2.2.tar.gz) = 98cfd5b2ede6d6ba9cd509f5beb0a84496d8311eb29517789d8e3d643d841446ebb8e9eb27089d94936164d66fe528ac90f3fe176cdfbd343200d25889f27a6e diff --git a/syncthing.spec b/syncthing.spec index 9726ff5..c4b7920 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -43,7 +43,6 @@ Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = c55ef6137fc6 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27e -Provides: bundled(golang(github.com/calmh/du)) = 1.0.1 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)) = d2eda7129713 @@ -71,10 +70,11 @@ Provides: bundled(golang(github.com/pkg/errors)) = 0.8.1 Provides: bundled(golang(github.com/prometheus/client_golang)) = 0.9.4 Provides: bundled(golang(github.com/rcrowley/go-metrics)) = e181e095bae9 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)) = c3a204f8e965 Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible -Provides: bundled(golang(github.com/urfave/cli)) = 1.20.0 +Provides: bundled(golang(github.com/urfave/cli)) = 1.21.0 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 Provides: bundled(golang(golang.org/x/crypto)) = 5c40567a22f8 Provides: bundled(golang(golang.org/x/net)) = d28f0bde5980 @@ -84,7 +84,6 @@ Provides: bundled(golang(golang.org/x/time)) = 6dc17368e09b Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225 Provides: bundled(golang(gopkg.in/check.v1)) = 788fd7840127 Provides: bundled(golang(gopkg.in/ldap.v2)) = 2.5.1 -Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.2.2 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -338,6 +337,9 @@ export GO111MODULE=off %changelog +* Thu Sep 05 2019 Fabio Valentini - 1.2.2-1 +- Update to version 1.2.2. + * Thu Aug 15 2019 Fabio Valentini - 1.2.1-1 - Update to version 1.2.1. From 028b362fb7aa9e1a5025892b522f7f1b3ea325b5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 10 Oct 2019 20:24:55 +0200 Subject: [PATCH 039/133] update to version 1.3.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 51 +++++++++++++++++++++++++++++--------------------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index ae81564..29de7ee 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /syncthing-source-v1.2.0.tar.gz /syncthing-source-v1.2.1.tar.gz /syncthing-source-v1.2.2.tar.gz +/syncthing-source-v1.3.0.tar.gz diff --git a/sources b/sources index fd9188b..aa383e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.2.2.tar.gz) = 98cfd5b2ede6d6ba9cd509f5beb0a84496d8311eb29517789d8e3d643d841446ebb8e9eb27089d94936164d66fe528ac90f3fe176cdfbd343200d25889f27a6e +SHA512 (syncthing-source-v1.3.0.tar.gz) = 34723b744918c896440b38f7b8ea4d32a5c418a5a967f3c2ada5ea7ad58e3fcd4143f2b38d340fdd22fd2d1f2c7dca6c8cc87c99ad673ec0ac706bba443202a4 diff --git a/syncthing.spec b/syncthing.spec index c4b7920..46ca622 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.2.2 +Version: 1.3.0 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -42,33 +42,38 @@ Provides: bundled(moment) = 2.19.4 Provides: bundled(golang(github.com/AudriusButkevicius/go-nat-pmp)) = 452c97607362 Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = c55ef6137fc6 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 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)) = d2eda7129713 +Provides: bundled(golang(github.com/certifi/gocertifi)) = a5e0173ced67 Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142b5 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 Provides: bundled(golang(github.com/getsentry/raven-go)) = 0.2.0 -Provides: bundled(golang(github.com/gobwas/glob)) = 51eb1ee00b6d -Provides: bundled(golang(github.com/gogo/protobuf)) = 1.2.1 -Provides: bundled(golang(github.com/golang/groupcache)) = 84a468cf14b4 -Provides: bundled(golang(github.com/jackpal/gateway)) = 5795ac81146e -Provides: bundled(golang(github.com/kballard/go-shellquote)) = cd60e84ee657 +Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.4 +Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 +Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.0 +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 Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.11.2 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.12.0 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.7 -Provides: bundled(golang(github.com/minio/sha256-simd)) = cc1980cb0338 -Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.8.0 -Provides: bundled(golang(github.com/onsi/gomega)) = 1.5.0 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.9 +Provides: bundled(golang(github.com/minio/sha256-simd)) = 0.1.0 +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)) = 26fe5ace1c70 -Provides: bundled(golang(github.com/petermattis/goid)) = 3db12ebb2a59 +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 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 0.9.4 -Provides: bundled(golang(github.com/rcrowley/go-metrics)) = e181e095bae9 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.1.0 +Provides: bundled(golang(github.com/prometheus/client_model)) = 14fe0d1b01d4 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.0.4 +Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30c2563 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 @@ -76,12 +81,12 @@ Provides: bundled(golang(github.com/syndtr/goleveldb)) = c3a204f8e965 Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible Provides: bundled(golang(github.com/urfave/cli)) = 1.21.0 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 -Provides: bundled(golang(golang.org/x/crypto)) = 5c40567a22f8 -Provides: bundled(golang(golang.org/x/net)) = d28f0bde5980 -Provides: bundled(golang(golang.org/x/sys)) = 04f50cda93cb +Provides: bundled(golang(golang.org/x/crypto)) = 9756ffdc2472 +Provides: bundled(golang(golang.org/x/net)) = ba9fcec4b297 +Provides: bundled(golang(golang.org/x/sys)) = 749cb33beabd Provides: bundled(golang(golang.org/x/text)) = 0.3.2 -Provides: bundled(golang(golang.org/x/time)) = 6dc17368e09b -Provides: bundled(golang(gopkg.in/asn1-ber.v1)) = 379148ca0225 +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 @@ -270,6 +275,7 @@ export GO111MODULE=off %gotest %{goipath}/lib/signature %gotest %{goipath}/lib/stats %gotest %{goipath}/lib/sync +%gotest %{goipath}/lib/syncthing %gotest %{goipath}/lib/tlsutil %gotest %{goipath}/lib/upgrade %gotest %{goipath}/lib/upnp @@ -337,6 +343,9 @@ export GO111MODULE=off %changelog +* Thu Oct 10 2019 Fabio Valentini - 1.3.0-1 +- Update to version 1.3.0. + * Thu Sep 05 2019 Fabio Valentini - 1.2.2-1 - Update to version 1.2.2. From 0ed2e3900363f069f13ce38fa2a02f29ec8b4cb4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 5 Nov 2019 16:30:49 +0100 Subject: [PATCH 040/133] update to version 1.3.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 28 +++++++++++++++++++++------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 29de7ee..87ea681 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /syncthing-source-v1.2.1.tar.gz /syncthing-source-v1.2.2.tar.gz /syncthing-source-v1.3.0.tar.gz +/syncthing-source-v1.3.1.tar.gz diff --git a/sources b/sources index aa383e4..e3a094e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.3.0.tar.gz) = 34723b744918c896440b38f7b8ea4d32a5c418a5a967f3c2ada5ea7ad58e3fcd4143f2b38d340fdd22fd2d1f2c7dca6c8cc87c99ad673ec0ac706bba443202a4 +SHA512 (syncthing-source-v1.3.1.tar.gz) = 87afc9c355cda59ae475113a84c7db66731a37703969fba899b4828eab4ee40f3e422281b91b285c9a9624e67746ad3416e8dc97d84d072277cff61bc0abaf3a diff --git a/syncthing.spec b/syncthing.spec index 46ca622..edd1087 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -63,7 +63,7 @@ Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.12.0 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.9 -Provides: bundled(golang(github.com/minio/sha256-simd)) = 0.1.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 @@ -77,9 +77,9 @@ Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30c2563 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)) = c3a204f8e965 +Provides: bundled(golang(github.com/syndtr/goleveldb)) = 758128399b1d Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible -Provides: bundled(golang(github.com/urfave/cli)) = 1.21.0 +Provides: bundled(golang(github.com/urfave/cli)) = 1.22.1 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 Provides: bundled(golang(golang.org/x/crypto)) = 9756ffdc2472 Provides: bundled(golang(golang.org/x/net)) = ba9fcec4b297 @@ -180,15 +180,24 @@ go run build.go assets rm build.go popd -# set variables expected by syncthing binaries as additional LDFLAGS +# set variables expected by syncthing binaries as additional FOOFLAGS export BUILD_HOST=fedora-koji -export LDFLAGS="-X %{goipath}/lib/build.Version=v%{version} -X %{goipath}/lib/build.Stamp=$(date +%s) -X %{goipath}/lib/build.User=$USER -X %{goipath}/lib/build.Host=$BUILD_HOST" +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" 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/strelaypoolsrv + +export LDFLAGS="-X %{goipath}/lib/build.Program=stcli $COMMON_LDFLAGS" %gobuild -o _bin/stcli %{goipath}/cmd/stcli @@ -290,7 +299,7 @@ export GO111MODULE=off %post -%systemd_post 'syncthing@*.service' +%systemd_post 'syncthing@.service' %systemd_user_post syncthing.service %preun @@ -343,6 +352,11 @@ export GO111MODULE=off %changelog +* Tue Nov 05 2019 Fabio Valentini - 1.3.1-1 +- Update to version 1.3.1. +- Update build scriptlet to match upstream build system changes. +- Fix broken systemd_post scriptlet. + * Thu Oct 10 2019 Fabio Valentini - 1.3.0-1 - Update to version 1.3.0. From b11dc18f8a93f903ab43b50234a681c54a02f378 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 3 Dec 2019 12:37:34 +0100 Subject: [PATCH 041/133] update to version 1.3.2 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 87ea681..4227517 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /syncthing-source-v1.2.2.tar.gz /syncthing-source-v1.3.0.tar.gz /syncthing-source-v1.3.1.tar.gz +/syncthing-source-v1.3.2.tar.gz diff --git a/sources b/sources index e3a094e..4b575a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.3.1.tar.gz) = 87afc9c355cda59ae475113a84c7db66731a37703969fba899b4828eab4ee40f3e422281b91b285c9a9624e67746ad3416e8dc97d84d072277cff61bc0abaf3a +SHA512 (syncthing-source-v1.3.2.tar.gz) = 58cc0e11345ba52bc64067b3036b6ebeca8db0f945749de87c6026d8ca3269fe25a8cbd83581ad14ab0050076417e562a6ee10d5195ccab6f785c336459db055 diff --git a/syncthing.spec b/syncthing.spec index edd1087..af52c01 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -53,16 +53,16 @@ Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f856 Provides: bundled(golang(github.com/getsentry/raven-go)) = 0.2.0 Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.4 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 -Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.0 +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 Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.12.0 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.12.1 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.9 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.10 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 @@ -70,9 +70,7 @@ 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 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.1.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 14fe0d1b01d4 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.0.4 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.2.1 Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30c2563 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.2.0 Provides: bundled(golang(github.com/shirou/gopsutil)) = 47ef3260b6bf @@ -83,7 +81,6 @@ Provides: bundled(golang(github.com/urfave/cli)) = 1.22.1 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/sys)) = 749cb33beabd 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 @@ -352,6 +349,9 @@ export GO111MODULE=off %changelog +* Tue Dec 03 2019 Fabio Valentini - 1.3.2-1 +- Update to version 1.3.2. + * Tue Nov 05 2019 Fabio Valentini - 1.3.1-1 - Update to version 1.3.1. - Update build scriptlet to match upstream build system changes. From 4f1ba3a0072c9a1081b64c2957ea8c4366ba0396 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 3 Dec 2019 15:31:22 +0100 Subject: [PATCH 042/133] add proposed patch to fix tests running out of memory on 32 bit arches --- 0d64427.patch | 104 +++++++++++++++++++++++++++++++++++++++++++++++++ syncthing.spec | 9 ++++- 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 0d64427.patch diff --git a/0d64427.patch b/0d64427.patch new file mode 100644 index 0000000..6bc6c77 --- /dev/null +++ b/0d64427.patch @@ -0,0 +1,104 @@ +From 0d6442721aecadf685a16cca0ef874df468b2009 Mon Sep 17 00:00:00 2001 +From: Simon Frei +Date: Tue, 3 Dec 2019 15:11:39 +0100 +Subject: [PATCH] lib/protocol: Decrease runtime/mem usage of bufferpool + stresstest (ref #6209) + +--- + lib/protocol/bufferpool_test.go | 58 +++++++++++++++++++++------------ + 1 file changed, 38 insertions(+), 20 deletions(-) + +diff --git a/lib/protocol/bufferpool_test.go b/lib/protocol/bufferpool_test.go +index ab889ba88f..f7c6f67ce3 100644 +--- a/lib/protocol/bufferpool_test.go ++++ b/lib/protocol/bufferpool_test.go +@@ -3,7 +3,6 @@ + package protocol + + import ( +- "sync" + "testing" + "time" + +@@ -70,18 +69,47 @@ func TestStressBufferPool(t *testing.T) { + } + + const routines = 10 +- const runtime = 2 * time.Second + + bp := newBufferPool() +- t0 := time.Now() + +- var wg sync.WaitGroup ++ timeout := time.After(2 * time.Second) ++ done := make(chan struct{}) ++ checkDone := func() bool { ++ if bp.puts == 0 || bp.skips == 0 || bp.misses == 0 { ++ return false ++ } ++ var hits int64 ++ for _, h := range bp.hits { ++ hits += h ++ } ++ return hits > 0 ++ } ++ ++ go func() { ++ for { ++ select { ++ case <-time.After(50 * time.Millisecond): ++ if checkDone() { ++ close(done) ++ return ++ } ++ case <-timeout: ++ return ++ } ++ } ++ }() ++ + fail := make(chan struct{}, routines) + for i := 0; i < routines; i++ { +- wg.Add(1) + go func() { +- defer wg.Done() +- for time.Since(t0) < runtime { ++ for { ++ select { ++ case <-done: ++ return ++ case <-timeout: ++ return ++ default: ++ } + blocks := make([][]byte, 10) + for i := range blocks { + // Request a block of random size with the range +@@ -101,24 +129,14 @@ func TestStressBufferPool(t *testing.T) { + }() + } + +- wg.Wait() + select { + case <-fail: + t.Fatal("a block was bad size") ++ case <-done: ++ case <-timeout: ++ t.Fatal("timed out before exercising all paths") + default: + } +- +- t.Log(bp.puts, bp.skips, bp.misses, bp.hits) +- if bp.puts == 0 || bp.skips == 0 || bp.misses == 0 { +- t.Error("didn't exercise some paths") +- } +- var hits int64 +- for _, h := range bp.hits { +- hits += h +- } +- if hits == 0 { +- t.Error("didn't exercise some paths") +- } + } + + func shouldPanic(t *testing.T, fn func()) { diff --git a/syncthing.spec b/syncthing.spec index af52c01..c78239d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -3,7 +3,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -19,6 +19,10 @@ License: MPLv2.0 and MIT and OFL and CC-BY and ASL 2.0 and BSD and Unlice URL: https://syncthing.net Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz +# proposed 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 + BuildRequires: desktop-file-utils BuildRequires: systemd @@ -349,6 +353,9 @@ export GO111MODULE=off %changelog +* Tue Dec 03 2019 Fabio Valentini - 1.3.2-2 +- Add proposed patch to fix tests running out of memory on 32 bit arches. + * Tue Dec 03 2019 Fabio Valentini - 1.3.2-1 - Update to version 1.3.2. From 451404613744690e45d81e4c1d4ea3786536e4de Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 8 Jan 2020 22:50:08 +0100 Subject: [PATCH 043/133] update to version 1.3.3 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4227517..a1cbba4 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /syncthing-source-v1.3.0.tar.gz /syncthing-source-v1.3.1.tar.gz /syncthing-source-v1.3.2.tar.gz +/syncthing-source-v1.3.3.tar.gz diff --git a/sources b/sources index 4b575a2..dd212aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.3.2.tar.gz) = 58cc0e11345ba52bc64067b3036b6ebeca8db0f945749de87c6026d8ca3269fe25a8cbd83581ad14ab0050076417e562a6ee10d5195ccab6f785c336459db055 +SHA512 (syncthing-source-v1.3.3.tar.gz) = 43504c7ee79db96c1251a52ac0f96178f35926af6fbd4e97a661e4ff222d43e5fd8cfd0a312dd0cea9a2562010ecccdad3e8555495c81a759d92838e6c97b409 diff --git a/syncthing.spec b/syncthing.spec index c78239d..ec49ae9 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,8 +2,8 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.3.3 +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -81,7 +81,7 @@ Provides: bundled(golang(github.com/shirou/gopsutil)) = 47ef3260b6bf Provides: bundled(golang(github.com/syncthing/notify)) = 69c7a957d3e2 Provides: bundled(golang(github.com/syndtr/goleveldb)) = 758128399b1d Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible -Provides: bundled(golang(github.com/urfave/cli)) = 1.22.1 +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 @@ -353,6 +353,9 @@ export GO111MODULE=off %changelog +* Wed Jan 08 2020 Fabio Valentini - 1.3.3-1 +- Update to version 1.3.3. + * Tue Dec 03 2019 Fabio Valentini - 1.3.2-2 - Add proposed patch to fix tests running out of memory on 32 bit arches. From 82572fc500c19ff3dbe6afd138c8148e035db474 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:55:03 +0000 Subject: [PATCH 044/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index ec49ae9..d6fb21a 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -3,7 +3,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -353,6 +353,9 @@ export GO111MODULE=off %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jan 08 2020 Fabio Valentini - 1.3.3-1 - Update to version 1.3.3. From 156c5bd626bf8ce3657e8c2e67b97ca85c937b15 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 4 Feb 2020 19:29:18 +0100 Subject: [PATCH 045/133] update to version 1.3.4 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a1cbba4..0aa37ad 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /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 diff --git a/sources b/sources index dd212aa..8d06d02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.3.3.tar.gz) = 43504c7ee79db96c1251a52ac0f96178f35926af6fbd4e97a661e4ff222d43e5fd8cfd0a312dd0cea9a2562010ecccdad3e8555495c81a759d92838e6c97b409 +SHA512 (syncthing-source-v1.3.4.tar.gz) = 0fe26151747efa9962ae46716c36a8ded05a5bb1425c2acda28877ab57e55fa05e097b8d955bf881dd497ccda9ed95d9f621d2f4e670de48896a90e2f8e9b2fa diff --git a/syncthing.spec b/syncthing.spec index d6fb21a..ad77f34 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,8 +2,8 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.3.3 -Release: 2%{?dist} +Version: 1.3.4 +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -43,7 +43,6 @@ 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 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 Provides: bundled(golang(github.com/StackExchange/wmi)) = cbe66965904d @@ -61,19 +60,19 @@ 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/jackpal/go-nat-pmp)) = 1.0.2 Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a82bc51 Provides: bundled(golang(github.com/kr/pretty)) = 0.1.0 Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.12.1 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.10 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.11 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/oschwald/geoip2-golang)) = 1.4.0 Provides: bundled(golang(github.com/petermattis/goid)) = b0b1615b78e5 -Provides: bundled(golang(github.com/pkg/errors)) = 0.8.1 +Provides: bundled(golang(github.com/pkg/errors)) = 0.9.0 Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.2.1 Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30c2563 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.2.0 @@ -353,6 +352,9 @@ export GO111MODULE=off %changelog +* Tue Feb 04 2020 Fabio Valentini - 1.3.4-1 +- Update to version 1.3.4. + * Fri Jan 31 2020 Fedora Release Engineering - 1.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4806c4fce6b37470bbc1eee3a319210e21dbcaf1 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 3 Mar 2020 09:17:06 +0100 Subject: [PATCH 046/133] drop custom systemd user session preset Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1708297 --- syncthing.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/syncthing.spec b/syncthing.spec index ad77f34..ca33ba0 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -3,7 +3,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.3.4 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -232,11 +232,6 @@ cp -pav etc/linux-systemd/system/syncthing@.service %{buildroot}/%{_unitdir}/ cp -pav etc/linux-systemd/system/syncthing-resume.service %{buildroot}/%{_unitdir}/ cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ -# install systemd preset disabling the service per default -mkdir -p %{buildroot}/%{_userpresetdir} -echo "disable syncthing*" > %{buildroot}/%{_userpresetdir}/90-syncthing.preset - - # Unmark source files as executable for i in $(find -name "*.go" -executable -print); do chmod a-x $i; @@ -322,7 +317,6 @@ export GO111MODULE=off %{_unitdir}/syncthing@.service %{_unitdir}/syncthing-resume.service %{_userunitdir}/syncthing.service -%{_userpresetdir}/90-syncthing.preset %files tools @@ -352,6 +346,10 @@ export GO111MODULE=off %changelog +* Tue Mar 03 2020 Fabio Valentini - 1.3.4-2 +- Drop custom systemd user session preset file. + See: https://bugzilla.redhat.com/show_bug.cgi?id=1708297 + * Tue Feb 04 2020 Fabio Valentini - 1.3.4-1 - Update to version 1.3.4. From 20927adcb35127c2d223b4092c4ce22deddff3ab Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 17 Mar 2020 13:46:58 +0100 Subject: [PATCH 047/133] update to version 1.4.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0aa37ad..45ab91a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /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 diff --git a/sources b/sources index 8d06d02..f5acd05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.3.4.tar.gz) = 0fe26151747efa9962ae46716c36a8ded05a5bb1425c2acda28877ab57e55fa05e097b8d955bf881dd497ccda9ed95d9f621d2f4e670de48896a90e2f8e9b2fa +SHA512 (syncthing-source-v1.4.0.tar.gz) = c11d06faa71ffb8890c36ac1e41770bfba2c961d452df659d87397f7b87e91bafbaa039e7792de2e01b08c73e85cf8ee56576d9b8840e39ae5179c52ef2a34aa diff --git a/syncthing.spec b/syncthing.spec index ca33ba0..62b44e9 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,8 +2,8 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.3.4 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -72,16 +72,19 @@ 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.4.0 Provides: bundled(golang(github.com/petermattis/goid)) = b0b1615b78e5 -Provides: bundled(golang(github.com/pkg/errors)) = 0.9.0 +Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.2.1 Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30c2563 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/spaolacci/murmur3)) = 1.1.0 Provides: bundled(golang(github.com/syncthing/notify)) = 69c7a957d3e2 Provides: bundled(golang(github.com/syndtr/goleveldb)) = 758128399b1d Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible Provides: bundled(golang(github.com/urfave/cli)) = 1.22.2 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 +Provides: bundled(golang(github.com/willf/bitset)) = 1.1.10 +Provides: bundled(golang(github.com/willf/bloom)) = 2.0.3+incompatible 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 @@ -346,6 +349,9 @@ export GO111MODULE=off %changelog +* Tue Mar 17 2020 Fabio Valentini - 1.4.0-1 +- Update to version 1.4.0. + * Tue Mar 03 2020 Fabio Valentini - 1.3.4-2 - Drop custom systemd user session preset file. See: https://bugzilla.redhat.com/show_bug.cgi?id=1708297 From 40c5e4daccb0ec6d36b2bbd64347d3aa5ed61fde Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 8 Apr 2020 18:58:11 +0200 Subject: [PATCH 048/133] update to version 1.4.2 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 45ab91a..dbc4746 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /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 diff --git a/sources b/sources index f5acd05..363f993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.4.0.tar.gz) = c11d06faa71ffb8890c36ac1e41770bfba2c961d452df659d87397f7b87e91bafbaa039e7792de2e01b08c73e85cf8ee56576d9b8840e39ae5179c52ef2a34aa +SHA512 (syncthing-source-v1.4.2.tar.gz) = 8c1d01b06c4b4d42111b22a828c71adcda264cc19b13fb1bb51fe2516f9717973a6b515cc99a4d0a7bacce0d325fad735215ed29afbfa21da0470b5abbd9d575 diff --git a/syncthing.spec b/syncthing.spec index 62b44e9..c1b19f8 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.4.0 +Version: 1.4.2 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -349,6 +349,9 @@ export GO111MODULE=off %changelog +* Wed Apr 08 2020 Fabio Valentini - 1.4.2-1 +- Update to version 1.4.2. + * Tue Mar 17 2020 Fabio Valentini - 1.4.0-1 - Update to version 1.4.0. From 239d9d9f7493e1f57cd3ae8408fc18b49e5bdb46 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 9 May 2020 14:46:10 +0200 Subject: [PATCH 049/133] update to version 1.5.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index dbc4746..827d223 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /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 diff --git a/sources b/sources index 363f993..553678b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.4.2.tar.gz) = 8c1d01b06c4b4d42111b22a828c71adcda264cc19b13fb1bb51fe2516f9717973a6b515cc99a4d0a7bacce0d325fad735215ed29afbfa21da0470b5abbd9d575 +SHA512 (syncthing-source-v1.5.0.tar.gz) = 77faf8be58c3eb1925632ca18ff2ba0e0077dbb9ad10bb44299ed5402267610bb7a81865818f44da454b8db8c4067fcf44ee9caf1cdf5410246d4ef2005b65b0 diff --git a/syncthing.spec b/syncthing.spec index c1b19f8..e51f2b3 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.4.2 +Version: 1.5.0 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -54,22 +54,20 @@ Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 Provides: bundled(golang(github.com/getsentry/raven-go)) = 0.2.0 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.1.7 Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.4 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 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/jackpal/gateway)) = 1.0.6 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a82bc51 -Provides: bundled(golang(github.com/kr/pretty)) = 0.1.0 +Provides: bundled(golang(github.com/kr/pretty)) = 0.2.0 Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.12.1 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.14.4 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.11 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.4.0 Provides: bundled(golang(github.com/petermattis/goid)) = b0b1615b78e5 Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 @@ -85,13 +83,12 @@ Provides: bundled(golang(github.com/urfave/cli)) = 1.22.2 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 Provides: bundled(golang(github.com/willf/bitset)) = 1.1.10 Provides: bundled(golang(github.com/willf/bloom)) = 2.0.3+incompatible -Provides: bundled(golang(golang.org/x/crypto)) = 9756ffdc2472 +Provides: bundled(golang(golang.org/x/crypto)) = 2aa609cf4a9d Provides: bundled(golang(golang.org/x/net)) = ba9fcec4b297 +Provides: bundled(golang(golang.org/x/sys)) = c709ea063b76 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 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -349,6 +346,9 @@ export GO111MODULE=off %changelog +* Sat May 09 2020 Fabio Valentini - 1.5.0-1 +- Update to version 1.5.0. + * Wed Apr 08 2020 Fabio Valentini - 1.4.2-1 - Update to version 1.4.2. From 2748636674a0b00127a033cda088c5ff4ba2a80c Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 2 Jun 2020 14:58:06 +0200 Subject: [PATCH 050/133] update to version 1.6.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 827d223..24d874c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /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 diff --git a/sources b/sources index 553678b..557f3dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.5.0.tar.gz) = 77faf8be58c3eb1925632ca18ff2ba0e0077dbb9ad10bb44299ed5402267610bb7a81865818f44da454b8db8c4067fcf44ee9caf1cdf5410246d4ef2005b65b0 +SHA512 (syncthing-source-v1.6.1.tar.gz) = 9f5c064bb081332d9ebd78e36f149929af652f0c0c78ffa4fc042ec2c07f1c5da5bf19a96b9d066780b4e085fde1250abace0d1f9eebf987f23d5d4298dfd009 diff --git a/syncthing.spec b/syncthing.spec index e51f2b3..552684e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.5.0 +Version: 1.6.1 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -54,17 +54,19 @@ Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7142 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 Provides: bundled(golang(github.com/getsentry/raven-go)) = 0.2.0 -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.1.7 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.1.10 Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.4 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.1 Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.0 +Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.2.1 Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.6 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a82bc51 Provides: bundled(golang(github.com/kr/pretty)) = 0.2.0 Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.14.4 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.15.7 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.11 Provides: bundled(golang(github.com/minio/sha256-simd)) = 0.1.1 @@ -75,17 +77,14 @@ Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.2.1 Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30c2563 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/spaolacci/murmur3)) = 1.1.0 Provides: bundled(golang(github.com/syncthing/notify)) = 69c7a957d3e2 Provides: bundled(golang(github.com/syndtr/goleveldb)) = 758128399b1d Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible Provides: bundled(golang(github.com/urfave/cli)) = 1.22.2 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 -Provides: bundled(golang(github.com/willf/bitset)) = 1.1.10 -Provides: bundled(golang(github.com/willf/bloom)) = 2.0.3+incompatible -Provides: bundled(golang(golang.org/x/crypto)) = 2aa609cf4a9d +Provides: bundled(golang(golang.org/x/crypto)) = 4bdfaf469ed5 Provides: bundled(golang(golang.org/x/net)) = ba9fcec4b297 -Provides: bundled(golang(golang.org/x/sys)) = c709ea063b76 +Provides: bundled(golang(golang.org/x/sys)) = d5e6a3e2c0ae Provides: bundled(golang(golang.org/x/text)) = 0.3.2 Provides: bundled(golang(golang.org/x/time)) = 9d24e82272b4 Provides: bundled(golang(gopkg.in/check.v1)) = 788fd7840127 @@ -252,7 +251,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 @@ -346,6 +344,9 @@ export GO111MODULE=off %changelog +* Tue Jun 02 2020 Fabio Valentini - 1.6.1-1 +- Update to version 1.6.1. + * Sat May 09 2020 Fabio Valentini - 1.5.0-1 - Update to version 1.5.0. From f8b9e9686872f508b9cd8b841046d1dc4f7858e0 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 7 Jul 2020 19:18:30 +0200 Subject: [PATCH 051/133] update to version 1.7.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 24d874c..8626abd 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /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 diff --git a/sources b/sources index 557f3dc..1768df7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.6.1.tar.gz) = 9f5c064bb081332d9ebd78e36f149929af652f0c0c78ffa4fc042ec2c07f1c5da5bf19a96b9d066780b4e085fde1250abace0d1f9eebf987f23d5d4298dfd009 +SHA512 (syncthing-source-v1.7.0.tar.gz) = 602f4749fbde09155f5a2f263a96895a128666e1d352e49b802fe7d9a4f82ef07f167420e017aa78ef20e385ec6a4fca0ef8c2873153626e0dcf9150fcc057f2 diff --git a/syncthing.spec b/syncthing.spec index 552684e..7651c57 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.6.1 +Version: 1.7.0 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -52,6 +52,7 @@ 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 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 +Provides: bundled(golang(github.com/dgraph-io/badger/v2)) = 2.0.3 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 Provides: bundled(golang(github.com/getsentry/raven-go)) = 0.2.0 Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.1.10 @@ -59,14 +60,13 @@ Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.4 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.1 Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6 -Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.2.1 Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.6 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a82bc51 Provides: bundled(golang(github.com/kr/pretty)) = 0.2.0 Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.15.7 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.16.0 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.11 Provides: bundled(golang(github.com/minio/sha256-simd)) = 0.1.1 @@ -87,7 +87,6 @@ Provides: bundled(golang(golang.org/x/net)) = ba9fcec4b297 Provides: bundled(golang(golang.org/x/sys)) = d5e6a3e2c0ae Provides: bundled(golang(golang.org/x/text)) = 0.3.2 Provides: bundled(golang(golang.org/x/time)) = 9d24e82272b4 -Provides: bundled(golang(gopkg.in/check.v1)) = 788fd7840127 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -344,6 +343,9 @@ export GO111MODULE=off %changelog +* Tue Jul 07 2020 Fabio Valentini - 1.7.0-1 +- Update to version 1.7.0. + * Tue Jun 02 2020 Fabio Valentini - 1.6.1-1 - Update to version 1.6.1. From 1e67e9288c92526fe004ee098fc376e0b348aaad Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 16 Jul 2020 11:13:39 +0200 Subject: [PATCH 052/133] update to version 1.7.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8626abd..2db268d 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /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 diff --git a/sources b/sources index 1768df7..128d6b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.7.0.tar.gz) = 602f4749fbde09155f5a2f263a96895a128666e1d352e49b802fe7d9a4f82ef07f167420e017aa78ef20e385ec6a4fca0ef8c2873153626e0dcf9150fcc057f2 +SHA512 (syncthing-source-v1.7.1.tar.gz) = 4500972c4dfc8f2e584dd03c43dc7537287a2ced1f8676909d225d133243296157cfd51d3e7749ca64391a0649db7dc980523af584fd9bcfff6c3a932225336c diff --git a/syncthing.spec b/syncthing.spec index 7651c57..27c63f0 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,7 +2,7 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.7.0 +Version: 1.7.1 Release: 1%{?dist} %global goipath github.com/syncthing/syncthing @@ -343,6 +343,9 @@ export GO111MODULE=off %changelog +* Thu Jul 16 2020 Fabio Valentini - 1.7.1-1 +- Update to version 1.7.1. + * Tue Jul 07 2020 Fabio Valentini - 1.7.0-1 - Update to version 1.7.0. From 33c9895e8d1f5d62212b37f938137a2a5f59ca45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:57:49 +0000 Subject: [PATCH 053/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 27c63f0..c31afa3 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -3,7 +3,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -343,6 +343,9 @@ export GO111MODULE=off %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 16 2020 Fabio Valentini - 1.7.1-1 - Update to version 1.7.1. From 96b24487e4393df4f4cece7725fb35d58e63c38b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:24:56 +0000 Subject: [PATCH 054/133] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index c31afa3..4db6fee 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -3,7 +3,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -343,6 +343,10 @@ export GO111MODULE=off %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.7.1-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5052d3adf540c18ccdfad5a247770a68b57d6ca5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 16 Aug 2020 21:26:20 +0200 Subject: [PATCH 055/133] update to version 1.8.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 37 +++++++++++++++++++++++++------------ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 2db268d..a88dd89 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /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 diff --git a/sources b/sources index 128d6b7..3745851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.7.1.tar.gz) = 4500972c4dfc8f2e584dd03c43dc7537287a2ced1f8676909d225d133243296157cfd51d3e7749ca64391a0649db7dc980523af584fd9bcfff6c3a932225336c +SHA512 (syncthing-source-v1.8.0.tar.gz) = 282e6a700568946ed23d04cda41fa6a86d7c390c12c8abf99897f3818db9b4452baf5ab47d082bcf0b6a0329eb3d073dbc3abfe4a6493835cd201399307f605d diff --git a/syncthing.spec b/syncthing.spec index 4db6fee..7cdb075 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -2,8 +2,8 @@ Name: syncthing Summary: Continuous File Synchronization -Version: 1.7.1 -Release: 3%{?dist} +Version: 1.8.0 +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -45,6 +45,7 @@ Provides: bundled(moment) = 2.19.4 # vendored dependencies: automatically generated from go.mod Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = c55ef6137fc6 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 +Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = 66371956d46c Provides: bundled(golang(github.com/StackExchange/wmi)) = cbe66965904d Provides: bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d8f27e Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 @@ -52,21 +53,22 @@ 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 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 +Provides: bundled(golang(github.com/dchest/siphash)) = 1.2.1 Provides: bundled(golang(github.com/dgraph-io/badger/v2)) = 2.0.3 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 Provides: bundled(golang(github.com/getsentry/raven-go)) = 0.2.0 -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.1.10 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.2.0 Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.4 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.1 Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6 -Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.2.1 +Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.3.0 Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.6 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a82bc51 Provides: bundled(golang(github.com/kr/pretty)) = 0.2.0 Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.16.0 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.17.3 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.11 Provides: bundled(golang(github.com/minio/sha256-simd)) = 0.1.1 @@ -85,7 +87,7 @@ Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92db6b0 Provides: bundled(golang(golang.org/x/crypto)) = 4bdfaf469ed5 Provides: bundled(golang(golang.org/x/net)) = ba9fcec4b297 Provides: bundled(golang(golang.org/x/sys)) = d5e6a3e2c0ae -Provides: bundled(golang(golang.org/x/text)) = 0.3.2 +Provides: bundled(golang(golang.org/x/text)) = 0.3.3 Provides: bundled(golang(golang.org/x/time)) = 9d24e82272b4 # an inotify filesystem watcher is integrated with syncthing now @@ -181,7 +183,10 @@ popd # set variables expected by syncthing binaries as additional FOOFLAGS export BUILD_HOST=fedora-koji 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" -export BUILDTAGS="noupgrade" +# temporarily disable quic support (broken with Go 1.15): +# https://github.com/syncthing/syncthing/issues/6889 +# https://github.com/lucas-clemente/quic-go/issues/2614 +export BUILDTAGS="noupgrade noquic" export LDFLAGS="-X %{goipath}/lib/build.Program=syncthing $COMMON_LDFLAGS" %gobuild -o _bin/syncthing %{goipath}/cmd/syncthing @@ -247,12 +252,15 @@ export GO111MODULE=off %gotest %{goipath}/cmd/stdiscosrv %gotest %{goipath}/cmd/strelaypoolsrv -%gotest %{goipath}/cmd/syncthing +# temporarily disable due to quic-go incompatibility with Go 1.15 +#%%gotest %%{goipath}/cmd/syncthing -%gotest %{goipath}/lib/api +# temporarily disable due to quic-go incompatibility with Go 1.15 +#%%gotest %%{goipath}/lib/api %gotest %{goipath}/lib/beacon %gotest %{goipath}/lib/config -%gotest %{goipath}/lib/connections +# temporarily disable due to quic-go incompatibility with Go 1.15 +#%%gotest %%{goipath}/lib/connections %gotest %{goipath}/lib/db %gotest %{goipath}/lib/dialer %gotest %{goipath}/lib/discover @@ -263,7 +271,8 @@ export GO111MODULE=off # This test sometimes fails dependent on load on some architectures: # https://github.com/syncthing/syncthing/issues/4370 -%gotest %{goipath}/lib/model || : +# temporarily disable due to quic-go incompatibility with Go 1.15 +#%%gotest %%{goipath}/lib/model || : %gotest %{goipath}/lib/nat %gotest %{goipath}/lib/osutil @@ -276,7 +285,8 @@ export GO111MODULE=off %gotest %{goipath}/lib/signature %gotest %{goipath}/lib/stats %gotest %{goipath}/lib/sync -%gotest %{goipath}/lib/syncthing +# temporarily disable due to quic-go incompatibility with Go 1.15 +#%%gotest %%{goipath}/lib/syncthing %gotest %{goipath}/lib/tlsutil %gotest %{goipath}/lib/upgrade %gotest %{goipath}/lib/upnp @@ -343,6 +353,9 @@ export GO111MODULE=off %changelog +* Sun Aug 16 2020 Fabio Valentini - 1.8.0-1 +- Update to version 1.8.0. + * Sat Aug 01 2020 Fedora Release Engineering - 1.7.1-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 75668c6520611982f153ae7dd8e40b0be0479cf5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 20 Aug 2020 21:13:34 +0200 Subject: [PATCH 056/133] spec file cleanups, update list of bundled dependencies --- .gitignore | 2 + syncthing.spec | 141 +++++++++++++++++++++++++++++++++++++-------- vendor2provides.py | 51 ++++++++++++++++ 3 files changed, 169 insertions(+), 25 deletions(-) create mode 100755 vendor2provides.py diff --git a/.gitignore b/.gitignore index a88dd89..ad78d81 100644 --- a/.gitignore +++ b/.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 diff --git a/syncthing.spec b/syncthing.spec index 7cdb075..f39f955 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -12,14 +12,15 @@ 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) +# - 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 ASL 2.0 and BSD and Unlicense 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 @@ -42,53 +43,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/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/Azure/go-ntlmssp)) = 66371956d46c -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 +# 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 -Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97f8568 +# 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 +# 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 -Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a82bc51 -Provides: bundled(golang(github.com/kr/pretty)) = 0.2.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.2.0 +# 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 +# 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 +# github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.4.0 -Provides: bundled(golang(github.com/petermattis/goid)) = b0b1615b78e5 +# 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)) = 4bdfaf469ed5 -Provides: bundled(golang(golang.org/x/net)) = ba9fcec4b297 -Provides: bundled(golang(golang.org/x/sys)) = d5e6a3e2c0ae +# 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 -Provides: bundled(golang(golang.org/x/time)) = 9d24e82272b4 +# 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 diff --git a/vendor2provides.py b/vendor2provides.py new file mode 100755 index 0000000..838c47f --- /dev/null +++ b/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 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()) + From 11ede8be92e4a96f54525fa325da51282b60708d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 20 Aug 2020 21:37:05 +0200 Subject: [PATCH 057/133] include upstream patch to fix issues on ppc64le --- 758a1a6.patch | 22 ++++++++++++++++++++++ syncthing.spec | 11 +++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 758a1a6.patch diff --git a/758a1a6.patch b/758a1a6.patch new file mode 100644 index 0000000..c18ec83 --- /dev/null +++ b/758a1a6.patch @@ -0,0 +1,22 @@ +From 758a1a6a3729e12b8142c45fcc95c08bc188da28 Mon Sep 17 00:00:00 2001 +From: Audrius Butkevicius +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 + diff --git a/syncthing.spec b/syncthing.spec index f39f955..857db64 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -3,7 +3,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{version} @@ -14,7 +14,7 @@ Release: 1%{?dist} # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT), # - 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 ASL 2.0 and BSD and Unlicense 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) @@ -24,6 +24,10 @@ Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz # 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 @@ -444,6 +448,9 @@ export GO111MODULE=off %changelog +* Thu Aug 20 2020 Fabio Valentini - 1.8.0-2 +- Include upstream patch to fix issues on ppc64le. + * Sun Aug 16 2020 Fabio Valentini - 1.8.0-1 - Update to version 1.8.0. From a72c9625bbd17243fd1297238b6ecad3d31df94b Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 4 Sep 2020 22:47:25 -0500 Subject: [PATCH 058/133] Update to version 1.9.0-rc.5 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1871425 https://bugzilla.redhat.com/show_bug.cgi?id=1858155 --- .gitignore | 1 + 758a1a6.patch | 22 ------------------ sources | 2 +- syncthing.spec | 61 +++++++++++++++++++++++--------------------------- 4 files changed, 30 insertions(+), 56 deletions(-) delete mode 100644 758a1a6.patch diff --git a/.gitignore b/.gitignore index ad78d81..f47be58 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /syncthing-source-v1.7.0.tar.gz /syncthing-source-v1.7.1.tar.gz /syncthing-source-v1.8.0.tar.gz +/syncthing-source-v1.9.0-rc.5.tar.gz diff --git a/758a1a6.patch b/758a1a6.patch deleted file mode 100644 index c18ec83..0000000 --- a/758a1a6.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 758a1a6a3729e12b8142c45fcc95c08bc188da28 Mon Sep 17 00:00:00 2001 -From: Audrius Butkevicius -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 - diff --git a/sources b/sources index 3745851..9a3d2f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.8.0.tar.gz) = 282e6a700568946ed23d04cda41fa6a86d7c390c12c8abf99897f3818db9b4452baf5ab47d082bcf0b6a0329eb3d073dbc3abfe4a6493835cd201399307f605d +SHA512 (syncthing-source-v1.9.0-rc.5.tar.gz) = aa7a8fdac3b73210e2ba961da4d02c7f309c6eeefb84991ceb3f5285575a120b3d1c4308240e26268ec7ebbe3d4d77c549a163d2283dfc49bad721fa06bfe18a diff --git a/syncthing.spec b/syncthing.spec index 857db64..1bc7e08 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,12 +1,16 @@ %bcond_with devel +%global basever 1.9.0 +%global prerel rc +%global prerelnum 5 + Name: syncthing Summary: Continuous File Synchronization -Version: 1.8.0 -Release: 2%{?dist} +Version: %{basever}%{?prerel:~%{prerel}%{prerelnum}} +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing -%global tag v%{version} +%global tag v%{basever}%{?prerel:-%{prerel}.%{prerelnum}} %gometa @@ -24,10 +28,6 @@ Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz # 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 @@ -94,8 +94,6 @@ Provides: bundled(golang(github.com/dgryski/go-farm)) = 6a90982 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 @@ -109,9 +107,9 @@ 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 # github.com/golang/groupcache : ASL 2.0 -Provides: bundled(golang(github.com/golang/groupcache)) = 869f871 +Provides: bundled(golang(github.com/golang/groupcache)) = 611e8ac # github.com/golang/protobuf : BSD -Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.0 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.2 # github.com/golang/snappy : BSD Provides: bundled(golang(github.com/golang/snappy)) = 0.0.1 # github.com/greatroar/blobloom : ASL 2.0 @@ -125,9 +123,11 @@ Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a8 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 # github.com/lucas-clemente/quic-go : MIT -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.17.3 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.18.0 # github.com/marten-seemann/qtls : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls)) = 0.9.1 +Provides: bundled(golang(github.com/marten-seemann/qtls)) = 0.10.0 +# github.com/marten-seemann/qtls-go1-15 : BSD +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.0 # github.com/maruel/panicparse : ASL 2.0 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 # github.com/mattn/go-isatty : MIT @@ -159,13 +159,13 @@ 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 # github.com/shirou/gopsutil : BSD -Provides: bundled(golang(github.com/shirou/gopsutil)) = 47ef326 +Provides: bundled(golang(github.com/shirou/gopsutil)) = 2.20.7 # 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 +Provides: bundled(golang(github.com/syndtr/goleveldb)) = d9e9293 # github.com/thejerf/suture : MIT Provides: bundled(golang(github.com/thejerf/suture)) = 3.0.2+incompatible # github.com/urfave/cli : MIT @@ -173,17 +173,17 @@ Provides: bundled(golang(github.com/urfave/cli)) = 1.22.2 # 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 +Provides: bundled(golang(golang.org/x/crypto)) = 123391f # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = ba9fcec +Provides: bundled(golang(golang.org/x/net)) = 3edf25e # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = d5e6a3e +Provides: bundled(golang(golang.org/x/sys)) = d785dc2 # 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 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.25.0 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -278,10 +278,7 @@ popd # set variables expected by syncthing binaries as additional FOOFLAGS export BUILD_HOST=fedora-koji 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" -# temporarily disable quic support (broken with Go 1.15): -# https://github.com/syncthing/syncthing/issues/6889 -# https://github.com/lucas-clemente/quic-go/issues/2614 -export BUILDTAGS="noupgrade noquic" +export BUILDTAGS="noupgrade" export LDFLAGS="-X %{goipath}/lib/build.Program=syncthing $COMMON_LDFLAGS" %gobuild -o _bin/syncthing %{goipath}/cmd/syncthing @@ -347,15 +344,12 @@ export GO111MODULE=off %gotest %{goipath}/cmd/stdiscosrv %gotest %{goipath}/cmd/strelaypoolsrv -# temporarily disable due to quic-go incompatibility with Go 1.15 -#%%gotest %%{goipath}/cmd/syncthing +%gotest %{goipath}/cmd/syncthing -# temporarily disable due to quic-go incompatibility with Go 1.15 -#%%gotest %%{goipath}/lib/api +%gotest %{goipath}/lib/api %gotest %{goipath}/lib/beacon %gotest %{goipath}/lib/config -# temporarily disable due to quic-go incompatibility with Go 1.15 -#%%gotest %%{goipath}/lib/connections +%gotest %{goipath}/lib/connections %gotest %{goipath}/lib/db %gotest %{goipath}/lib/dialer %gotest %{goipath}/lib/discover @@ -366,8 +360,7 @@ export GO111MODULE=off # This test sometimes fails dependent on load on some architectures: # https://github.com/syncthing/syncthing/issues/4370 -# temporarily disable due to quic-go incompatibility with Go 1.15 -#%%gotest %%{goipath}/lib/model || : +%gotest %{goipath}/lib/model || : %gotest %{goipath}/lib/nat %gotest %{goipath}/lib/osutil @@ -380,8 +373,7 @@ export GO111MODULE=off %gotest %{goipath}/lib/signature %gotest %{goipath}/lib/stats %gotest %{goipath}/lib/sync -# temporarily disable due to quic-go incompatibility with Go 1.15 -#%%gotest %%{goipath}/lib/syncthing +%gotest %{goipath}/lib/syncthing %gotest %{goipath}/lib/tlsutil %gotest %{goipath}/lib/upgrade %gotest %{goipath}/lib/upnp @@ -448,6 +440,9 @@ export GO111MODULE=off %changelog +* Sat Sep 05 2020 Carl George - 1.9.0~rc5-1 +- Update to version 1.9.0-rc.5 + * Thu Aug 20 2020 Fabio Valentini - 1.8.0-2 - Include upstream patch to fix issues on ppc64le. From 168fa441e982a9706a13f7000e1ccc91df6f472a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 7 Sep 2020 08:37:22 +0200 Subject: [PATCH 059/133] use correct version format for build flags --- syncthing.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/syncthing.spec b/syncthing.spec index 1bc7e08..1cd9d02 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -7,7 +7,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?prerel:~%{prerel}%{prerelnum}} -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?prerel:-%{prerel}.%{prerelnum}} @@ -277,7 +277,7 @@ popd # set variables expected by syncthing binaries as additional FOOFLAGS export BUILD_HOST=fedora-koji -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" +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" @@ -440,6 +440,9 @@ export GO111MODULE=off %changelog +* Mon Sep 07 2020 Fabio Valentini - 1.9.0~rc5-2 +- Use correct version format for build flags. + * Sat Sep 05 2020 Carl George - 1.9.0~rc5-1 - Update to version 1.9.0-rc.5 From 9a6d7f9417e35f2c9e70bc9e0fb4d7f1bc2b4506 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 8 Sep 2020 17:44:17 +0200 Subject: [PATCH 060/133] update to version 1.9.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f47be58..45bf134 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /syncthing-source-v1.7.1.tar.gz /syncthing-source-v1.8.0.tar.gz /syncthing-source-v1.9.0-rc.5.tar.gz +/syncthing-source-v1.9.0.tar.gz diff --git a/sources b/sources index 9a3d2f3..615110c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.9.0-rc.5.tar.gz) = aa7a8fdac3b73210e2ba961da4d02c7f309c6eeefb84991ceb3f5285575a120b3d1c4308240e26268ec7ebbe3d4d77c549a163d2283dfc49bad721fa06bfe18a +SHA512 (syncthing-source-v1.9.0.tar.gz) = 2e38889cef6d0601f75050d415d727cd09e6bc54d36f4c51e10a24aceeb6ded46a8019714cd12afe1810bb9301b7af115d5fb4d593c952f7ef4e28c3f94c74d9 diff --git a/syncthing.spec b/syncthing.spec index 1cd9d02..d2e391a 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,13 +1,13 @@ %bcond_with devel %global basever 1.9.0 -%global prerel rc -%global prerelnum 5 +#%%global prerel rc +#%%global prerelnum 5 Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?prerel:~%{prerel}%{prerelnum}} -Release: 2%{?dist} +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?prerel:-%{prerel}.%{prerelnum}} @@ -440,6 +440,9 @@ export GO111MODULE=off %changelog +* Tue Sep 08 2020 Fabio Valentini - 1.9.0-1 +- Update to version 1.9.0. + * Mon Sep 07 2020 Fabio Valentini - 1.9.0~rc5-2 - Use correct version format for build flags. From 0d724684ab7cfe4ed5d29bdbba432b078f902d47 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 9 Oct 2020 15:19:19 +0200 Subject: [PATCH 061/133] update to version 1.10.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 45bf134..b3e8d79 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /syncthing-source-v1.8.0.tar.gz /syncthing-source-v1.9.0-rc.5.tar.gz /syncthing-source-v1.9.0.tar.gz +/syncthing-source-v1.10.0.tar.gz diff --git a/sources b/sources index 615110c..5c71fbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.9.0.tar.gz) = 2e38889cef6d0601f75050d415d727cd09e6bc54d36f4c51e10a24aceeb6ded46a8019714cd12afe1810bb9301b7af115d5fb4d593c952f7ef4e28c3f94c74d9 +SHA512 (syncthing-source-v1.10.0.tar.gz) = f2a9d31651d01e2df9aaf91d685df0e7a89ccb901ebd383ec82ceedbcb247790ef7140fedb602957c715a1ab138a9e58e82dabb0264758d185ca6d9c913793bf diff --git a/syncthing.spec b/syncthing.spec index d2e391a..4f598ac 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.9.0 +%global basever 1.10.0 #%%global prerel rc #%%global prerelnum 5 @@ -120,6 +120,8 @@ Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.6 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/kr/pretty : MIT +Provides: bundled(golang(github.com/kr/pretty)) = 0.2.0 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 # github.com/lucas-clemente/quic-go : MIT @@ -129,9 +131,9 @@ Provides: bundled(golang(github.com/marten-seemann/qtls)) = 0.10.0 # github.com/marten-seemann/qtls-go1-15 : BSD Provides: bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.0 # github.com/maruel/panicparse : ASL 2.0 -Provides: bundled(golang(github.com/maruel/panicparse)) = 1.3.0 +Provides: bundled(golang(github.com/maruel/panicparse)) = 1.5.1 # github.com/mattn/go-isatty : MIT -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.11 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.12 # 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 @@ -159,7 +161,7 @@ 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 # github.com/shirou/gopsutil : BSD -Provides: bundled(golang(github.com/shirou/gopsutil)) = 2.20.7 +Provides: bundled(golang(github.com/shirou/gopsutil)) = 2.20.7+incompatible # github.com/shurcooL/sanitized_anchor_name : MIT Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 # github.com/syncthing/notify : MIT @@ -440,6 +442,9 @@ export GO111MODULE=off %changelog +* Fri Oct 09 2020 Fabio Valentini - 1.10.0-1 +- Update to version 1.10.0. + * Tue Sep 08 2020 Fabio Valentini - 1.9.0-1 - Update to version 1.9.0. From 5516a728d8717a7747bed4b66f513b086e99f7a3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 3 Nov 2020 12:06:24 +0100 Subject: [PATCH 062/133] update to version 1.11.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b3e8d79..5a0ac8f 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /syncthing-source-v1.9.0-rc.5.tar.gz /syncthing-source-v1.9.0.tar.gz /syncthing-source-v1.10.0.tar.gz +/syncthing-source-v1.11.0.tar.gz diff --git a/sources b/sources index 5c71fbf..3a4818f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.10.0.tar.gz) = f2a9d31651d01e2df9aaf91d685df0e7a89ccb901ebd383ec82ceedbcb247790ef7140fedb602957c715a1ab138a9e58e82dabb0264758d185ca6d9c913793bf +SHA512 (syncthing-source-v1.11.0.tar.gz) = 971e1cd14994fe47df7d68175306235b03c1dc9cde8a1f0e09f0877730f20952481378e0e12dc7df3b62bbf14df000cff5d3890b749d1af099c268906df56a53 diff --git a/syncthing.spec b/syncthing.spec index 4f598ac..eb2f39d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.10.0 +%global basever 1.11.0 #%%global prerel rc #%%global prerelnum 5 @@ -179,7 +179,7 @@ Provides: bundled(golang(golang.org/x/crypto)) = 123391f # golang.org/x/net : BSD Provides: bundled(golang(golang.org/x/net)) = 3edf25e # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = d785dc2 +Provides: bundled(golang(golang.org/x/sys)) = aee5d88 # golang.org/x/text: BSD Provides: bundled(golang(golang.org/x/text)) = 0.3.3 # golang.org/x/text : BSD @@ -442,6 +442,9 @@ export GO111MODULE=off %changelog +* Tue Nov 03 2020 Fabio Valentini - 1.11.0-1 +- Update to version 1.11.0. + * Fri Oct 09 2020 Fabio Valentini - 1.10.0-1 - Update to version 1.10.0. From a117bf70ad267834582048ac1de09d1bc5d47bc1 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 18 Nov 2020 22:03:40 +0100 Subject: [PATCH 063/133] update to version 1.11.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5a0ac8f..61c6985 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /syncthing-source-v1.9.0.tar.gz /syncthing-source-v1.10.0.tar.gz /syncthing-source-v1.11.0.tar.gz +/syncthing-source-v1.11.1.tar.gz diff --git a/sources b/sources index 3a4818f..38075dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.11.0.tar.gz) = 971e1cd14994fe47df7d68175306235b03c1dc9cde8a1f0e09f0877730f20952481378e0e12dc7df3b62bbf14df000cff5d3890b749d1af099c268906df56a53 +SHA512 (syncthing-source-v1.11.1.tar.gz) = 3e2a7fbb4e7a2905feb2dd02d0d18993cfc2671a63322b873671e03fb151cc8164a340f17a2f740dcdcb60a39d949513c55cd05c1fda6a29f4e23e9a4bc94ebd diff --git a/syncthing.spec b/syncthing.spec index eb2f39d..90d3cb2 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.11.0 +%global basever 1.11.1 #%%global prerel rc #%%global prerelnum 5 @@ -442,6 +442,9 @@ export GO111MODULE=off %changelog +* Wed Nov 18 2020 Fabio Valentini - 1.11.1-1 +- Update to version 1.11.1. + * Tue Nov 03 2020 Fabio Valentini - 1.11.0-1 - Update to version 1.11.0. From 601189614da89548a1d6d58de9defc7e19434ff7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 7 Dec 2020 14:44:48 +0100 Subject: [PATCH 064/133] update to version 1.12.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 69 ++++++++++++++++++++++++++++---------------------- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 61c6985..3876bb0 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /syncthing-source-v1.10.0.tar.gz /syncthing-source-v1.11.0.tar.gz /syncthing-source-v1.11.1.tar.gz +/syncthing-source-v1.12.0.tar.gz diff --git a/sources b/sources index 38075dd..c0b3b12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.11.1.tar.gz) = 3e2a7fbb4e7a2905feb2dd02d0d18993cfc2671a63322b873671e03fb151cc8164a340f17a2f740dcdcb60a39d949513c55cd05c1fda6a29f4e23e9a4bc94ebd +SHA512 (syncthing-source-v1.12.0.tar.gz) = 43a7fdefec6e8acc2d4508a52bad7ba39242186b286f8d2d50762dd639c37ff2f70a13f7957ae85d2006b49947426b8ed54be93cf6abfffa811a140b5c921d5f diff --git a/syncthing.spec b/syncthing.spec index 90d3cb2..554b4c0 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.11.1 +%global basever 1.12.0 #%%global prerel rc #%%global prerelnum 5 @@ -68,12 +68,12 @@ 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 -Provides: bundled(golang(github.com/ccding/go-stun)) = be486d1 +Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.2 # github.com/certifi/gocertifi : MPLv2.0 -Provides: bundled(golang(github.com/certifi/gocertifi)) = a5e0173 +Provides: bundled(golang(github.com/certifi/gocertifi)) = 2c3bb06 # 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 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.1 # github.com/cheekybits/genny : MIT Provides: bundled(golang(github.com/cheekybits/genny)) = 1.0.0 # github.com/chmduquesne/rollinghash : MIT @@ -83,7 +83,7 @@ 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 # github.com/dchest/siphash : CC0 -Provides: bundled(golang(github.com/dchest/siphash)) = 1.2.1 +Provides: bundled(golang(github.com/dchest/siphash)) = 1.2.2 # 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 @@ -97,9 +97,9 @@ Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 # 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 +Provides: bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 1.5.1 # github.com/go-ldap/ldap : MIT -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.2.0 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.2.4 # github.com/go-ole/go-ole : MIT Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.4 # github.com/gobwas/glob : MIT @@ -107,25 +107,25 @@ 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 # github.com/golang/groupcache : ASL 2.0 -Provides: bundled(golang(github.com/golang/groupcache)) = 611e8ac +Provides: bundled(golang(github.com/golang/groupcache)) = 8c9f03a # github.com/golang/protobuf : BSD -Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.2 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.3 # 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 +Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.5.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/julienschmidt/httprouter : BSD +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/kr/pretty : MIT -Provides: bundled(golang(github.com/kr/pretty)) = 0.2.0 # github.com/lib/pq : MIT -Provides: bundled(golang(github.com/lib/pq)) = 1.2.0 +Provides: bundled(golang(github.com/lib/pq)) = 1.8.0 # github.com/lucas-clemente/quic-go : MIT -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.18.0 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.18.1 # github.com/marten-seemann/qtls : BSD Provides: bundled(golang(github.com/marten-seemann/qtls)) = 0.10.0 # github.com/marten-seemann/qtls-go1-15 : BSD @@ -138,6 +138,8 @@ Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.12 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 +# github.com/miscreant/miscreant.go : MIT +Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.4.0 # github.com/oschwald/maxminddb-golang : ISC @@ -147,45 +149,45 @@ 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/prometheus/client_golang)) = 1.8.0 # github.com/prometheus/client_model : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 14fe0d1 +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.7.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.14.0 # github.com/prometheus/procfs : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.0.5 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.2.0 # github.com/rcrowley/go-metrics : BSD -Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cac0b30 +Provides: bundled(golang(github.com/rcrowley/go-metrics)) = 10cdbea # 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 # github.com/shirou/gopsutil : BSD -Provides: bundled(golang(github.com/shirou/gopsutil)) = 2.20.7+incompatible +Provides: bundled(golang(github.com/shirou/gopsutil)) = 3.20.10+incompatible # 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 +Provides: bundled(golang(github.com/syncthing/notify)) = 9a0e441 # 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)) = 3.0.2+incompatible +Provides: bundled(golang(github.com/thejerf/suture)) = 4.0.0+incompatible # github.com/urfave/cli : MIT -Provides: bundled(golang(github.com/urfave/cli)) = 1.22.2 +Provides: bundled(golang(github.com/urfave/cli)) = 1.22.4 # 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)) = 123391f +Provides: bundled(golang(golang.org/x/crypto)) = 9e8e0b3 # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = 3edf25e +Provides: bundled(golang(golang.org/x/net)) = ff519b6 # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = aee5d88 +Provides: bundled(golang(golang.org/x/sys)) = da20708 # 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 +Provides: bundled(golang(golang.org/x/text)) = 0.3.4 +# golang.org/x/time : BSD +Provides: bundled(golang(golang.org/x/time)) = 3af7569 # google.golang.org/protobuf : BSD -Provides: bundled(golang(google.golang.org/protobuf)) = 1.25.0 +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 @@ -340,6 +342,10 @@ done %check +# restore executable bit on a folder ending in .go +# (likely caused by a bug in a brp script) +chmod +x vendor/github.com/miscreant/miscreant.go + export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} export GO111MODULE=off @@ -442,6 +448,9 @@ export GO111MODULE=off %changelog +* Mon Dec 07 2020 Fabio Valentini - 1.12.0-1 +- Update to version 1.12.0. + * Wed Nov 18 2020 Fabio Valentini - 1.11.1-1 - Update to version 1.11.1. From 24fc589c7b06c2572dc059d4cfb529609eae97fe Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 8 Jan 2021 23:36:06 +0100 Subject: [PATCH 065/133] update to version 1.12.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3876bb0..1c54329 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /syncthing-source-v1.11.0.tar.gz /syncthing-source-v1.11.1.tar.gz /syncthing-source-v1.12.0.tar.gz +/syncthing-source-v1.12.1.tar.gz diff --git a/sources b/sources index c0b3b12..11e2ef5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.12.0.tar.gz) = 43a7fdefec6e8acc2d4508a52bad7ba39242186b286f8d2d50762dd639c37ff2f70a13f7957ae85d2006b49947426b8ed54be93cf6abfffa811a140b5c921d5f +SHA512 (syncthing-source-v1.12.1.tar.gz) = 68a9471b9ee6dd7b1977c82b992cbc2c4fac176232d9306831580567531af5ef4e879cec016462d947f96b0770bbdf69128c707f9cf27924239e6097c4e9d9e5 diff --git a/syncthing.spec b/syncthing.spec index 554b4c0..5caabf8 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,16 +1,15 @@ %bcond_with devel -%global basever 1.12.0 -#%%global prerel rc -#%%global prerelnum 5 +%global basever 1.12.1 +#%%global rcnum 5 Name: syncthing Summary: Continuous File Synchronization -Version: %{basever}%{?prerel:~%{prerel}%{prerelnum}} +Version: %{basever}%{?rcnum:~rc%{rcnum}} Release: 1%{?dist} %global goipath github.com/syncthing/syncthing -%global tag v%{basever}%{?prerel:-%{prerel}.%{prerelnum}} +%global tag v%{basever}%{?rcnum:-rc.%{rcnum}} %gometa @@ -125,11 +124,11 @@ Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a8 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.8.0 # github.com/lucas-clemente/quic-go : MIT -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.18.1 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.19.3 # github.com/marten-seemann/qtls : BSD Provides: bundled(golang(github.com/marten-seemann/qtls)) = 0.10.0 # github.com/marten-seemann/qtls-go1-15 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.0 +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.1 # github.com/maruel/panicparse : ASL 2.0 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.5.1 # github.com/mattn/go-isatty : MIT @@ -171,7 +170,7 @@ Provides: bundled(golang(github.com/syncthing/notify)) = 9a0e441 # 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)) = 4.0.0+incompatible +Provides: bundled(golang(github.com/thejerf/suture/v4)) = 4.0.0 # github.com/urfave/cli : MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.4 # github.com/vitrun/qart : ASL 2.0 and BSD @@ -448,6 +447,9 @@ export GO111MODULE=off %changelog +* Fri Jan 08 2021 Fabio Valentini - 1.12.1-1 +- Update to version 1.12.1. + * Mon Dec 07 2020 Fabio Valentini - 1.12.0-1 - Update to version 1.12.0. From a40e560d73d1946f5ff8cdf3664cfc01149fdb48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:29:14 +0000 Subject: [PATCH 066/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 5caabf8..b0803f2 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -6,7 +6,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?rcnum:~rc%{rcnum}} -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?rcnum:-rc.%{rcnum}} @@ -447,6 +447,9 @@ export GO111MODULE=off %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 08 2021 Fabio Valentini - 1.12.1-1 - Update to version 1.12.1. From cd5cecff061e2bf20eaeb5d633800eea0abe1ae6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 4 Feb 2021 12:15:42 +0100 Subject: [PATCH 067/133] update to version 1.13.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1c54329..85442c2 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /syncthing-source-v1.11.1.tar.gz /syncthing-source-v1.12.0.tar.gz /syncthing-source-v1.12.1.tar.gz +/syncthing-source-v1.13.1.tar.gz diff --git a/sources b/sources index 11e2ef5..3640d04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.12.1.tar.gz) = 68a9471b9ee6dd7b1977c82b992cbc2c4fac176232d9306831580567531af5ef4e879cec016462d947f96b0770bbdf69128c707f9cf27924239e6097c4e9d9e5 +SHA512 (syncthing-source-v1.13.1.tar.gz) = 098429d193dabcf4020283e1f93503a855e87717f52aca9da2c81a5a02e4f6123f0ab7feb0d2313a239da033234bd10f75fec56c4004ddc8489e72c822680443 diff --git a/syncthing.spec b/syncthing.spec index b0803f2..2ce548d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,12 +1,12 @@ %bcond_with devel -%global basever 1.12.1 -#%%global rcnum 5 +%global basever 1.13.1 +#%%global rcnum 0 Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?rcnum:~rc%{rcnum}} -Release: 2%{?dist} +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?rcnum:-rc.%{rcnum}} @@ -162,11 +162,11 @@ 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 # github.com/shirou/gopsutil : BSD -Provides: bundled(golang(github.com/shirou/gopsutil)) = 3.20.10+incompatible +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.20.11 # 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)) = 9a0e441 +Provides: bundled(golang(github.com/syncthing/notify)) = 17de266 # github.com/syndtr/goleveldb : BSD Provides: bundled(golang(github.com/syndtr/goleveldb)) = d9e9293 # github.com/thejerf/suture : MIT @@ -447,6 +447,9 @@ export GO111MODULE=off %changelog +* Thu Feb 04 2021 Fabio Valentini - 1.13.1-1 +- Update to version 1.13.1. + * Wed Jan 27 2021 Fedora Release Engineering - 1.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1e74484e98e2af1433b4d260a03965293776abec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:13 +0100 Subject: [PATCH 068/133] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- syncthing.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 2ce548d..5cc4f13 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -6,7 +6,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?rcnum:~rc%{rcnum}} -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?rcnum:-rc.%{rcnum}} @@ -447,6 +447,10 @@ export GO111MODULE=off %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.13.1-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Thu Feb 04 2021 Fabio Valentini - 1.13.1-1 - Update to version 1.13.1. From ac8fe1b699586e50b992676bf6888f33d9495279 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 24 Mar 2021 18:37:47 +0100 Subject: [PATCH 069/133] update to version 1.14.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 85442c2..133e35a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /syncthing-source-v1.12.0.tar.gz /syncthing-source-v1.12.1.tar.gz /syncthing-source-v1.13.1.tar.gz +/syncthing-source-v1.14.0.tar.gz diff --git a/sources b/sources index 3640d04..8712fb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.13.1.tar.gz) = 098429d193dabcf4020283e1f93503a855e87717f52aca9da2c81a5a02e4f6123f0ab7feb0d2313a239da033234bd10f75fec56c4004ddc8489e72c822680443 +SHA512 (syncthing-source-v1.14.0.tar.gz) = 8b06f7e19afd1f699de569090dd3d58cc81a658bfb10a923bb2023d922fe18bf9fcaca38244e338fac9939054b86cc626db63e6a8588f62f981cc5d37eb7ad88 diff --git a/syncthing.spec b/syncthing.spec index 5cc4f13..89ee827 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,12 +1,12 @@ %bcond_with devel -%global basever 1.13.1 +%global basever 1.14.0 #%%global rcnum 0 Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?rcnum:~rc%{rcnum}} -Release: 2%{?dist} +Release: 1%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?rcnum:-rc.%{rcnum}} @@ -48,10 +48,10 @@ 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") +# generate with "./vendor2provides.py path/to/vendor/modules.txt" # github.com/AudriusButkevicius/pfilter : MIT -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = c55ef61 +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 7468b85 # github.com/AudriusButkevicius/recli : MPLv2.0 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 # github.com/Azure/go-ntlmssp : MIT @@ -113,6 +113,8 @@ Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.3 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.5.0 +# github.com/hashicorp/golang-lru : MPLv2.0 +Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0.5.1 # github.com/jackpal/gateway : BSD Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.6 # github.com/jackpal/go-nat-pmp : ASL 2.0 @@ -447,6 +449,9 @@ export GO111MODULE=off %changelog +* Wed Mar 24 2021 Fabio Valentini - 1.14.0-1 +- Update to version 1.14.0. + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.13.1-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 60f72e4b4d41ed6db9f5772508df2a6e3ac2907d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 12 Apr 2021 14:20:04 +0200 Subject: [PATCH 070/133] update to version 1.15.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 67 +++++++++++++++++--------------------------------- 3 files changed, 25 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 133e35a..1ddb324 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /syncthing-source-v1.12.1.tar.gz /syncthing-source-v1.13.1.tar.gz /syncthing-source-v1.14.0.tar.gz +/syncthing-source-v1.15.1.tar.gz diff --git a/sources b/sources index 8712fb8..aa8a653 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.14.0.tar.gz) = 8b06f7e19afd1f699de569090dd3d58cc81a658bfb10a923bb2023d922fe18bf9fcaca38244e338fac9939054b86cc626db63e6a8588f62f981cc5d37eb7ad88 +SHA512 (syncthing-source-v1.15.1.tar.gz) = 22c04ca93596dd6f1dc69d6815c699fc4558e58487dd911c3373dcd63c6a65bef0fa8168e835f82e40d9a9aea49fc59550f25c6e1b78c2b7b078757b86d1b0ac diff --git a/syncthing.spec b/syncthing.spec index 89ee827..0775c40 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.14.0 +%global basever 1.15.1 #%%global rcnum 0 Name: syncthing @@ -56,10 +56,10 @@ Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 7468b85 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 # 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/alecthomas/kong : MIT +Provides: bundled(golang(github.com/alecthomas/kong)) = 0.2.12 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/bkaradzic/go-lz4 : BSD @@ -71,7 +71,6 @@ Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.2 # github.com/certifi/gocertifi : MPLv2.0 Provides: bundled(golang(github.com/certifi/gocertifi)) = 2c3bb06 # 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.1 # github.com/cheekybits/genny : MIT Provides: bundled(golang(github.com/cheekybits/genny)) = 1.0.0 @@ -83,14 +82,6 @@ Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = f79a8a8 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/dchest/siphash : CC0 Provides: bundled(golang(github.com/dchest/siphash)) = 1.2.2 -# 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/getsentry/raven-go : BSD @@ -137,10 +128,16 @@ Provides: bundled(golang(github.com/maruel/panicparse)) = 1.5.1 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.12 # github.com/matttproud/golang_protobuf_extensions : ASL 2.0 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.1 +# github.com/maxbrunsfeld/counterfeiter : MIT +Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.3.0 # github.com/minio/sha256-simd : ASL 2.0 Provides: bundled(golang(github.com/minio/sha256-simd)) = 0.1.1 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 +# github.com/niemeyer/pretty : MIT +Provides: bundled(golang(github.com/niemeyer/pretty)) = a10e7ca +# github.com/onsi/gomega : MIT +Provides: bundled(golang(github.com/onsi/gomega)) = 1.10.3 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.4.0 # github.com/oschwald/maxminddb-golang : ISC @@ -168,7 +165,7 @@ Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.20.11 # 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)) = 17de266 +Provides: bundled(golang(github.com/syncthing/notify)) = f45149b # github.com/syndtr/goleveldb : BSD Provides: bundled(golang(github.com/syndtr/goleveldb)) = d9e9293 # github.com/thejerf/suture : MIT @@ -182,18 +179,25 @@ Provides: bundled(golang(golang.org/x/crypto)) = 9e8e0b3 # golang.org/x/net : BSD Provides: bundled(golang(golang.org/x/net)) = ff519b6 # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = da20708 +Provides: bundled(golang(golang.org/x/sys)) = b64e53b # golang.org/x/text: BSD Provides: bundled(golang(golang.org/x/text)) = 0.3.4 # golang.org/x/time : BSD Provides: bundled(golang(golang.org/x/time)) = 3af7569 +# golang.org/x/tools : BSD +Provides: bundled(golang(golang.org/x/tools)) = 0.1.0 # google.golang.org/protobuf : BSD Provides: bundled(golang(google.golang.org/protobuf)) = 1.23.0 +# github.com/go-check/check : BSD +Provides: bundled(golang(gopkg.in/check.v1)) = 038fdea # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 Obsoletes: syncthing-inotify < 0.8.7-5 +# command line interface for syncthing was merged into main binary +Obsoletes: syncthing-cli < 1.15.1-1 + %description Syncthing replaces other file synchronization services with something @@ -240,19 +244,6 @@ This package contains the main syncthing server tools: to connect to indirectly over the internet. -%package cli -Summary: Continuous File Synchronization (CLI) - -%description cli -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 CLI program. - - %prep %autosetup -n %{name} -p1 @@ -297,9 +288,6 @@ export LDFLAGS="-X %{goipath}/lib/build.Program=strelaysrv $COMMON_LDFLAGS" export LDFLAGS="-X %{goipath}/lib/build.Program=strelaypoolsrv $COMMON_LDFLAGS" %gobuild -o _bin/strelaypoolsrv %{goipath}/cmd/strelaypoolsrv -export LDFLAGS="-X %{goipath}/lib/build.Program=stcli $COMMON_LDFLAGS" -%gobuild -o _bin/stcli %{goipath}/cmd/stcli - %install export GO111MODULE=off @@ -311,7 +299,6 @@ 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 _bin/stcli %{buildroot}/%{_bindir}/ # install man pages mkdir -p %{buildroot}/%{_mandir}/man1 @@ -332,8 +319,8 @@ cp -pav etc/linux-systemd/system/syncthing@.service %{buildroot}/%{_unitdir}/ cp -pav etc/linux-systemd/system/syncthing-resume.service %{buildroot}/%{_unitdir}/ cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ -# Unmark source files as executable -for i in $(find -name "*.go" -executable -print); do +# unmark source files as executable +for i in $(find -name "*.go" -type f -executable -print); do chmod a-x $i; done @@ -343,10 +330,6 @@ done %check -# restore executable bit on a folder ending in .go -# (likely caused by a bug in a brp script) -chmod +x vendor/github.com/miscreant/miscreant.go - export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} export GO111MODULE=off @@ -434,13 +417,6 @@ export GO111MODULE=off %{_mandir}/man1/strelaysrv* -%files cli -%license LICENSE -%doc README.md AUTHORS - -%{_bindir}/stcli - - %if %{with devel} %files devel -f devel.file-list %license LICENSE @@ -449,6 +425,9 @@ export GO111MODULE=off %changelog +* Mon Apr 12 2021 Fabio Valentini - 1.15.1-1 +- Update to version 1.15.1. + * Wed Mar 24 2021 Fabio Valentini - 1.14.0-1 - Update to version 1.14.0. From 578f49ec0ee2e405c40e81ad2e7734472bdd16f7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 10 May 2021 12:01:14 +0200 Subject: [PATCH 071/133] update to version 1.16.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1ddb324..411e551 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /syncthing-source-v1.13.1.tar.gz /syncthing-source-v1.14.0.tar.gz /syncthing-source-v1.15.1.tar.gz +/syncthing-source-v1.16.1.tar.gz diff --git a/sources b/sources index aa8a653..7c83010 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.15.1.tar.gz) = 22c04ca93596dd6f1dc69d6815c699fc4558e58487dd911c3373dcd63c6a65bef0fa8168e835f82e40d9a9aea49fc59550f25c6e1b78c2b7b078757b86d1b0ac +SHA512 (syncthing-source-v1.16.1.tar.gz) = 96c677852f369aa3abb78a47b81d2ecfdce8f768fbf641f66f800277491921b84e847e8b2e62ed82e7e3555dfcdf1ec28688baa0a8b830b8894bf90816cdc380 diff --git a/syncthing.spec b/syncthing.spec index 0775c40..46f06f1 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.15.1 +%global basever 1.16.1 #%%global rcnum 0 Name: syncthing @@ -67,7 +67,7 @@ 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 -Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.2 +Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.3 # github.com/certifi/gocertifi : MPLv2.0 Provides: bundled(golang(github.com/certifi/gocertifi)) = 2c3bb06 # github.com/cespare/xxhash : MIT @@ -425,6 +425,9 @@ export GO111MODULE=off %changelog +* Mon May 10 2021 Fabio Valentini - 1.16.1-1 +- Update to version 1.16.1. + * Mon Apr 12 2021 Fabio Valentini - 1.15.1-1 - Update to version 1.15.1. From 8309cd97a7059045ba4fe5e0dab99ecf4e926597 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 15 Jun 2021 14:51:46 +0200 Subject: [PATCH 072/133] update to version 1.17.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 87 +++++++++++++++++++++++++------------------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 411e551..66a9a00 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /syncthing-source-v1.14.0.tar.gz /syncthing-source-v1.15.1.tar.gz /syncthing-source-v1.16.1.tar.gz +/syncthing-source-v1.17.0.tar.gz diff --git a/sources b/sources index 7c83010..868a835 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.16.1.tar.gz) = 96c677852f369aa3abb78a47b81d2ecfdce8f768fbf641f66f800277491921b84e847e8b2e62ed82e7e3555dfcdf1ec28688baa0a8b830b8894bf90816cdc380 +SHA512 (syncthing-source-v1.17.0.tar.gz) = 84a335f424af661b71502c53eca80f7426da215485eb8953f275d5ed4d7281a003b25dd56bc76749a9b129012c7c0696c6d646107904eca993198a9ae91278f7 diff --git a/syncthing.spec b/syncthing.spec index 46f06f1..cf58d83 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.16.1 +%global basever 1.17.0 #%%global rcnum 0 Name: syncthing @@ -51,15 +51,15 @@ Provides: bundled(moment) = 2.19.4 # generate with "./vendor2provides.py path/to/vendor/modules.txt" # github.com/AudriusButkevicius/pfilter : MIT -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 7468b85 +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = e9aaf99 # github.com/AudriusButkevicius/recli : MPLv2.0 -Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5 +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)) = cbe6696 # github.com/alecthomas/kong : MIT -Provides: bundled(golang(github.com/alecthomas/kong)) = 0.2.12 +Provides: bundled(golang(github.com/alecthomas/kong)) = 0.2.16 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/bkaradzic/go-lz4 : BSD @@ -69,7 +69,7 @@ Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 # github.com/ccding/go-stun : ASL 2.0 Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.3 # github.com/certifi/gocertifi : MPLv2.0 -Provides: bundled(golang(github.com/certifi/gocertifi)) = 2c3bb06 +Provides: bundled(golang(github.com/certifi/gocertifi)) = 83314bf # github.com/cespare/xxhash : MIT Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.1 # github.com/cheekybits/genny : MIT @@ -77,7 +77,7 @@ 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 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.0 # github.com/d4l3k/messagediff : MIT Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/dchest/siphash : CC0 @@ -87,109 +87,105 @@ Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 # 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.1 +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.2.4 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.3.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/gogo/protobuf)) = 1.3.2 # github.com/golang/groupcache : ASL 2.0 -Provides: bundled(golang(github.com/golang/groupcache)) = 8c9f03a +Provides: bundled(golang(github.com/golang/groupcache)) = 41bb18b # github.com/golang/protobuf : BSD -Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.3 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.2 # 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.5.0 +Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.0 # github.com/hashicorp/golang-lru : MPLv2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0.5.1 +Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0.5.4 # github.com/jackpal/gateway : BSD -Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.6 +Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.7 # github.com/jackpal/go-nat-pmp : ASL 2.0 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 # github.com/julienschmidt/httprouter : BSD 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/klauspost/cpuid : MIT +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.0.6 # github.com/lib/pq : MIT -Provides: bundled(golang(github.com/lib/pq)) = 1.8.0 +Provides: bundled(golang(github.com/lib/pq)) = 1.10.1 # github.com/lucas-clemente/quic-go : MIT Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.19.3 # github.com/marten-seemann/qtls : BSD Provides: bundled(golang(github.com/marten-seemann/qtls)) = 0.10.0 # github.com/marten-seemann/qtls-go1-15 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.1 +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.4 # github.com/maruel/panicparse : ASL 2.0 -Provides: bundled(golang(github.com/maruel/panicparse)) = 1.5.1 -# github.com/mattn/go-isatty : MIT -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.12 +Provides: bundled(golang(github.com/maruel/panicparse)) = 1.6.1 # github.com/matttproud/golang_protobuf_extensions : ASL 2.0 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.1 # github.com/maxbrunsfeld/counterfeiter : MIT Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.3.0 # github.com/minio/sha256-simd : ASL 2.0 -Provides: bundled(golang(github.com/minio/sha256-simd)) = 0.1.1 +Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 -# github.com/niemeyer/pretty : MIT -Provides: bundled(golang(github.com/niemeyer/pretty)) = a10e7ca -# github.com/onsi/gomega : MIT -Provides: bundled(golang(github.com/onsi/gomega)) = 1.10.3 # github.com/oschwald/geoip2-golang : ISC -Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.4.0 +Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.5.0 # github.com/oschwald/maxminddb-golang : ISC -Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.6.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/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.8.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.10.0 # 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.14.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.18.0 # github.com/prometheus/procfs : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.2.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.6.0 # github.com/rcrowley/go-metrics : BSD -Provides: bundled(golang(github.com/rcrowley/go-metrics)) = 10cdbea +Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD -Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.0.1 +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.2.0 # github.com/shirou/gopsutil : BSD -Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.20.11 -# github.com/shurcooL/sanitized_anchor_name : MIT -Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.21.4 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = f45149b # 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.0 +Provides: bundled(golang(github.com/thejerf/suture/v4)) = 4.0.1 # github.com/urfave/cli : MIT -Provides: bundled(golang(github.com/urfave/cli)) = 1.22.4 +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 # golang.org/x/crypto : BSD -Provides: bundled(golang(golang.org/x/crypto)) = 9e8e0b3 +Provides: bundled(golang(golang.org/x/crypto)) = 83a5a9b +# golang.org/x/mod : BSD +Provides: bundled(golang(golang.org/x/mod)) = 0.3.0 # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = ff519b6 +Provides: bundled(golang(golang.org/x/net)) = 89ef3d9 # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = b64e53b +Provides: bundled(golang(golang.org/x/sys)) = d19ff85 # golang.org/x/text: BSD -Provides: bundled(golang(golang.org/x/text)) = 0.3.4 +Provides: bundled(golang(golang.org/x/text)) = 0.3.6 # golang.org/x/time : BSD -Provides: bundled(golang(golang.org/x/time)) = 3af7569 +Provides: bundled(golang(golang.org/x/time)) = f8bda1e # golang.org/x/tools : BSD Provides: bundled(golang(golang.org/x/tools)) = 0.1.0 +# golang.org/x/xerrors : BSD +Provides: bundled(golang(golang.org/x/xerrors)) = 5ec99f8 # google.golang.org/protobuf : BSD -Provides: bundled(golang(google.golang.org/protobuf)) = 1.23.0 -# github.com/go-check/check : BSD -Provides: bundled(golang(gopkg.in/check.v1)) = 038fdea +Provides: bundled(golang(google.golang.org/protobuf)) = 1.26.0 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 @@ -425,6 +421,9 @@ export GO111MODULE=off %changelog +* Tue Jun 15 2021 Fabio Valentini - 1.17.0-1 +- Update to version 1.17.0. + * Mon May 10 2021 Fabio Valentini - 1.16.1-1 - Update to version 1.16.1. From 5ad78225fca85b1e25b3bd7341b0cf2bc3995958 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 17 Jul 2021 14:52:20 +0200 Subject: [PATCH 073/133] update to version 1.18.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 66a9a00..8da3dd4 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /syncthing-source-v1.15.1.tar.gz /syncthing-source-v1.16.1.tar.gz /syncthing-source-v1.17.0.tar.gz +/syncthing-source-v1.18.0.tar.gz diff --git a/sources b/sources index 868a835..719f6f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.17.0.tar.gz) = 84a335f424af661b71502c53eca80f7426da215485eb8953f275d5ed4d7281a003b25dd56bc76749a9b129012c7c0696c6d646107904eca993198a9ae91278f7 +SHA512 (syncthing-source-v1.18.0.tar.gz) = 7abd057b79addb44167c6cf690f8e2dd42afb2331de4848d2bf6c398838e8684efeaa24e99401fc1c57dc69110c2d19cc8d8dd81dd9b19b27b8b8b50d8cc9b4f diff --git a/syncthing.spec b/syncthing.spec index cf58d83..4b151c7 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.17.0 +%global basever 1.18.0 #%%global rcnum 0 Name: syncthing @@ -421,6 +421,9 @@ export GO111MODULE=off %changelog +* Sat Jul 17 2021 Fabio Valentini - 1.18.0-1 +- Update to version 1.18.0. + * Tue Jun 15 2021 Fabio Valentini - 1.17.0-1 - Update to version 1.17.0. From b77ccfe520f16bcba9675ef9792a6c52dee33f5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:44:49 +0000 Subject: [PATCH 074/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 4b151c7..ff4a9c3 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -6,7 +6,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?rcnum:~rc%{rcnum}} -Release: 1%{?dist} +Release: 2%{?dist} %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?rcnum:-rc.%{rcnum}} @@ -421,6 +421,9 @@ export GO111MODULE=off %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 17 2021 Fabio Valentini - 1.18.0-1 - Update to version 1.18.0. From e3f5ce0264b9a3684147f9eb17bc6a4e3383557e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 6 Aug 2021 11:23:15 +0200 Subject: [PATCH 075/133] convert to rpmautospec --- changelog | 278 ++++++++++++++++++++++++++++++++++++++++++++++++ syncthing.spec | 282 +------------------------------------------------ 2 files changed, 280 insertions(+), 280 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..70c0a2f --- /dev/null +++ b/changelog @@ -0,0 +1,278 @@ +* Fri Jul 23 2021 Fedora Release Engineering - 1.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 17 2021 Fabio Valentini - 1.18.0-1 +- Update to version 1.18.0. + +* Tue Jun 15 2021 Fabio Valentini - 1.17.0-1 +- Update to version 1.17.0. + +* Mon May 10 2021 Fabio Valentini - 1.16.1-1 +- Update to version 1.16.1. + +* Mon Apr 12 2021 Fabio Valentini - 1.15.1-1 +- Update to version 1.15.1. + +* Wed Mar 24 2021 Fabio Valentini - 1.14.0-1 +- Update to version 1.14.0. + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.13.1-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Thu Feb 04 2021 Fabio Valentini - 1.13.1-1 +- Update to version 1.13.1. + +* Wed Jan 27 2021 Fedora Release Engineering - 1.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 08 2021 Fabio Valentini - 1.12.1-1 +- Update to version 1.12.1. + +* Mon Dec 07 2020 Fabio Valentini - 1.12.0-1 +- Update to version 1.12.0. + +* Wed Nov 18 2020 Fabio Valentini - 1.11.1-1 +- Update to version 1.11.1. + +* Tue Nov 03 2020 Fabio Valentini - 1.11.0-1 +- Update to version 1.11.0. + +* Fri Oct 09 2020 Fabio Valentini - 1.10.0-1 +- Update to version 1.10.0. + +* Tue Sep 08 2020 Fabio Valentini - 1.9.0-1 +- Update to version 1.9.0. + +* Mon Sep 07 2020 Fabio Valentini - 1.9.0~rc5-2 +- Use correct version format for build flags. + +* Sat Sep 05 2020 Carl George - 1.9.0~rc5-1 +- Update to version 1.9.0-rc.5 + +* Thu Aug 20 2020 Fabio Valentini - 1.8.0-2 +- Include upstream patch to fix issues on ppc64le. + +* Sun Aug 16 2020 Fabio Valentini - 1.8.0-1 +- Update to version 1.8.0. + +* Sat Aug 01 2020 Fedora Release Engineering - 1.7.1-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 16 2020 Fabio Valentini - 1.7.1-1 +- Update to version 1.7.1. + +* Tue Jul 07 2020 Fabio Valentini - 1.7.0-1 +- Update to version 1.7.0. + +* Tue Jun 02 2020 Fabio Valentini - 1.6.1-1 +- Update to version 1.6.1. + +* Sat May 09 2020 Fabio Valentini - 1.5.0-1 +- Update to version 1.5.0. + +* Wed Apr 08 2020 Fabio Valentini - 1.4.2-1 +- Update to version 1.4.2. + +* Tue Mar 17 2020 Fabio Valentini - 1.4.0-1 +- Update to version 1.4.0. + +* Tue Mar 03 2020 Fabio Valentini - 1.3.4-2 +- Drop custom systemd user session preset file. + See: https://bugzilla.redhat.com/show_bug.cgi?id=1708297 + +* Tue Feb 04 2020 Fabio Valentini - 1.3.4-1 +- Update to version 1.3.4. + +* Fri Jan 31 2020 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 08 2020 Fabio Valentini - 1.3.3-1 +- Update to version 1.3.3. + +* Tue Dec 03 2019 Fabio Valentini - 1.3.2-2 +- Add proposed patch to fix tests running out of memory on 32 bit arches. + +* Tue Dec 03 2019 Fabio Valentini - 1.3.2-1 +- Update to version 1.3.2. + +* Tue Nov 05 2019 Fabio Valentini - 1.3.1-1 +- Update to version 1.3.1. +- Update build scriptlet to match upstream build system changes. +- Fix broken systemd_post scriptlet. + +* Thu Oct 10 2019 Fabio Valentini - 1.3.0-1 +- Update to version 1.3.0. + +* Thu Sep 05 2019 Fabio Valentini - 1.2.2-1 +- Update to version 1.2.2. + +* Thu Aug 15 2019 Fabio Valentini - 1.2.1-1 +- Update to version 1.2.1. + +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 09 2019 Fabio Valentini - 1.2.0-1 +- Update to version 1.2.0. + +* Sun Jun 16 2019 Fabio Valentini - 1.1.4-2 +- Disable building -devel package by default. + +* Tue Jun 04 2019 Fabio Valentini - 1.1.4-1 +- Update to version 1.1.4. + +* Tue May 21 2019 Fabio Valentini - 1.1.3-1 +- Update to version 1.1.3. + +* Fri Apr 05 2019 Fabio Valentini - 1.1.1-1 +- Update to version 1.1.1. + +* Thu Mar 07 2019 Fabio Valentini - 1.1.0-2 +- Fix build tags for changed variable names. + +* Tue Mar 05 2019 Fabio Valentini - 1.1.0-1 +- Update to version 1.1.0. + +* Tue Feb 05 2019 Fabio Valentini - 1.0.1-1 +- Update to version 1.0.1. + +* Sun Feb 03 2019 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 07 2019 Fabio Valentini - 1.0.0-1 +- Update to version 1.0.0. + +* Wed Dec 26 2018 Fabio Valentini - 0.14.54-1 +- Update to version 0.14.54. +- Switch back to using bundled dependencies. + +* Tue Dec 04 2018 Fabio Valentini - 0.14.53-1 +- Update to version 0.14.53. + +* Tue Nov 06 2018 Fabio Valentini - 0.14.52-1 +- Update to version 0.14.52. + +* Tue Oct 02 2018 Fabio Valentini - 0.14.51-1 +- Update to version 0.14.51. + +* Sun Sep 30 2018 Fabio Valentini - 0.14.50-2 +- Adapt to rollinghash v4.0.0 changes. + +* Tue Sep 11 2018 Fabio Valentini - 0.14.50-1 +- Update to version 0.14.50. +- Clean up .spec file and use new macros. +- Drop upstreamed go1.11 patch. + +* Wed Jul 25 2018 Fabio Valentini - 0.14.49-1 +- Update to version 0.14.49. +- Drop upstreamed osext patch. +- Add upstream patch to fix building tests with go 1.11. + +* Sat Jul 14 2018 Fedora Release Engineering - 0.14.48-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 05 2018 Fabio Valentini - 0.14.48-1 +- Update to version 0.14.48. + +* Tue May 01 2018 Fabio Valentini - 0.14.47-1 +- Update to version 0.14.47. + +* Wed Apr 04 2018 Fabio Valentini - 0.14.46-1 +- Update to version 0.14.46. +- Simplify .spec file and build process, and drop build system patches. + +* Tue Mar 06 2018 Fabio Valentini - 0.14.45-1 +- Update to version 0.14.45. + +* Tue Feb 13 2018 Fabio Valentini - 0.14.44-1 +- Update to version 0.14.44. + +* Fri Feb 09 2018 Fedora Release Engineering - 0.14.43-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 09 2018 Fabio Valentini - 0.14.43-1 +- Update to version 0.14.43. + +* Tue Dec 26 2017 Fabio Valentini - 0.14.42-1 +- Update to version 0.14.42. + +* Tue Dec 05 2017 Fabio Valentini - 0.14.41-1 +- Update to version 0.14.41. + +* Tue Nov 07 2017 Fabio Valentini - 0.14.40-1 +- Update to version 0.14.40. + +* Wed Oct 11 2017 Fabio Valentini - 0.14.39-1 +- Update to version 0.14.39. + +* Wed Sep 20 2017 Fabio Valentini - 0.14.38-1 +- Update to version 0.14.38. +- Add patch to use internal luhn version again. + +* Mon Sep 18 2017 Fabio Valentini - 0.14.37-2 +- Rebuild for updated dependencies, fixing crashes. + +* Tue Sep 05 2017 Fabio Valentini - 0.14.37-1 +- Update to version 0.14.37. + +* Tue Aug 15 2017 Fabio Valentini - 0.14.36-2 +- Adapt patch to work on ppc64, where PIE isn't supported. + +* Sat Aug 12 2017 Fabio Valentini - 0.14.36-1 +- Update to version 0.14.36. + +* Wed Aug 09 2017 Fabio Valentini - 0.14.35-2 +- Add Provides for bundled JS libraries and adapt License tag. + +* Tue Aug 08 2017 Fabio Valentini - 0.14.35-1 +- Update to version 0.14.35. + +* Tue Aug 08 2017 Fabio Valentini - 0.14.34-1 +- Update to version 0.14.34. + +* Sat Aug 05 2017 Fabio Valentini - 0.14.33-3 +- Add another missing ldflags argument. + +* Tue Aug 01 2017 Fabio Valentini - 0.14.33-2 +- Adapt patched build script to use the correct LDFLAGS. + +* Tue Jul 25 2017 Fabio Valentini - 0.14.33-1 +- Update to version 0.14.33. + +* Tue Jul 11 2017 Fabio Valentini - 0.14.32-1 +- Update to version 0.14.32. + +* Tue Jun 27 2017 Fabio Valentini - 0.14.31-1 +- Update to version 0.14.31. + +* Tue Jun 13 2017 Fabio Valentini - 0.14.30-1 +- Update to version 0.14.30. + +* Tue May 30 2017 Fabio Valentini - 0.14.29-1 +- Update to version 0.14.29. + +* Tue May 16 2017 Fabio Valentini - 0.14.28-1 +- Update to version 0.14.28. + +* Tue Apr 25 2017 Fabio Valentini - 0.14.27-1 +- Update to version 0.14.27. + +* Fri Apr 07 2017 Fabio Valentini - 0.14.26-1 +- Update to version 0.14.26. + +* Tue Mar 21 2017 Fabio Valentini - 0.14.25-1 +- Update to version 0.14.25. + +* Tue Mar 07 2017 Fabio Valentini - 0.14.24-1 +- Update to version 0.14.24. + +* Tue Feb 28 2017 Fabio Valentini - 0.14.23-2 +- Clean up spec file, remove bundled libs on fedora, add man pages. + +* Tue Feb 07 2017 Fabio Valentini - 0.14.23-1 +- First package for fedora. diff --git a/syncthing.spec b/syncthing.spec index ff4a9c3..76141b9 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -6,7 +6,7 @@ Name: syncthing Summary: Continuous File Synchronization Version: %{basever}%{?rcnum:~rc%{rcnum}} -Release: 2%{?dist} +Release: %autorelease %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?rcnum:-rc.%{rcnum}} @@ -421,282 +421,4 @@ export GO111MODULE=off %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 1.18.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Fabio Valentini - 1.18.0-1 -- Update to version 1.18.0. - -* Tue Jun 15 2021 Fabio Valentini - 1.17.0-1 -- Update to version 1.17.0. - -* Mon May 10 2021 Fabio Valentini - 1.16.1-1 -- Update to version 1.16.1. - -* Mon Apr 12 2021 Fabio Valentini - 1.15.1-1 -- Update to version 1.15.1. - -* Wed Mar 24 2021 Fabio Valentini - 1.14.0-1 -- Update to version 1.14.0. - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.13.1-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Thu Feb 04 2021 Fabio Valentini - 1.13.1-1 -- Update to version 1.13.1. - -* Wed Jan 27 2021 Fedora Release Engineering - 1.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 08 2021 Fabio Valentini - 1.12.1-1 -- Update to version 1.12.1. - -* Mon Dec 07 2020 Fabio Valentini - 1.12.0-1 -- Update to version 1.12.0. - -* Wed Nov 18 2020 Fabio Valentini - 1.11.1-1 -- Update to version 1.11.1. - -* Tue Nov 03 2020 Fabio Valentini - 1.11.0-1 -- Update to version 1.11.0. - -* Fri Oct 09 2020 Fabio Valentini - 1.10.0-1 -- Update to version 1.10.0. - -* Tue Sep 08 2020 Fabio Valentini - 1.9.0-1 -- Update to version 1.9.0. - -* Mon Sep 07 2020 Fabio Valentini - 1.9.0~rc5-2 -- Use correct version format for build flags. - -* Sat Sep 05 2020 Carl George - 1.9.0~rc5-1 -- Update to version 1.9.0-rc.5 - -* Thu Aug 20 2020 Fabio Valentini - 1.8.0-2 -- Include upstream patch to fix issues on ppc64le. - -* Sun Aug 16 2020 Fabio Valentini - 1.8.0-1 -- Update to version 1.8.0. - -* Sat Aug 01 2020 Fedora Release Engineering - 1.7.1-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 16 2020 Fabio Valentini - 1.7.1-1 -- Update to version 1.7.1. - -* Tue Jul 07 2020 Fabio Valentini - 1.7.0-1 -- Update to version 1.7.0. - -* Tue Jun 02 2020 Fabio Valentini - 1.6.1-1 -- Update to version 1.6.1. - -* Sat May 09 2020 Fabio Valentini - 1.5.0-1 -- Update to version 1.5.0. - -* Wed Apr 08 2020 Fabio Valentini - 1.4.2-1 -- Update to version 1.4.2. - -* Tue Mar 17 2020 Fabio Valentini - 1.4.0-1 -- Update to version 1.4.0. - -* Tue Mar 03 2020 Fabio Valentini - 1.3.4-2 -- Drop custom systemd user session preset file. - See: https://bugzilla.redhat.com/show_bug.cgi?id=1708297 - -* Tue Feb 04 2020 Fabio Valentini - 1.3.4-1 -- Update to version 1.3.4. - -* Fri Jan 31 2020 Fedora Release Engineering - 1.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 08 2020 Fabio Valentini - 1.3.3-1 -- Update to version 1.3.3. - -* Tue Dec 03 2019 Fabio Valentini - 1.3.2-2 -- Add proposed patch to fix tests running out of memory on 32 bit arches. - -* Tue Dec 03 2019 Fabio Valentini - 1.3.2-1 -- Update to version 1.3.2. - -* Tue Nov 05 2019 Fabio Valentini - 1.3.1-1 -- Update to version 1.3.1. -- Update build scriptlet to match upstream build system changes. -- Fix broken systemd_post scriptlet. - -* Thu Oct 10 2019 Fabio Valentini - 1.3.0-1 -- Update to version 1.3.0. - -* Thu Sep 05 2019 Fabio Valentini - 1.2.2-1 -- Update to version 1.2.2. - -* Thu Aug 15 2019 Fabio Valentini - 1.2.1-1 -- Update to version 1.2.1. - -* Sat Jul 27 2019 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 09 2019 Fabio Valentini - 1.2.0-1 -- Update to version 1.2.0. - -* Sun Jun 16 2019 Fabio Valentini - 1.1.4-2 -- Disable building -devel package by default. - -* Tue Jun 04 2019 Fabio Valentini - 1.1.4-1 -- Update to version 1.1.4. - -* Tue May 21 2019 Fabio Valentini - 1.1.3-1 -- Update to version 1.1.3. - -* Fri Apr 05 2019 Fabio Valentini - 1.1.1-1 -- Update to version 1.1.1. - -* Thu Mar 07 2019 Fabio Valentini - 1.1.0-2 -- Fix build tags for changed variable names. - -* Tue Mar 05 2019 Fabio Valentini - 1.1.0-1 -- Update to version 1.1.0. - -* Tue Feb 05 2019 Fabio Valentini - 1.0.1-1 -- Update to version 1.0.1. - -* Sun Feb 03 2019 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 07 2019 Fabio Valentini - 1.0.0-1 -- Update to version 1.0.0. - -* Wed Dec 26 2018 Fabio Valentini - 0.14.54-1 -- Update to version 0.14.54. -- Switch back to using bundled dependencies. - -* Tue Dec 04 2018 Fabio Valentini - 0.14.53-1 -- Update to version 0.14.53. - -* Tue Nov 06 2018 Fabio Valentini - 0.14.52-1 -- Update to version 0.14.52. - -* Tue Oct 02 2018 Fabio Valentini - 0.14.51-1 -- Update to version 0.14.51. - -* Sun Sep 30 2018 Fabio Valentini - 0.14.50-2 -- Adapt to rollinghash v4.0.0 changes. - -* Tue Sep 11 2018 Fabio Valentini - 0.14.50-1 -- Update to version 0.14.50. -- Clean up .spec file and use new macros. -- Drop upstreamed go1.11 patch. - -* Wed Jul 25 2018 Fabio Valentini - 0.14.49-1 -- Update to version 0.14.49. -- Drop upstreamed osext patch. -- Add upstream patch to fix building tests with go 1.11. - -* Sat Jul 14 2018 Fedora Release Engineering - 0.14.48-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 05 2018 Fabio Valentini - 0.14.48-1 -- Update to version 0.14.48. - -* Tue May 01 2018 Fabio Valentini - 0.14.47-1 -- Update to version 0.14.47. - -* Wed Apr 04 2018 Fabio Valentini - 0.14.46-1 -- Update to version 0.14.46. -- Simplify .spec file and build process, and drop build system patches. - -* Tue Mar 06 2018 Fabio Valentini - 0.14.45-1 -- Update to version 0.14.45. - -* Tue Feb 13 2018 Fabio Valentini - 0.14.44-1 -- Update to version 0.14.44. - -* Fri Feb 09 2018 Fedora Release Engineering - 0.14.43-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 09 2018 Fabio Valentini - 0.14.43-1 -- Update to version 0.14.43. - -* Tue Dec 26 2017 Fabio Valentini - 0.14.42-1 -- Update to version 0.14.42. - -* Tue Dec 05 2017 Fabio Valentini - 0.14.41-1 -- Update to version 0.14.41. - -* Tue Nov 07 2017 Fabio Valentini - 0.14.40-1 -- Update to version 0.14.40. - -* Wed Oct 11 2017 Fabio Valentini - 0.14.39-1 -- Update to version 0.14.39. - -* Wed Sep 20 2017 Fabio Valentini - 0.14.38-1 -- Update to version 0.14.38. -- Add patch to use internal luhn version again. - -* Mon Sep 18 2017 Fabio Valentini - 0.14.37-2 -- Rebuild for updated dependencies, fixing crashes. - -* Tue Sep 05 2017 Fabio Valentini - 0.14.37-1 -- Update to version 0.14.37. - -* Tue Aug 15 2017 Fabio Valentini - 0.14.36-2 -- Adapt patch to work on ppc64, where PIE isn't supported. - -* Sat Aug 12 2017 Fabio Valentini - 0.14.36-1 -- Update to version 0.14.36. - -* Wed Aug 09 2017 Fabio Valentini - 0.14.35-2 -- Add Provides for bundled JS libraries and adapt License tag. - -* Tue Aug 08 2017 Fabio Valentini - 0.14.35-1 -- Update to version 0.14.35. - -* Tue Aug 08 2017 Fabio Valentini - 0.14.34-1 -- Update to version 0.14.34. - -* Sat Aug 05 2017 Fabio Valentini - 0.14.33-3 -- Add another missing ldflags argument. - -* Tue Aug 01 2017 Fabio Valentini - 0.14.33-2 -- Adapt patched build script to use the correct LDFLAGS. - -* Tue Jul 25 2017 Fabio Valentini - 0.14.33-1 -- Update to version 0.14.33. - -* Tue Jul 11 2017 Fabio Valentini - 0.14.32-1 -- Update to version 0.14.32. - -* Tue Jun 27 2017 Fabio Valentini - 0.14.31-1 -- Update to version 0.14.31. - -* Tue Jun 13 2017 Fabio Valentini - 0.14.30-1 -- Update to version 0.14.30. - -* Tue May 30 2017 Fabio Valentini - 0.14.29-1 -- Update to version 0.14.29. - -* Tue May 16 2017 Fabio Valentini - 0.14.28-1 -- Update to version 0.14.28. - -* Tue Apr 25 2017 Fabio Valentini - 0.14.27-1 -- Update to version 0.14.27. - -* Fri Apr 07 2017 Fabio Valentini - 0.14.26-1 -- Update to version 0.14.26. - -* Tue Mar 21 2017 Fabio Valentini - 0.14.25-1 -- Update to version 0.14.25. - -* Tue Mar 07 2017 Fabio Valentini - 0.14.24-1 -- Update to version 0.14.24. - -* Tue Feb 28 2017 Fabio Valentini - 0.14.23-2 -- Clean up spec file, remove bundled libs on fedora, add man pages. - -* Tue Feb 07 2017 Fabio Valentini - 0.14.23-1 -- First package for fedora. - +%autochangelog From 154de478339d49210126010d8827978ff0a3df9a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 6 Aug 2021 11:30:29 +0200 Subject: [PATCH 076/133] Update to version 1.18.1; Fixes RHBZ#1989588 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8da3dd4..db97af3 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /syncthing-source-v1.16.1.tar.gz /syncthing-source-v1.17.0.tar.gz /syncthing-source-v1.18.0.tar.gz +/syncthing-source-v1.18.1.tar.gz diff --git a/sources b/sources index 719f6f6..5ea1a2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.18.0.tar.gz) = 7abd057b79addb44167c6cf690f8e2dd42afb2331de4848d2bf6c398838e8684efeaa24e99401fc1c57dc69110c2d19cc8d8dd81dd9b19b27b8b8b50d8cc9b4f +SHA512 (syncthing-source-v1.18.1.tar.gz) = 36cd1d9d07277da930cd51f13df72b475177872f030aa7b72704565744f53d8dc5347a928d32aa5711da288e4b89fff840758e45384f4fb1c0dc611921a2540e diff --git a/syncthing.spec b/syncthing.spec index 76141b9..12612ee 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.18.0 +%global basever 1.18.1 #%%global rcnum 0 Name: syncthing From 82646a63612f2264a2af678b4d7d445a22ea2165 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 20 Sep 2021 12:28:28 +0200 Subject: [PATCH 077/133] Update to version 1.18.2; Fixes RHBZ#2002240 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index db97af3..14c2985 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /syncthing-source-v1.17.0.tar.gz /syncthing-source-v1.18.0.tar.gz /syncthing-source-v1.18.1.tar.gz +/syncthing-source-v1.18.2.tar.gz diff --git a/sources b/sources index 5ea1a2c..30d1250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.18.1.tar.gz) = 36cd1d9d07277da930cd51f13df72b475177872f030aa7b72704565744f53d8dc5347a928d32aa5711da288e4b89fff840758e45384f4fb1c0dc611921a2540e +SHA512 (syncthing-source-v1.18.2.tar.gz) = 0d9402a610cb944dd72165929491d02c1b35b23536ac38fd1e36aeb333b97dd90e5d9f3128ce542cf696ba75c3cb3152ba7a6ece879cd37a39edc066589b88e0 diff --git a/syncthing.spec b/syncthing.spec index 12612ee..23a4424 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.18.1 +%global basever 1.18.2 #%%global rcnum 0 Name: syncthing From 804ab79657849335604703e00219e3403bc5c324 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 7 Oct 2021 11:11:32 +0200 Subject: [PATCH 078/133] Update to version 1.18.3; Fixes RHBZ#2010303 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 78 ++++++++++++++++++++++++++++---------------------- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 14c2985..4763703 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /syncthing-source-v1.18.0.tar.gz /syncthing-source-v1.18.1.tar.gz /syncthing-source-v1.18.2.tar.gz +/syncthing-source-v1.18.3.tar.gz diff --git a/sources b/sources index 30d1250..f48050f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.18.2.tar.gz) = 0d9402a610cb944dd72165929491d02c1b35b23536ac38fd1e36aeb333b97dd90e5d9f3128ce542cf696ba75c3cb3152ba7a6ece879cd37a39edc066589b88e0 +SHA512 (syncthing-source-v1.18.3.tar.gz) = 16de0a91768846c203880abf46a2e109d6208c1439892bc09a279442e0cbcd3d53d6aa0c154da819bcd6f2bbd918162331f5d530b610337892b8e1051843e85f diff --git a/syncthing.spec b/syncthing.spec index 23a4424..f70a103 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.18.2 +%global basever 1.18.3 #%%global rcnum 0 Name: syncthing @@ -16,8 +16,8 @@ Release: %autorelease # syncthing (MPLv2.0) bundles # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT), # - 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 +# - a number of go packages (MIT and MPLv2.0 and BSD and ASL 2.0 and ISC) +License: MPLv2.0 and MIT and OFL and CC-BY and BSD and ASL 2.0 and ISC URL: https://syncthing.net # use official release tarball (contains vendored dependencies) @@ -51,15 +51,15 @@ Provides: bundled(moment) = 2.19.4 # generate with "./vendor2provides.py path/to/vendor/modules.txt" # github.com/AudriusButkevicius/pfilter : MIT -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = e9aaf99 +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 0.0.10 # github.com/AudriusButkevicius/recli : MPLv2.0 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)) = cbe6696 +Provides: bundled(golang(github.com/StackExchange/wmi)) = 1.2.1 # github.com/alecthomas/kong : MIT -Provides: bundled(golang(github.com/alecthomas/kong)) = 0.2.16 +Provides: bundled(golang(github.com/alecthomas/kong)) = 0.2.17 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/bkaradzic/go-lz4 : BSD @@ -69,29 +69,31 @@ Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 # github.com/ccding/go-stun : ASL 2.0 Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.3 # github.com/certifi/gocertifi : MPLv2.0 -Provides: bundled(golang(github.com/certifi/gocertifi)) = 83314bf +Provides: bundled(golang(github.com/certifi/gocertifi)) = 431795d # github.com/cespare/xxhash : MIT -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.1 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.2 # 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)) = 2.0.0 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.1 # github.com/d4l3k/messagediff : MIT Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 -# github.com/dchest/siphash : CC0 -Provides: bundled(golang(github.com/dchest/siphash)) = 1.2.2 # github.com/flynn-archive/go-shlex : ASL 2.0 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 +# github.com/fsnotify/fsnotify : BSD +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.5.1 # 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.3 # github.com/go-ldap/ldap : MIT -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.3.0 +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)) = 1.2.4 +Provides: bundled(golang(github.com/go-ole/go-ole)) = 8b1f7f9 +# github.com/go-task/slim-sprig : MIT +Provides: bundled(golang(github.com/go-task/slim-sprig)) = 348f09d # github.com/gobwas/glob : MIT Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 # github.com/gogo/protobuf : BSD @@ -101,7 +103,7 @@ Provides: bundled(golang(github.com/golang/groupcache)) = 41bb18b # github.com/golang/protobuf : BSD Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.2 # github.com/golang/snappy : BSD -Provides: bundled(golang(github.com/golang/snappy)) = 0.0.1 +Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 # github.com/greatroar/blobloom : ASL 2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.0 # github.com/hashicorp/golang-lru : MPLv2.0 @@ -115,15 +117,15 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.0.6 +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.1 +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.19.3 -# github.com/marten-seemann/qtls : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls)) = 0.10.0 -# github.com/marten-seemann/qtls-go1-15 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.4 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.23.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/maruel/panicparse : ASL 2.0 Provides: bundled(golang(github.com/maruel/panicparse)) = 1.6.1 # github.com/matttproud/golang_protobuf_extensions : ASL 2.0 @@ -134,6 +136,10 @@ Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.3. Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 +# github.com/nxadm/tail : MIT +Provides: bundled(golang(github.com/nxadm/tail)) = 1.4.8 +# github.com/onsi/ginkgo : MIT +Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.16.4 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.5.0 # github.com/oschwald/maxminddb-golang : ISC @@ -143,23 +149,23 @@ 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.10.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.11.0 # 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.18.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.30.0 # github.com/prometheus/procfs : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.6.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.7.3 # github.com/rcrowley/go-metrics : BSD Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD 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.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.4 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.21.8 # github.com/syncthing/notify : MIT -Provides: bundled(golang(github.com/syncthing/notify)) = f45149b +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 @@ -169,23 +175,25 @@ 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 # golang.org/x/crypto : BSD -Provides: bundled(golang(golang.org/x/crypto)) = 83a5a9b +Provides: bundled(golang(golang.org/x/crypto)) = 089bfa5 # golang.org/x/mod : BSD -Provides: bundled(golang(golang.org/x/mod)) = 0.3.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.5.1 # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = 89ef3d9 +Provides: bundled(golang(golang.org/x/net)) = 3ad01bb # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = d19ff85 +Provides: bundled(golang(golang.org/x/sys)) = 92d5a99 # golang.org/x/text: BSD -Provides: bundled(golang(golang.org/x/text)) = 0.3.6 +Provides: bundled(golang(golang.org/x/text)) = 0.3.7 # golang.org/x/time : BSD -Provides: bundled(golang(golang.org/x/time)) = f8bda1e +Provides: bundled(golang(golang.org/x/time)) = 1f47c86 # golang.org/x/tools : BSD -Provides: bundled(golang(golang.org/x/tools)) = 0.1.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.1.6 # golang.org/x/xerrors : BSD Provides: bundled(golang(golang.org/x/xerrors)) = 5ec99f8 # google.golang.org/protobuf : BSD -Provides: bundled(golang(google.golang.org/protobuf)) = 1.26.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.27.1 +# gopkg.in/tomb.v1 : BSD +Provides: bundled(golang(gopkg.in/tomb.v1)) = dd63297 # an inotify filesystem watcher is integrated with syncthing now Provides: syncthing-inotify = 0.8.7-5 From 47eddb59f44ba3bd0f75c17193cbc59b4905dfba Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 4 Nov 2021 14:22:44 +0100 Subject: [PATCH 079/133] Update to version 1.18.4; Fixes RHBZ#2019676 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4763703..80b9233 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /syncthing-source-v1.18.1.tar.gz /syncthing-source-v1.18.2.tar.gz /syncthing-source-v1.18.3.tar.gz +/syncthing-source-v1.18.4.tar.gz diff --git a/sources b/sources index f48050f..0c98678 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.18.3.tar.gz) = 16de0a91768846c203880abf46a2e109d6208c1439892bc09a279442e0cbcd3d53d6aa0c154da819bcd6f2bbd918162331f5d530b610337892b8e1051843e85f +SHA512 (syncthing-source-v1.18.4.tar.gz) = 4b144dd2572c897e6de4b190ffa607092a444d1a85bf3d1ffa32da5d863533ea770c50e4b694245342f6375091fd3c6b787b5971314d0c705e5fa2a5eae20809 diff --git a/syncthing.spec b/syncthing.spec index f70a103..8cfbf14 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.18.3 +%global basever 1.18.4 #%%global rcnum 0 Name: syncthing @@ -32,6 +32,8 @@ BuildRequires: systemd %{?systemd_requires} +Requires: hicolor-icon-theme + # assets in gui/default/vendor/* Provides: bundled(angular) = 1.3.20 Provides: bundled(angular-dirPagination) = 759009c @@ -315,6 +317,17 @@ cp -pav ./man/*.7 %{buildroot}/%{_mandir}/man7/ cp -pav ./man/stdiscosrv.1 %{buildroot}/%{_mandir}/man1/ cp -pav ./man/strelaysrv.1 %{buildroot}/%{_mandir}/man1/ +# install desktop files and icons +mkdir -p %{buildroot}/%{_datadir}/applications +cp -pav etc/linux-desktop/syncthing-start.desktop %{buildroot}/%{_datadir}/applications/ +cp -pav etc/linux-desktop/syncthing-ui.desktop %{buildroot}/%{_datadir}/applications/ + +mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32,64,128,256,512,scalable}/apps +for size in 32 64 128 256 512; do + cp -pav assets/logo-$size.png %{buildroot}/%{_datadir}/icons/hicolor/$size/apps/syncthing.png +done +cp -pav assets/logo-only.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/syncthing.svg + # install systemd units mkdir -p %{buildroot}/%{_unitdir} mkdir -p %{buildroot}/%{_userunitdir} @@ -334,6 +347,8 @@ done %check +desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop + export LANG=C.utf8 export GOPATH=$(pwd)/_build:%{gopath} export GO111MODULE=off @@ -402,6 +417,9 @@ export GO111MODULE=off %{_bindir}/syncthing +%{_datadir}/applications/syncthing*.desktop +%{_datadir}/icons/hicolor/*/apps/syncthing.* + %{_mandir}/*/syncthing* %{_unitdir}/syncthing@.service From d3c4849fd2d13b4e53d103dff924b0b72543abbe Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 15 Dec 2021 23:18:54 +0100 Subject: [PATCH 080/133] Update to version 1.18.5; Fixes RHBZ#2029968 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 80b9233..9c207b3 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /syncthing-source-v1.18.2.tar.gz /syncthing-source-v1.18.3.tar.gz /syncthing-source-v1.18.4.tar.gz +/syncthing-source-v1.18.5.tar.gz diff --git a/sources b/sources index 0c98678..2217ec9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.18.4.tar.gz) = 4b144dd2572c897e6de4b190ffa607092a444d1a85bf3d1ffa32da5d863533ea770c50e4b694245342f6375091fd3c6b787b5971314d0c705e5fa2a5eae20809 +SHA512 (syncthing-source-v1.18.5.tar.gz) = 76679f12c5220b3ec620edff1f6b62836e6bc4d83a914dfb1cfd5ca570e7f03fa323e1646abeab525d4a56e5fb87bd3381b751a33a2cd4d224e8ff80a8a39c58 diff --git a/syncthing.spec b/syncthing.spec index 8cfbf14..8a88e7e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.18.4 +%global basever 1.18.5 #%%global rcnum 0 Name: syncthing @@ -28,9 +28,7 @@ Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz Patch0: https://github.com/imsodin/syncthing/commit/0d64427.patch BuildRequires: desktop-file-utils -BuildRequires: systemd - -%{?systemd_requires} +BuildRequires: systemd-rpm-macros Requires: hicolor-icon-theme From a6cc77625dfbd0f7f9b8a2cea036792442db09be Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 18 Jan 2022 12:07:56 +0100 Subject: [PATCH 081/133] Update to version 1.18.6; Fixes RHBZ#2039368 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9c207b3..d74e26e 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /syncthing-source-v1.18.3.tar.gz /syncthing-source-v1.18.4.tar.gz /syncthing-source-v1.18.5.tar.gz +/syncthing-source-v1.18.6.tar.gz diff --git a/sources b/sources index 2217ec9..d3bcc1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.18.5.tar.gz) = 76679f12c5220b3ec620edff1f6b62836e6bc4d83a914dfb1cfd5ca570e7f03fa323e1646abeab525d4a56e5fb87bd3381b751a33a2cd4d224e8ff80a8a39c58 +SHA512 (syncthing-source-v1.18.6.tar.gz) = 011c2b6e4ff16c3a7d8cd5ed6e3fd40319fb88ff781a00febc4c3423b344d4f50e1286ec627c0add44a42716e69d331646aa7303303cc3b0785170375e18d494 diff --git a/syncthing.spec b/syncthing.spec index 8a88e7e..475cf82 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.18.5 +%global basever 1.18.6 #%%global rcnum 0 Name: syncthing @@ -121,7 +121,7 @@ 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.23.0 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.24.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 From 7cd67d6a0a8b87f03607b48b5bf264ac0fa83e15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:09:14 +0000 Subject: [PATCH 082/133] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From dc45120609b57bbde05bd36642621ec5d5fe542d Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 17:33:26 -0800 Subject: [PATCH 083/133] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- README.md | 3 --- dead.package | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 README.md create mode 100644 dead.package diff --git a/README.md b/README.md deleted file mode 100644 index bf92e6f..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# syncthing - -The syncthing package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 From 7295ea80bb19e87a175fa0fb81830c1a64e7e31c Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 2 Mar 2022 12:09:25 +0100 Subject: [PATCH 084/133] 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 71fd6a0f286086416e3c6640b70e6d7804317915 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 23 Apr 2022 23:46:18 +0200 Subject: [PATCH 085/133] 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 8817c42c16d746e841b75a6f1b0cc3268d44cc67 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 18 May 2022 12:19:02 +0200 Subject: [PATCH 086/133] 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 fc43bebd3da439abeb6a6ea282d175d528fc7258 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 7 Jun 2022 23:13:09 +0200 Subject: [PATCH 087/133] 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 57d23d093f953f8850aeb8b1e4ee26f7344e87da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Jun 2022 12:22:28 +0200 Subject: [PATCH 088/133] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From 603e4e03a92a7d704d199629dd85304018e8279d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 13 Jul 2022 13:11:37 +0200 Subject: [PATCH 089/133] 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 340aa0ce3b98bdfd0fb22b185fd9f0fb7fa876fd Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Jul 2022 13:59:10 -0500 Subject: [PATCH 090/133] Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang From 0e9ee4515b81ceba3c7ba0c66aaf3afa476dd479 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:56:07 +0000 Subject: [PATCH 091/133] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1124a63fbb81a8e497640c4c7bcb350452ddbb98 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 18 Aug 2022 15:36:05 +0200 Subject: [PATCH 092/133] Stop building syncthing on i686 --- syncthing.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/syncthing.spec b/syncthing.spec index 0e50347..f083777 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -11,7 +11,7 @@ Release: %autorelease %global goipath github.com/syncthing/syncthing %global tag v%{basever}%{?rcnum:-rc.%{rcnum}} -%gometa +%gometa -f # syncthing (MPLv2.0) bundles # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT), @@ -23,10 +23,6 @@ URL: https://syncthing.net # use official release tarball (contains vendored dependencies) Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz -# 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 - BuildRequires: desktop-file-utils BuildRequires: systemd-rpm-macros From fd50d02be4fe70c6a991b522ab2ceb1483974d58 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 18 Aug 2022 15:52:15 +0200 Subject: [PATCH 093/133] 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 f083777..7499737 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 From ed2609febc3fbe3529aef48e7d63a503609f7a14 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 8 Sep 2022 22:12:07 +0200 Subject: [PATCH 094/133] Update to version 1.21.0; Fixes RHBZ#2124728 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 44 ++++++++++++++++++-------------------------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 0880485..5e1c889 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /syncthing-source-v1.20.2.tar.gz /syncthing-source-v1.20.3.tar.gz /syncthing-source-v1.20.4.tar.gz +/syncthing-source-v1.21.0.tar.gz diff --git a/sources b/sources index e5b9dfd..b846743 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.20.4.tar.gz) = f695cc6d8e6a87b397a11f79f3b5e12565fcea4601da7dd41b681e49913bb48b5164b3648ae68a1d580b77f6a20cc8053e252e24a5c054c52255ece34e90c4f8 +SHA512 (syncthing-source-v1.21.0.tar.gz) = 78d4c6dfc477bc0751f053c528b38f8c68bdcf8f36c8f2fea2fbe1d0ede817a4158a373900c3ba7833d2b2405b95958fa5c5e8535602356bb49276d7949b2ab2 diff --git a/syncthing.spec b/syncthing.spec index 7499737..82805b7 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.20.4 +%global basever 1.21.0 #%%global rcnum 0 Name: syncthing @@ -51,7 +51,7 @@ Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 0.0.10 # github.com/AudriusButkevicius/recli : MPLv2.0 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 +Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = cb9428e # github.com/alecthomas/kong : MIT Provides: bundled(golang(github.com/alecthomas/kong)) = 0.6.1 # github.com/beorn7/perks : MIT @@ -75,13 +75,13 @@ Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/flynn-archive/go-shlex : ASL 2.0 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 # github.com/fsnotify/fsnotify : BSD -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.5.1 +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.5.4 # 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.3 +Provides: bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 1.5.4 # github.com/go-ldap/ldap : MIT -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.1 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.4 # github.com/go-ole/go-ole : MIT Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.6 # github.com/go-task/slim-sprig : MIT @@ -113,13 +113,15 @@ 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.27.0 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.28.1 # github.com/marten-seemann/qtls-go1-16 : BSD 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.1 +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-17)) = 0.1.2 # github.com/marten-seemann/qtls-go1-18 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.1 +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.2 +# github.com/marten-seemann/qtls-go1-19 : BSD +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-19)) = 0.1.0 # 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 @@ -133,7 +135,7 @@ Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/nxadm/tail : MIT Provides: bundled(golang(github.com/nxadm/tail)) = 1.4.8 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.16.4 +Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.16.5 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.5.0 # github.com/oschwald/maxminddb-golang : ISC @@ -161,11 +163,11 @@ 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.12 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.22.6 # 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 +Provides: bundled(golang(github.com/syndtr/goleveldb)) = 126854a # github.com/thejerf/suture : MIT Provides: bundled(golang(github.com/thejerf/suture/v4)) = 4.0.2 # github.com/urfave/cli : MIT @@ -175,34 +177,24 @@ 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 +Provides: bundled(golang(golang.org/x/crypto)) = 630584e # golang.org/x/mod : BSD -Provides: bundled(golang(golang.org/x/mod)) = 0.5.1 +Provides: bundled(golang(golang.org/x/mod)) = 86c51ed # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = 3ad01bb +Provides: bundled(golang(golang.org/x/net)) = 0bcc04d # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = da31bd3 +Provides: bundled(golang(golang.org/x/sys)) = a90be44 # 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.7 -# golang.org/x/xerrors : BSD -Provides: bundled(golang(golang.org/x/xerrors)) = 5ec99f8 +Provides: bundled(golang(golang.org/x/tools)) = 0.1.12 # google.golang.org/protobuf : BSD Provides: bundled(golang(google.golang.org/protobuf)) = 1.27.1 # gopkg.in/tomb.v1 : BSD Provides: bundled(golang(gopkg.in/tomb.v1)) = dd63297 -# an inotify filesystem watcher is integrated with syncthing now -Provides: syncthing-inotify = 0.8.7-5 -Obsoletes: syncthing-inotify < 0.8.7-5 - -# command line interface for syncthing was merged into main binary -Obsoletes: syncthing-cli < 1.15.1-1 - - %description Syncthing replaces other file synchronization services with something open, trustworthy and decentralized. Your data is your data alone and From 6f56e7ced1ce7abb06d623a0604fcb3e35a567fd Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 14 Oct 2022 14:53:35 +0200 Subject: [PATCH 095/133] Update to version 1.22.0; Fixes RHBZ#2132021 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 64 ++++++++++++++++++++++++++------------------------ 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 5e1c889..0ba8fc5 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /syncthing-source-v1.20.3.tar.gz /syncthing-source-v1.20.4.tar.gz /syncthing-source-v1.21.0.tar.gz +/syncthing-source-v1.22.0.tar.gz diff --git a/sources b/sources index b846743..20e7a0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.21.0.tar.gz) = 78d4c6dfc477bc0751f053c528b38f8c68bdcf8f36c8f2fea2fbe1d0ede817a4158a373900c3ba7833d2b2405b95958fa5c5e8535602356bb49276d7949b2ab2 +SHA512 (syncthing-source-v1.22.0.tar.gz) = d1842c4060e646615cd98dadfae0647a37c40284fe1613e141a14d700b81ef7c9900f80429bc6f4a29e75f4a6aa8833470f08ca7916d0746893a2d2061fb67ac diff --git a/syncthing.spec b/syncthing.spec index 82805b7..911eca1 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.21.0 +%global basever 1.22.0 #%%global rcnum 0 Name: syncthing @@ -59,17 +59,15 @@ Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/calmh/xdr : MIT Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 # github.com/ccding/go-stun : ASL 2.0 -Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.3 +Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.4 # github.com/certifi/gocertifi : MPLv2.0 Provides: bundled(golang(github.com/certifi/gocertifi)) = 431795d # github.com/cespare/xxhash : MIT Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.2 -# 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)) = 2.0.1 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.2 # github.com/d4l3k/messagediff : MIT Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/flynn-archive/go-shlex : ASL 2.0 @@ -92,12 +90,14 @@ Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 # github.com/golang/groupcache : ASL 2.0 Provides: bundled(golang(github.com/golang/groupcache)) = 41bb18b +# github.com/golang/mock : ASL 2.0 +Provides: bundled(golang(github.com/golang/mock)) = 1.6.0 # github.com/golang/protobuf : BSD Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.2 # github.com/golang/snappy : BSD Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 # github.com/greatroar/blobloom : ASL 2.0 -Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.0 +Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.1 # github.com/hashicorp/golang-lru : MPLv2.0 Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0.5.4 # github.com/jackpal/gateway : BSD @@ -109,25 +109,21 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.0.9 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.1.1 # github.com/lib/pq : MIT -Provides: bundled(golang(github.com/lib/pq)) = 1.10.3 +Provides: bundled(golang(github.com/lib/pq)) = 1.10.7 # github.com/lucas-clemente/quic-go : MIT -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.28.1 -# github.com/marten-seemann/qtls-go1-16 : BSD -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.2 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.29.0 # github.com/marten-seemann/qtls-go1-18 : BSD Provides: bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.2 # github.com/marten-seemann/qtls-go1-19 : BSD Provides: bundled(golang(github.com/marten-seemann/qtls-go1-19)) = 0.1.0 # github.com/maruel/panicparse : ASL 2.0 -Provides: bundled(golang(github.com/maruel/panicparse)) = 1.6.1 +Provides: bundled(golang(github.com/maruel/panicparse)) = 1.6.2 # github.com/matttproud/golang_protobuf_extensions : ASL 2.0 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.1 # github.com/maxbrunsfeld/counterfeiter : MIT -Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.3.0 +Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.5.0 # github.com/minio/sha256-simd : ASL 2.0 Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 # github.com/miscreant/miscreant.go : MIT @@ -137,25 +133,25 @@ Provides: bundled(golang(github.com/nxadm/tail)) = 1.4.8 # github.com/onsi/ginkgo : MIT Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.16.5 # github.com/oschwald/geoip2-golang : ISC -Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.5.0 +Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.8.0 # github.com/oschwald/maxminddb-golang : ISC -Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.8.0 +Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.10.0 # github.com/petermattis/goid : ASL 2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = b0b1615 +Provides: bundled(golang(github.com/petermattis/goid)) = af55206 # github.com/pierrec/lz4 : BSD -Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.15 +Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.16 # 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 +Provides: bundled(golang(github.com/power-devops/perfstat)) = c35f1ee # github.com/prometheus/client_golang : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.12.2 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.13.0 # 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.32.1 +Provides: bundled(golang(github.com/prometheus/common)) = 0.37.0 # github.com/prometheus/procfs : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.7.3 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.8.0 # github.com/rcrowley/go-metrics : BSD Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD @@ -163,7 +159,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.22.6 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.22.8 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD @@ -171,27 +167,29 @@ Provides: bundled(golang(github.com/syndtr/goleveldb)) = 126854a # github.com/thejerf/suture : MIT 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 +Provides: bundled(golang(github.com/urfave/cli)) = 1.22.10 # 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)) = 630584e +Provides: bundled(golang(golang.org/x/crypto)) = c86fa9a +# golang.org/x/exp : BSD +Provides: bundled(golang(golang.org/x/exp)) = 5c715a9 # golang.org/x/mod : BSD Provides: bundled(golang(golang.org/x/mod)) = 86c51ed # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = 0bcc04d +Provides: bundled(golang(golang.org/x/net)) = bea034e # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = a90be44 +Provides: bundled(golang(golang.org/x/sys)) = 63ea559 # 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 +Provides: bundled(golang(golang.org/x/time)) = e5dcc9c # golang.org/x/tools : BSD Provides: bundled(golang(golang.org/x/tools)) = 0.1.12 # google.golang.org/protobuf : BSD -Provides: bundled(golang(google.golang.org/protobuf)) = 1.27.1 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.28.1 # gopkg.in/tomb.v1 : BSD Provides: bundled(golang(gopkg.in/tomb.v1)) = dd63297 @@ -355,7 +353,11 @@ export GO111MODULE=off %gotest %{goipath}/lib/dialer %gotest %{goipath}/lib/discover %gotest %{goipath}/lib/events -%gotest %{goipath}/lib/fs + +# This test fails on SELinux-enabled systems: +# https://github.com/syncthing/syncthing/issues/8601 +%gotest %{goipath}/lib/fs || : + %gotest %{goipath}/lib/ignore %gotest %{goipath}/lib/logger From 6b1f8ae086caf79fe5e9283677b20f89de57fcbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:29:56 +0000 Subject: [PATCH 096/133] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 52a6f04fcb29ab64f9e6cd2058c73463b90d2edf Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 26 Jan 2023 19:08:16 +0100 Subject: [PATCH 097/133] Update to version 1.23.0; Fixes RHBZ#2139321 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 64 ++++++++++++++++++++++++-------------------------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 0ba8fc5..99cdb46 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /syncthing-source-v1.20.4.tar.gz /syncthing-source-v1.21.0.tar.gz /syncthing-source-v1.22.0.tar.gz +/syncthing-source-v1.23.0.tar.gz diff --git a/sources b/sources index 20e7a0f..dc872bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.22.0.tar.gz) = d1842c4060e646615cd98dadfae0647a37c40284fe1613e141a14d700b81ef7c9900f80429bc6f4a29e75f4a6aa8833470f08ca7916d0746893a2d2061fb67ac +SHA512 (syncthing-source-v1.23.0.tar.gz) = 879492d2b63269cb50746547ddcc98317b9dbad6e6e52d9166d4ccb638973ac11f8f64cd3fcb25206e6ff34601e30dbaa3d10cdf1ac2bac365506bea982ae4b5 diff --git a/syncthing.spec b/syncthing.spec index 911eca1..a6da6de 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.22.0 +%global basever 1.23.0 #%%global rcnum 0 Name: syncthing @@ -51,11 +51,13 @@ Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 0.0.10 # github.com/AudriusButkevicius/recli : MPLv2.0 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.6 # github.com/Azure/go-ntlmssp : MIT -Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = cb9428e +Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693 # github.com/alecthomas/kong : MIT -Provides: bundled(golang(github.com/alecthomas/kong)) = 0.6.1 +Provides: bundled(golang(github.com/alecthomas/kong)) = 0.7.1 # 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)) = b3e71b1 # github.com/calmh/xdr : MIT Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 # github.com/ccding/go-stun : ASL 2.0 @@ -63,7 +65,7 @@ Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.4 # github.com/certifi/gocertifi : MPLv2.0 Provides: bundled(golang(github.com/certifi/gocertifi)) = 431795d # github.com/cespare/xxhash : MIT -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.2 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0 # github.com/chmduquesne/rollinghash : MIT Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7 # github.com/cpuguy83/go-md2man : MIT @@ -72,8 +74,6 @@ Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.2 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/flynn-archive/go-shlex : ASL 2.0 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 -# github.com/fsnotify/fsnotify : BSD -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.5.4 # 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 @@ -96,10 +96,12 @@ Provides: bundled(golang(github.com/golang/mock)) = 1.6.0 Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.2 # github.com/golang/snappy : BSD Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 +# github.com/google/pprof : ASL 2.0 +Provides: bundled(golang(github.com/google/pprof)) = ce31453 # github.com/greatroar/blobloom : ASL 2.0 -Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.1 +Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPLv2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0.5.4 +Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.1 # github.com/jackpal/gateway : BSD Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.7 # github.com/jackpal/go-nat-pmp : ASL 2.0 @@ -109,47 +111,45 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.1.1 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.2 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.7 # github.com/lucas-clemente/quic-go : MIT -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.29.0 +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.31.1 # github.com/marten-seemann/qtls-go1-18 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.2 +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.3 # github.com/marten-seemann/qtls-go1-19 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-19)) = 0.1.0 +Provides: bundled(golang(github.com/marten-seemann/qtls-go1-19)) = 0.1.1 # github.com/maruel/panicparse : ASL 2.0 -Provides: bundled(golang(github.com/maruel/panicparse)) = 1.6.2 +Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 # github.com/matttproud/golang_protobuf_extensions : ASL 2.0 -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.1 +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.4 # github.com/maxbrunsfeld/counterfeiter : MIT Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.5.0 # github.com/minio/sha256-simd : ASL 2.0 Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 -# github.com/nxadm/tail : MIT -Provides: bundled(golang(github.com/nxadm/tail)) = 1.4.8 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.16.5 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.6.0 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.8.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.10.0 # github.com/petermattis/goid : ASL 2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = af55206 +Provides: bundled(golang(github.com/petermattis/goid)) = a449aaf # github.com/pierrec/lz4 : BSD -Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.16 +Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.17 # 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)) = c35f1ee # github.com/prometheus/client_golang : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.13.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.14.0 # github.com/prometheus/client_model : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.2.0 +Provides: bundled(golang(github.com/prometheus/client_model)) = 0.3.0 # github.com/prometheus/common : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.37.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.38.0 # github.com/prometheus/procfs : ASL 2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.8.0 # github.com/rcrowley/go-metrics : BSD @@ -159,7 +159,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.22.8 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.22.11 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD @@ -173,25 +173,23 @@ 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)) = c86fa9a +Provides: bundled(golang(golang.org/x/crypto)) = 0.4.0 # golang.org/x/exp : BSD -Provides: bundled(golang(golang.org/x/exp)) = 5c715a9 +Provides: bundled(golang(golang.org/x/exp)) = ad323de # golang.org/x/mod : BSD -Provides: bundled(golang(golang.org/x/mod)) = 86c51ed +Provides: bundled(golang(golang.org/x/mod)) = 0.7.0 # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = bea034e +Provides: bundled(golang(golang.org/x/net)) = 0.4.0 # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = 63ea559 +Provides: bundled(golang(golang.org/x/sys)) = 0.3.0 # golang.org/x/text: BSD -Provides: bundled(golang(golang.org/x/text)) = 0.3.7 +Provides: bundled(golang(golang.org/x/text)) = 0.5.0 # golang.org/x/time : BSD -Provides: bundled(golang(golang.org/x/time)) = e5dcc9c +Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD -Provides: bundled(golang(golang.org/x/tools)) = 0.1.12 +Provides: bundled(golang(golang.org/x/tools)) = 0.4.0 # google.golang.org/protobuf : BSD Provides: bundled(golang(google.golang.org/protobuf)) = 1.28.1 -# gopkg.in/tomb.v1 : BSD -Provides: bundled(golang(gopkg.in/tomb.v1)) = dd63297 %description Syncthing replaces other file synchronization services with something From cf37d5300ce54e5ae6e5e2bbb98a1dd293ba2968 Mon Sep 17 00:00:00 2001 From: Justin Koh Date: Sat, 24 Dec 2022 03:31:40 +0000 Subject: [PATCH 098/133] Install desktop file icons to correct locations --- syncthing.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/syncthing.spec b/syncthing.spec index a6da6de..cde23f3 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -308,10 +308,11 @@ mkdir -p %{buildroot}/%{_datadir}/applications cp -pav etc/linux-desktop/syncthing-start.desktop %{buildroot}/%{_datadir}/applications/ cp -pav etc/linux-desktop/syncthing-ui.desktop %{buildroot}/%{_datadir}/applications/ -mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32,64,128,256,512,scalable}/apps for size in 32 64 128 256 512; do - cp -pav assets/logo-$size.png %{buildroot}/%{_datadir}/icons/hicolor/$size/apps/syncthing.png + mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/apps + cp -pav assets/logo-${size}.png %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/apps/syncthing.png done +mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps cp -pav assets/logo-only.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/syncthing.svg # install systemd units From aa28fce1d98ea18e01d553d47f1f999f72f44463 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 7 Feb 2023 13:01:25 +0100 Subject: [PATCH 099/133] Update to version 1.23.1 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99cdb46..2acb07c 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /syncthing-source-v1.21.0.tar.gz /syncthing-source-v1.22.0.tar.gz /syncthing-source-v1.23.0.tar.gz +/syncthing-source-v1.23.1.tar.gz diff --git a/sources b/sources index dc872bd..e212bc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.23.0.tar.gz) = 879492d2b63269cb50746547ddcc98317b9dbad6e6e52d9166d4ccb638973ac11f8f64cd3fcb25206e6ff34601e30dbaa3d10cdf1ac2bac365506bea982ae4b5 +SHA512 (syncthing-source-v1.23.1.tar.gz) = 54e6fe1410ede9786a37f47b731354da3cc9b1b974b063c8ce0b9d860c4d880c45e0bcf7884395985ad3c1849bbe7d1b9ec1df458d2c5d2354b65e77c25433a9 diff --git a/syncthing.spec b/syncthing.spec index cde23f3..0bd453f 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.23.0 +%global basever 1.23.1 #%%global rcnum 0 Name: syncthing From 6248ad0989305a9cb2a5006f846722aabe49cb0a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 12 Mar 2023 18:39:36 +0100 Subject: [PATCH 100/133] Update to version 1.23.2; Fixes RHBZ#2167959 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 50 ++++++++++++++++++++++++-------------------------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 2acb07c..60a91cf 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /syncthing-source-v1.22.0.tar.gz /syncthing-source-v1.23.0.tar.gz /syncthing-source-v1.23.1.tar.gz +/syncthing-source-v1.23.2.tar.gz diff --git a/sources b/sources index e212bc7..60dc621 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.23.1.tar.gz) = 54e6fe1410ede9786a37f47b731354da3cc9b1b974b063c8ce0b9d860c4d880c45e0bcf7884395985ad3c1849bbe7d1b9ec1df458d2c5d2354b65e77c25433a9 +SHA512 (syncthing-source-v1.23.2.tar.gz) = aadb6b56791bb2c1d42d2e33a8ccf4ac917893c696aa37bee923c2a190e28cc704cfaaa0cf043469e93cf0502ed48b04386e87db941e885ed4a7ff97170faacd diff --git a/syncthing.spec b/syncthing.spec index 0bd453f..645bfac 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.23.1 +%global basever 1.23.2 #%%global rcnum 0 Name: syncthing @@ -47,7 +47,7 @@ Provides: bundled(moment) = 2.19.4 # generate with "./vendor2provides.py path/to/vendor/modules.txt" # github.com/AudriusButkevicius/pfilter : MIT -Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 0.0.10 +Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 0.0.11 # github.com/AudriusButkevicius/recli : MPLv2.0 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.6 # github.com/Azure/go-ntlmssp : MIT @@ -88,8 +88,6 @@ Provides: bundled(golang(github.com/go-task/slim-sprig)) = 348f09d Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 # github.com/gogo/protobuf : BSD Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 -# github.com/golang/groupcache : ASL 2.0 -Provides: bundled(golang(github.com/golang/groupcache)) = 41bb18b # github.com/golang/mock : ASL 2.0 Provides: bundled(golang(github.com/golang/mock)) = 1.6.0 # github.com/golang/protobuf : BSD @@ -97,7 +95,7 @@ Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.2 # github.com/golang/snappy : BSD Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 # github.com/google/pprof : ASL 2.0 -Provides: bundled(golang(github.com/google/pprof)) = ce31453 +Provides: bundled(golang(github.com/google/pprof)) = 798e818 # github.com/greatroar/blobloom : ASL 2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPLv2.0 @@ -111,15 +109,9 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.2 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.3 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.7 -# github.com/lucas-clemente/quic-go : MIT -Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.31.1 -# github.com/marten-seemann/qtls-go1-18 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-18)) = 0.1.3 -# github.com/marten-seemann/qtls-go1-19 : BSD -Provides: bundled(golang(github.com/marten-seemann/qtls-go1-19)) = 0.1.1 # github.com/maruel/panicparse : ASL 2.0 Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 # github.com/matttproud/golang_protobuf_extensions : ASL 2.0 @@ -131,27 +123,33 @@ Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.6.0 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.8.1 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.8.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.10.0 # github.com/petermattis/goid : ASL 2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = a449aaf +Provides: bundled(golang(github.com/petermattis/goid)) = a150e88 # github.com/pierrec/lz4 : BSD Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.17 # 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)) = c35f1ee +Provides: bundled(golang(github.com/power-devops/perfstat)) = 62379fc # github.com/prometheus/client_golang : ASL 2.0 Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.14.0 # github.com/prometheus/client_model : ASL 2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.3.0 # github.com/prometheus/common : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.38.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.39.0 # github.com/prometheus/procfs : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.8.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.9.0 +# github.com/quic-go/qtls-go1-19 : BSD-3-Clause +Provides: bundled(golang(github.com/quic-go/qtls-go1-19)) = 0.2.1 +# github.com/quic-go/qtls-go1-20 : BSD-3-Clause +Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.1.1 +# github.com/quic-go/quic-go : MIT +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.33.0 # github.com/rcrowley/go-metrics : BSD Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD @@ -159,7 +157,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.22.11 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.1 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD @@ -167,27 +165,27 @@ Provides: bundled(golang(github.com/syndtr/goleveldb)) = 126854a # github.com/thejerf/suture : MIT 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.10 +Provides: bundled(golang(github.com/urfave/cli)) = 1.22.12 # 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)) = 0.4.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.6.0 # golang.org/x/exp : BSD -Provides: bundled(golang(golang.org/x/exp)) = ad323de +Provides: bundled(golang(golang.org/x/exp)) = 5e25df0 # golang.org/x/mod : BSD -Provides: bundled(golang(golang.org/x/mod)) = 0.7.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.8.0 # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = 0.4.0 +Provides: bundled(golang(golang.org/x/net)) = 0.7.0 # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = 0.3.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.5.0 # golang.org/x/text: BSD -Provides: bundled(golang(golang.org/x/text)) = 0.5.0 +Provides: bundled(golang(golang.org/x/text)) = 0.7.0 # golang.org/x/time : BSD Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD -Provides: bundled(golang(golang.org/x/tools)) = 0.4.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.6.0 # google.golang.org/protobuf : BSD Provides: bundled(golang(google.golang.org/protobuf)) = 1.28.1 From 73bf19b2941f89e1c81eb62a7d2f40258c770b4b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 12 Apr 2023 16:39:29 +0200 Subject: [PATCH 101/133] Update to version 1.23.4; Fixes RHBZ#2184805 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 36 ++++++++++++++++++------------------ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 60a91cf..9159715 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /syncthing-source-v1.23.0.tar.gz /syncthing-source-v1.23.1.tar.gz /syncthing-source-v1.23.2.tar.gz +/syncthing-source-v1.23.4.tar.gz diff --git a/sources b/sources index 60dc621..5cd3c29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.23.2.tar.gz) = aadb6b56791bb2c1d42d2e33a8ccf4ac917893c696aa37bee923c2a190e28cc704cfaaa0cf043469e93cf0502ed48b04386e87db941e885ed4a7ff97170faacd +SHA512 (syncthing-source-v1.23.4.tar.gz) = cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3 diff --git a/syncthing.spec b/syncthing.spec index 645bfac..cb4d6e2 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.23.2 +%global basever 1.23.4 #%%global rcnum 0 Name: syncthing @@ -67,7 +67,7 @@ Provides: bundled(golang(github.com/certifi/gocertifi)) = 431795d # github.com/cespare/xxhash : MIT Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0 # github.com/chmduquesne/rollinghash : MIT -Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7 +Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 4.0.0+incompatible # github.com/cpuguy83/go-md2man : MIT Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.2 # github.com/d4l3k/messagediff : MIT @@ -91,15 +91,15 @@ Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 # github.com/golang/mock : ASL 2.0 Provides: bundled(golang(github.com/golang/mock)) = 1.6.0 # github.com/golang/protobuf : BSD -Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.2 +Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 # github.com/golang/snappy : BSD Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 # github.com/google/pprof : ASL 2.0 -Provides: bundled(golang(github.com/google/pprof)) = 798e818 +Provides: bundled(golang(github.com/google/pprof)) = d61513b # github.com/greatroar/blobloom : ASL 2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPLv2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.1 +Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.2 # github.com/jackpal/gateway : BSD Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.7 # github.com/jackpal/go-nat-pmp : ASL 2.0 @@ -109,7 +109,7 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.3 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.4 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.7 # github.com/maruel/panicparse : ASL 2.0 @@ -123,13 +123,13 @@ Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.8.1 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.9.0 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.8.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.10.0 # github.com/petermattis/goid : ASL 2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = a150e88 +Provides: bundled(golang(github.com/petermattis/goid)) = 8ff7bb2 # github.com/pierrec/lz4 : BSD Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.17 # github.com/pkg/errors : BSD @@ -141,7 +141,7 @@ Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.14.0 # github.com/prometheus/client_model : ASL 2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.3.0 # github.com/prometheus/common : ASL 2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.39.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.42.0 # github.com/prometheus/procfs : ASL 2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.9.0 # github.com/quic-go/qtls-go1-19 : BSD-3-Clause @@ -157,7 +157,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.23.1 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.2 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD @@ -171,23 +171,23 @@ 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)) = 0.6.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.7.0 # golang.org/x/exp : BSD -Provides: bundled(golang(golang.org/x/exp)) = 5e25df0 +Provides: bundled(golang(golang.org/x/exp)) = 24139be # golang.org/x/mod : BSD -Provides: bundled(golang(golang.org/x/mod)) = 0.8.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.9.0 # golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net)) = 0.8.0 # golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = 0.5.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.6.0 # golang.org/x/text: BSD -Provides: bundled(golang(golang.org/x/text)) = 0.7.0 +Provides: bundled(golang(golang.org/x/text)) = 0.8.0 # golang.org/x/time : BSD Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD -Provides: bundled(golang(golang.org/x/tools)) = 0.6.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.7.0 # google.golang.org/protobuf : BSD -Provides: bundled(golang(google.golang.org/protobuf)) = 1.28.1 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.29.0 %description Syncthing replaces other file synchronization services with something From 119fee3d578895566c3ccbe835915a6e281884b5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 7 Jun 2023 11:59:26 +0200 Subject: [PATCH 102/133] Update to version 1.23.5; Fixes RHBZ#2213024 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 126 ++++++++++++++++++++++++------------------------- 3 files changed, 65 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index 9159715..4256594 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /syncthing-source-v1.23.1.tar.gz /syncthing-source-v1.23.2.tar.gz /syncthing-source-v1.23.4.tar.gz +/syncthing-source-v1.23.5.tar.gz diff --git a/sources b/sources index 5cd3c29..22a5b41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.23.4.tar.gz) = cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3 +SHA512 (syncthing-source-v1.23.5.tar.gz) = ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc diff --git a/syncthing.spec b/syncthing.spec index cb4d6e2..06d968c 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.23.4 +%global basever 1.23.5 #%%global rcnum 0 Name: syncthing @@ -13,11 +13,11 @@ Release: %autorelease %gometa -f -# syncthing (MPLv2.0) bundles +# syncthing (MPL-2.0) bundles # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT), -# - 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 ISC) -License: MPLv2.0 and MIT and OFL and CC-BY and BSD and ASL 2.0 and ISC +# - 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 MPL-2.0 AND OFL-1.1 URL: https://syncthing.net # use official release tarball (contains vendored dependencies) @@ -48,8 +48,8 @@ Provides: bundled(moment) = 2.19.4 # github.com/AudriusButkevicius/pfilter : MIT Provides: bundled(golang(github.com/AudriusButkevicius/pfilter)) = 0.0.11 -# github.com/AudriusButkevicius/recli : MPLv2.0 -Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.6 +# github.com/AudriusButkevicius/recli : MPL-2.0 +Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # github.com/Azure/go-ntlmssp : MIT Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693 # github.com/alecthomas/kong : MIT @@ -60,9 +60,9 @@ Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 Provides: bundled(golang(github.com/calmh/incontainer)) = b3e71b1 # github.com/calmh/xdr : MIT Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 -# github.com/ccding/go-stun : ASL 2.0 +# github.com/ccding/go-stun : Apache-2.0 Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.4 -# github.com/certifi/gocertifi : MPLv2.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.2.0 @@ -72,9 +72,9 @@ Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 4.0.0+inco Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.2 # github.com/d4l3k/messagediff : MIT Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 -# github.com/flynn-archive/go-shlex : ASL 2.0 +# github.com/flynn-archive/go-shlex : Apache-2.0 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 -# github.com/getsentry/raven-go : BSD +# 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)) = 1.5.4 @@ -83,28 +83,28 @@ Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.4 # github.com/go-ole/go-ole : MIT 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 +Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 # github.com/gobwas/glob : MIT Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 -# github.com/gogo/protobuf : BSD +# github.com/gogo/protobuf : BSD-3-Clause Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 -# github.com/golang/mock : ASL 2.0 +# github.com/golang/mock : Apache-2.0 Provides: bundled(golang(github.com/golang/mock)) = 1.6.0 -# github.com/golang/protobuf : BSD +# github.com/golang/protobuf : BSD-3-Clause Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 -# github.com/golang/snappy : BSD +# github.com/golang/snappy : BSD-3-Clause Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 -# github.com/google/pprof : ASL 2.0 -Provides: bundled(golang(github.com/google/pprof)) = d61513b -# github.com/greatroar/blobloom : ASL 2.0 +# github.com/google/pprof : Apache-2.0 +Provides: bundled(golang(github.com/google/pprof)) = 00490a6 +# github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 -# github.com/hashicorp/golang-lru : MPLv2.0 +# github.com/hashicorp/golang-lru : MPL-2.0 Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.2 -# github.com/jackpal/gateway : BSD -Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.7 -# github.com/jackpal/go-nat-pmp : ASL 2.0 +# github.com/jackpal/gateway : BSD-3-Clause +Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.10 +# github.com/jackpal/go-nat-pmp : Apache-2.0 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 -# github.com/julienschmidt/httprouter : BSD +# 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 @@ -112,82 +112,82 @@ Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a8 Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.4 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.7 -# github.com/maruel/panicparse : ASL 2.0 +# github.com/maruel/panicparse : Apache-2.0 Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 -# github.com/matttproud/golang_protobuf_extensions : ASL 2.0 +# github.com/matttproud/golang_protobuf_extensions : Apache-2.0 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.4 # github.com/maxbrunsfeld/counterfeiter : MIT Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.5.0 -# github.com/minio/sha256-simd : ASL 2.0 +# github.com/minio/sha256-simd : Apache-2.0 Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.9.0 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.9.2 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.8.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.10.0 -# github.com/petermattis/goid : ASL 2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = 8ff7bb2 -# github.com/pierrec/lz4 : BSD +# github.com/petermattis/goid : Apache-2.0 +Provides: bundled(golang(github.com/petermattis/goid)) = 371a4b8 +# github.com/pierrec/lz4 : BSD-3-Clause Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.17 -# github.com/pkg/errors : BSD +# github.com/pkg/errors : BSD-2-Clause Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 # github.com/power-devops/perfstat : MIT Provides: bundled(golang(github.com/power-devops/perfstat)) = 62379fc -# github.com/prometheus/client_golang : ASL 2.0 +# github.com/prometheus/client_golang : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.14.0 -# github.com/prometheus/client_model : ASL 2.0 +# github.com/prometheus/client_model : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.3.0 -# github.com/prometheus/common : ASL 2.0 +# github.com/prometheus/common : Apache-2.0 Provides: bundled(golang(github.com/prometheus/common)) = 0.42.0 -# github.com/prometheus/procfs : ASL 2.0 +# github.com/prometheus/procfs : Apache-2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.9.0 # github.com/quic-go/qtls-go1-19 : BSD-3-Clause -Provides: bundled(golang(github.com/quic-go/qtls-go1-19)) = 0.2.1 +Provides: bundled(golang(github.com/quic-go/qtls-go1-19)) = 0.3.2 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause -Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.1.1 +Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.2.2 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.33.0 -# github.com/rcrowley/go-metrics : BSD +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.34.0 +# github.com/rcrowley/go-metrics : BSD-2-Clause-Views Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc -# github.com/russross/blackfriday : BSD +# github.com/russross/blackfriday : BSD-2-Clause Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 -# github.com/sasha-s/go-deadlock : ASL 2.0 +# github.com/sasha-s/go-deadlock : Apache-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.23.2 +# github.com/shirou/gopsutil : BSD-3-Clause +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.3 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 -# github.com/syndtr/goleveldb : BSD +# 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.2 # github.com/urfave/cli : MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.12 -# github.com/vitrun/qart : ASL 2.0 and BSD +# github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause 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)) = 0.7.0 -# golang.org/x/exp : BSD -Provides: bundled(golang(golang.org/x/exp)) = 24139be -# golang.org/x/mod : BSD -Provides: bundled(golang(golang.org/x/mod)) = 0.9.0 -# golang.org/x/net : BSD -Provides: bundled(golang(golang.org/x/net)) = 0.8.0 -# golang.org/x/sys : BSD -Provides: bundled(golang(golang.org/x/sys)) = 0.6.0 -# golang.org/x/text: BSD -Provides: bundled(golang(golang.org/x/text)) = 0.8.0 -# golang.org/x/time : BSD +# golang.org/x/crypto : BSD-3-Clause +Provides: bundled(golang(golang.org/x/crypto)) = 0.8.0 +# golang.org/x/exp : BSD-3-Clause +Provides: bundled(golang(golang.org/x/exp)) = 10a5072 +# golang.org/x/mod : BSD-3-Clause +Provides: bundled(golang(golang.org/x/mod)) = 0.10.0 +# golang.org/x/net : BSD-3-Clause +Provides: bundled(golang(golang.org/x/net)) = 0.9.0 +# golang.org/x/sys : BSD-3-Clause +Provides: bundled(golang(golang.org/x/sys)) = 0.7.0 +# golang.org/x/text : BSD-3-Clause +Provides: bundled(golang(golang.org/x/text)) = 0.9.0 +# golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.3.0 -# golang.org/x/tools : BSD -Provides: bundled(golang(golang.org/x/tools)) = 0.7.0 -# google.golang.org/protobuf : BSD -Provides: bundled(golang(google.golang.org/protobuf)) = 1.29.0 +# golang.org/x/tools : BSD-3-Clause +Provides: bundled(golang(golang.org/x/tools)) = 0.8.0 +# google.golang.org/protobuf : BSD-3-Clause +Provides: bundled(golang(google.golang.org/protobuf)) = 1.30.0 %description Syncthing replaces other file synchronization services with something From e815c48fad6d0290bb2e47089137b739536c5082 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 7 Jul 2023 23:18:12 +0200 Subject: [PATCH 103/133] Update to version 1.23.6; Fixes RHBZ#2219420 --- .gitignore | 1 + 0d64427.patch | 104 --------------------------------------------- README.md | 2 + sources | 2 +- syncthing.spec | 42 +++++++++--------- vendor2provides.py | 3 +- 6 files changed, 27 insertions(+), 127 deletions(-) delete mode 100644 0d64427.patch diff --git a/.gitignore b/.gitignore index 4256594..5fa6479 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /syncthing-source-v1.23.2.tar.gz /syncthing-source-v1.23.4.tar.gz /syncthing-source-v1.23.5.tar.gz +/syncthing-source-v1.23.6.tar.gz diff --git a/0d64427.patch b/0d64427.patch deleted file mode 100644 index 6bc6c77..0000000 --- a/0d64427.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 0d6442721aecadf685a16cca0ef874df468b2009 Mon Sep 17 00:00:00 2001 -From: Simon Frei -Date: Tue, 3 Dec 2019 15:11:39 +0100 -Subject: [PATCH] lib/protocol: Decrease runtime/mem usage of bufferpool - stresstest (ref #6209) - ---- - lib/protocol/bufferpool_test.go | 58 +++++++++++++++++++++------------ - 1 file changed, 38 insertions(+), 20 deletions(-) - -diff --git a/lib/protocol/bufferpool_test.go b/lib/protocol/bufferpool_test.go -index ab889ba88f..f7c6f67ce3 100644 ---- a/lib/protocol/bufferpool_test.go -+++ b/lib/protocol/bufferpool_test.go -@@ -3,7 +3,6 @@ - package protocol - - import ( -- "sync" - "testing" - "time" - -@@ -70,18 +69,47 @@ func TestStressBufferPool(t *testing.T) { - } - - const routines = 10 -- const runtime = 2 * time.Second - - bp := newBufferPool() -- t0 := time.Now() - -- var wg sync.WaitGroup -+ timeout := time.After(2 * time.Second) -+ done := make(chan struct{}) -+ checkDone := func() bool { -+ if bp.puts == 0 || bp.skips == 0 || bp.misses == 0 { -+ return false -+ } -+ var hits int64 -+ for _, h := range bp.hits { -+ hits += h -+ } -+ return hits > 0 -+ } -+ -+ go func() { -+ for { -+ select { -+ case <-time.After(50 * time.Millisecond): -+ if checkDone() { -+ close(done) -+ return -+ } -+ case <-timeout: -+ return -+ } -+ } -+ }() -+ - fail := make(chan struct{}, routines) - for i := 0; i < routines; i++ { -- wg.Add(1) - go func() { -- defer wg.Done() -- for time.Since(t0) < runtime { -+ for { -+ select { -+ case <-done: -+ return -+ case <-timeout: -+ return -+ default: -+ } - blocks := make([][]byte, 10) - for i := range blocks { - // Request a block of random size with the range -@@ -101,24 +129,14 @@ func TestStressBufferPool(t *testing.T) { - }() - } - -- wg.Wait() - select { - case <-fail: - t.Fatal("a block was bad size") -+ case <-done: -+ case <-timeout: -+ t.Fatal("timed out before exercising all paths") - default: - } -- -- t.Log(bp.puts, bp.skips, bp.misses, bp.hits) -- if bp.puts == 0 || bp.skips == 0 || bp.misses == 0 { -- t.Error("didn't exercise some paths") -- } -- var hits int64 -- for _, h := range bp.hits { -- hits += h -- } -- if hits == 0 { -- t.Error("didn't exercise some paths") -- } - } - - func shouldPanic(t *testing.T, fn func()) { diff --git a/README.md b/README.md index 7864bd6..320aafb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# syncthing + ## Usage By default, the syncthing service isn't enabled after installation. Depending on diff --git a/sources b/sources index 22a5b41..58c7a81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.23.5.tar.gz) = ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc +SHA512 (syncthing-source-v1.23.6.tar.gz) = 32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796 diff --git a/syncthing.spec b/syncthing.spec index 06d968c..5540fe1 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.23.5 +%global basever 1.23.6 #%%global rcnum 0 Name: syncthing @@ -79,7 +79,7 @@ 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.4 # github.com/go-ldap/ldap : MIT -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.4 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.5 # github.com/go-ole/go-ole : MIT Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.6 # github.com/go-task/slim-sprig : MIT @@ -99,7 +99,7 @@ Provides: bundled(golang(github.com/google/pprof)) = 00490a6 # github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPL-2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.2 +Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.3 # github.com/jackpal/gateway : BSD-3-Clause Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.10 # github.com/jackpal/go-nat-pmp : Apache-2.0 @@ -109,9 +109,9 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.4 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.5 # github.com/lib/pq : MIT -Provides: bundled(golang(github.com/lib/pq)) = 1.10.7 +Provides: bundled(golang(github.com/lib/pq)) = 1.10.9 # github.com/maruel/panicparse : Apache-2.0 Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 # github.com/matttproud/golang_protobuf_extensions : Apache-2.0 @@ -119,17 +119,17 @@ Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions) # github.com/maxbrunsfeld/counterfeiter : MIT Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.5.0 # github.com/minio/sha256-simd : Apache-2.0 -Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.0 +Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.9.2 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.10.0 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.8.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.10.0 # github.com/petermattis/goid : Apache-2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = 371a4b8 +Provides: bundled(golang(github.com/petermattis/goid)) = 80aa455 # github.com/pierrec/lz4 : BSD-3-Clause Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.17 # github.com/pkg/errors : BSD-2-Clause @@ -137,13 +137,13 @@ Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 # github.com/power-devops/perfstat : MIT Provides: bundled(golang(github.com/power-devops/perfstat)) = 62379fc # github.com/prometheus/client_golang : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.14.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.15.1 # github.com/prometheus/client_model : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.3.0 +Provides: bundled(golang(github.com/prometheus/client_model)) = 0.4.0 # github.com/prometheus/common : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.42.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.44.0 # github.com/prometheus/procfs : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.9.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.10.1 # github.com/quic-go/qtls-go1-19 : BSD-3-Clause Provides: bundled(golang(github.com/quic-go/qtls-go1-19)) = 0.3.2 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause @@ -157,7 +157,7 @@ Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 # github.com/sasha-s/go-deadlock : Apache-2.0 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1 # github.com/shirou/gopsutil : BSD-3-Clause -Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.3 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.5 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD-2-Clause @@ -165,27 +165,27 @@ Provides: bundled(golang(github.com/syndtr/goleveldb)) = 126854a # github.com/thejerf/suture : MIT 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.12 +Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 # github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92 # github.com/yusufpapurcu/wmi : MIT -Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.2 +Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.8.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.10.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 10a5072 +Provides: bundled(golang(golang.org/x/exp)) = 2e198f4 # golang.org/x/mod : BSD-3-Clause Provides: bundled(golang(golang.org/x/mod)) = 0.10.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.9.0 +Provides: bundled(golang(golang.org/x/net)) = 0.11.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.7.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.9.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.9.0 +Provides: bundled(golang(golang.org/x/text)) = 0.10.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.8.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.9.3 # google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.30.0 diff --git a/vendor2provides.py b/vendor2provides.py index d4fc942..ce1afb8 100755 --- a/vendor2provides.py +++ b/vendor2provides.py @@ -6,7 +6,8 @@ # Parse modules.txt files into rpm .spec file Provides for bundled dependencies. # Written by Fabio "decathorpe" Valentini for # the fedora syncthing package: https://src.fedoraproject.org/rpms/syncthing -# SPDX-License-Identifier: CC0-1.0 OR Unlicense +# +# SPDX-License-Identifier: Unlicense import os import sys From db8e12f6f4711a1c47551791f05c09827b5a583c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 03:01:06 +0000 Subject: [PATCH 104/133] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From ba7ad2bfebf1cd4d174e065e9e62e2330a6ddc69 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 1 Sep 2023 21:08:36 +0200 Subject: [PATCH 105/133] Update to version 1.23.7; Fixes RHBZ#2230629 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 38 +++++++++++++++++++------------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 5fa6479..ea0978e 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ /syncthing-source-v1.23.4.tar.gz /syncthing-source-v1.23.5.tar.gz /syncthing-source-v1.23.6.tar.gz +/syncthing-source-v1.23.7.tar.gz diff --git a/sources b/sources index 58c7a81..d175791 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.23.6.tar.gz) = 32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796 +SHA512 (syncthing-source-v1.23.7.tar.gz) = c52a0e80eb572b2f59b0be2222244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e diff --git a/syncthing.spec b/syncthing.spec index 5540fe1..7619c20 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.23.6 +%global basever 1.23.7 #%%global rcnum 0 Name: syncthing @@ -53,7 +53,7 @@ Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # 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)) = 0.7.1 +Provides: bundled(golang(github.com/alecthomas/kong)) = 0.8.0 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/calmh/incontainer : MIT @@ -95,11 +95,11 @@ Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 # 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)) = 00490a6 +Provides: bundled(golang(github.com/google/pprof)) = 200ffdc # github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPL-2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.3 +Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.4 # github.com/jackpal/gateway : BSD-3-Clause Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.10 # github.com/jackpal/go-nat-pmp : Apache-2.0 @@ -123,27 +123,27 @@ Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.10.0 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.11.0 # github.com/oschwald/geoip2-golang : ISC -Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.8.0 +Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 # github.com/oschwald/maxminddb-golang : ISC -Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.10.0 +Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.11.0 # github.com/petermattis/goid : Apache-2.0 Provides: bundled(golang(github.com/petermattis/goid)) = 80aa455 # github.com/pierrec/lz4 : BSD-3-Clause -Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.17 +Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.18 # github.com/pkg/errors : BSD-2-Clause Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 # github.com/power-devops/perfstat : MIT Provides: bundled(golang(github.com/power-devops/perfstat)) = 62379fc # github.com/prometheus/client_golang : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.15.1 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.16.0 # github.com/prometheus/client_model : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.4.0 # github.com/prometheus/common : Apache-2.0 Provides: bundled(golang(github.com/prometheus/common)) = 0.44.0 # github.com/prometheus/procfs : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.10.1 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.11.0 # github.com/quic-go/qtls-go1-19 : BSD-3-Clause Provides: bundled(golang(github.com/quic-go/qtls-go1-19)) = 0.3.2 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause @@ -157,7 +157,7 @@ Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 # github.com/sasha-s/go-deadlock : Apache-2.0 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1 # github.com/shirou/gopsutil : BSD-3-Clause -Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.5 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.6 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD-2-Clause @@ -171,23 +171,23 @@ Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92 # github.com/yusufpapurcu/wmi : MIT Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.10.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.11.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 2e198f4 +Provides: bundled(golang(golang.org/x/exp)) = fffb143 # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.10.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.11.0 +Provides: bundled(golang(golang.org/x/net)) = 0.12.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.9.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.10.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.10.0 +Provides: bundled(golang(golang.org/x/text)) = 0.11.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.9.3 +Provides: bundled(golang(golang.org/x/tools)) = 0.11.0 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.30.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 %description Syncthing replaces other file synchronization services with something From 13dbff091fba82d6505713c8c45ff7dbac11cf00 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 17 Sep 2023 11:46:19 +0200 Subject: [PATCH 106/133] Update to version 1.24.0; Fixes RHBZ#2237824 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 43 +++++++++++++++++++++---------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index ea0978e..11332a3 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /syncthing-source-v1.23.5.tar.gz /syncthing-source-v1.23.6.tar.gz /syncthing-source-v1.23.7.tar.gz +/syncthing-source-v1.24.0.tar.gz diff --git a/sources b/sources index d175791..cf7e76f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.23.7.tar.gz) = c52a0e80eb572b2f59b0be2222244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e +SHA512 (syncthing-source-v1.24.0.tar.gz) = bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908 diff --git a/syncthing.spec b/syncthing.spec index 7619c20..b06ac98 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.23.7 +%global basever 1.24.0 #%%global rcnum 0 Name: syncthing @@ -17,7 +17,7 @@ Release: %autorelease # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT), # - 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 MPL-2.0 AND OFL-1.1 +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 URL: https://syncthing.net # use official release tarball (contains vendored dependencies) @@ -46,8 +46,6 @@ Provides: bundled(moment) = 2.19.4 # 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)) = 0.0.11 # github.com/AudriusButkevicius/recli : MPL-2.0 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # github.com/Azure/go-ntlmssp : MIT @@ -81,7 +79,7 @@ Provides: bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 1.5.4 # github.com/go-ldap/ldap : MIT Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.5 # github.com/go-ole/go-ole : MIT -Provides: bundled(golang(github.com/go-ole/go-ole)) = 1.2.6 +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)) = 52ccab3 # github.com/gobwas/glob : MIT @@ -95,11 +93,11 @@ Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 # 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)) = 200ffdc +Provides: bundled(golang(github.com/google/pprof)) = 407c9e7 # github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPL-2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.4 +Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.5 # github.com/jackpal/gateway : BSD-3-Clause Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.10 # github.com/jackpal/go-nat-pmp : Apache-2.0 @@ -127,9 +125,9 @@ Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.11.0 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 # github.com/oschwald/maxminddb-golang : ISC -Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.11.0 +Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.12.0 # github.com/petermattis/goid : Apache-2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = 80aa455 +Provides: bundled(golang(github.com/petermattis/goid)) = b036b71 # github.com/pierrec/lz4 : BSD-3-Clause Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.18 # github.com/pkg/errors : BSD-2-Clause @@ -143,13 +141,11 @@ Provides: bundled(golang(github.com/prometheus/client_model)) = 0.4.0 # github.com/prometheus/common : Apache-2.0 Provides: bundled(golang(github.com/prometheus/common)) = 0.44.0 # github.com/prometheus/procfs : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.11.0 -# github.com/quic-go/qtls-go1-19 : BSD-3-Clause -Provides: bundled(golang(github.com/quic-go/qtls-go1-19)) = 0.3.2 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.11.1 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause -Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.2.2 +Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.3.2 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.34.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.38.0 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD-2-Clause @@ -157,7 +153,7 @@ Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 # github.com/sasha-s/go-deadlock : Apache-2.0 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1 # github.com/shirou/gopsutil : BSD-3-Clause -Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.6 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.7 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD-2-Clause @@ -171,21 +167,21 @@ Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92 # github.com/yusufpapurcu/wmi : MIT Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.11.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.12.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = fffb143 +Provides: bundled(golang(golang.org/x/exp)) = d852ddb # golang.org/x/mod : BSD-3-Clause Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net)) = 0.14.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.10.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.11.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.11.0 +Provides: bundled(golang(golang.org/x/text)) = 0.12.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.11.0 +Provides: bundled(golang(golang.org/x/tools)) = 74c255b # google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 @@ -370,14 +366,17 @@ export GO111MODULE=off %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/stats +%gotest %{goipath}/lib/stringutil +%gotest %{goipath}/lib/structutil +%gotest %{goipath}/lib/svcutil %gotest %{goipath}/lib/sync %gotest %{goipath}/lib/syncthing %gotest %{goipath}/lib/tlsutil %gotest %{goipath}/lib/upgrade %gotest %{goipath}/lib/upnp -%gotest %{goipath}/lib/util # This test sometimes fails dependent on load on some architectures: # https://github.com/syncthing/syncthing/issues/4351 From af64b555005347d73369cdc14e7a552c5516aad8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 28 Oct 2023 00:08:24 +0200 Subject: [PATCH 107/133] Update to version 1.25.0; Fixes RHBZ#2242032 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 38 +++++++++++++++++++++----------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 11332a3..e3eaf9e 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ /syncthing-source-v1.23.6.tar.gz /syncthing-source-v1.23.7.tar.gz /syncthing-source-v1.24.0.tar.gz +/syncthing-source-v1.25.0.tar.gz diff --git a/sources b/sources index cf7e76f..3bfa078 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.24.0.tar.gz) = bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908 +SHA512 (syncthing-source-v1.25.0.tar.gz) = f9f36bd9a98afda1b48c24ded94b1ba8fd8a0b0c426f6335827fc1b0508845d46f05b69aad05d2127afbca5f10c9b0ba40727f8ed68e35616306396a8287500f diff --git a/syncthing.spec b/syncthing.spec index b06ac98..83d9f1e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.24.0 +%global basever 1.25.0 #%%global rcnum 0 Name: syncthing @@ -75,9 +75,9 @@ Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 # 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)) = 1.5.4 +Provides: bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 1.5.5 # github.com/go-ldap/ldap : MIT -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.5 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.6 # 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 @@ -93,11 +93,13 @@ Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 # 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)) = 407c9e7 +Provides: bundled(golang(github.com/google/pprof)) = c363fe2 +# github.com/google/uuid : BSD-3-Clause +Provides: bundled(golang(github.com/google/uuid)) = 1.3.1 # github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPL-2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.5 +Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.6 # github.com/jackpal/gateway : BSD-3-Clause Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.10 # github.com/jackpal/go-nat-pmp : Apache-2.0 @@ -121,13 +123,13 @@ Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.11.0 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.12.1 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.12.0 # github.com/petermattis/goid : Apache-2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = b036b71 +Provides: bundled(golang(github.com/petermattis/goid)) = 1876fd5 # github.com/pierrec/lz4 : BSD-3-Clause Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.18 # github.com/pkg/errors : BSD-2-Clause @@ -141,11 +143,11 @@ Provides: bundled(golang(github.com/prometheus/client_model)) = 0.4.0 # github.com/prometheus/common : Apache-2.0 Provides: bundled(golang(github.com/prometheus/common)) = 0.44.0 # github.com/prometheus/procfs : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.11.1 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause -Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.3.2 +Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.3.4 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.38.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.39.0 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD-2-Clause @@ -153,7 +155,7 @@ Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 # github.com/sasha-s/go-deadlock : Apache-2.0 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1 # github.com/shirou/gopsutil : BSD-3-Clause -Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.7 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.8 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD-2-Clause @@ -166,22 +168,24 @@ Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 Provides: bundled(golang(github.com/vitrun/qart)) = bf64b92 # github.com/yusufpapurcu/wmi : MIT Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 +# go.uber.org/mock : Apache-2.0 +Provides: bundled(golang(go.uber.org/mock)) = 0.3.0 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.12.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.13.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = d852ddb +Provides: bundled(golang(golang.org/x/exp)) = 9212866 # golang.org/x/mod : BSD-3-Clause Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.14.0 +Provides: bundled(golang(golang.org/x/net)) = 0.15.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.11.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.12.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.12.0 +Provides: bundled(golang(golang.org/x/text)) = 0.13.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 74c255b +Provides: bundled(golang(golang.org/x/tools)) = 0.13.0 # google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 From 3d87acc555d18775c9a349fa0e36a505afeaf1bb Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 28 Oct 2023 00:36:00 +0200 Subject: [PATCH 108/133] Ignore some test timeouts on s390x --- syncthing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 83d9f1e..1e3ff94 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -345,7 +345,10 @@ export GO111MODULE=off %gotest %{goipath}/lib/api %gotest %{goipath}/lib/beacon %gotest %{goipath}/lib/config -%gotest %{goipath}/lib/connections + +# This test times out on s390x +%gotest %{goipath}/lib/connections || : + %gotest %{goipath}/lib/db %gotest %{goipath}/lib/dialer %gotest %{goipath}/lib/discover From ca5111f04150549005ff39adef7dc563281acda3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 9 Nov 2023 13:14:11 +0100 Subject: [PATCH 109/133] Update to version 1.26.0; Fixes RHBZ#2248507 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 34 ++++++++++++++++------------------ 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index e3eaf9e..75db33d 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /syncthing-source-v1.23.7.tar.gz /syncthing-source-v1.24.0.tar.gz /syncthing-source-v1.25.0.tar.gz +/syncthing-source-v1.26.0.tar.gz diff --git a/sources b/sources index 3bfa078..964d809 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.25.0.tar.gz) = f9f36bd9a98afda1b48c24ded94b1ba8fd8a0b0c426f6335827fc1b0508845d46f05b69aad05d2127afbca5f10c9b0ba40727f8ed68e35616306396a8287500f +SHA512 (syncthing-source-v1.26.0.tar.gz) = fa67b88650142eca7acb50635c205eeb8fc845346f68241f3ac32db8c9c6cb47d274c26f75d3c79bd7110c92aa40f702a298c37adac53719876d02b3bf337e8e diff --git a/syncthing.spec b/syncthing.spec index 1e3ff94..c18e440 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.25.0 +%global basever 1.26.0 #%%global rcnum 0 Name: syncthing @@ -51,7 +51,7 @@ Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # 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)) = 0.8.0 +Provides: bundled(golang(github.com/alecthomas/kong)) = 0.8.1 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/calmh/incontainer : MIT @@ -67,7 +67,7 @@ Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0 # github.com/chmduquesne/rollinghash : MIT Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 4.0.0+incompatible # github.com/cpuguy83/go-md2man : MIT -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.2 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.3 # github.com/d4l3k/messagediff : MIT Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/flynn-archive/go-shlex : Apache-2.0 @@ -86,20 +86,18 @@ Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 # github.com/gogo/protobuf : BSD-3-Clause Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 -# github.com/golang/mock : Apache-2.0 -Provides: bundled(golang(github.com/golang/mock)) = 1.6.0 # github.com/golang/protobuf : BSD-3-Clause Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 # 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)) = c363fe2 +Provides: bundled(golang(github.com/google/pprof)) = f7f687d # github.com/google/uuid : BSD-3-Clause Provides: bundled(golang(github.com/google/uuid)) = 1.3.1 # github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPL-2.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.6 +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.10 # github.com/jackpal/go-nat-pmp : Apache-2.0 @@ -123,7 +121,7 @@ Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.12.1 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.0 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 # github.com/oschwald/maxminddb-golang : ISC @@ -137,9 +135,9 @@ Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 # github.com/power-devops/perfstat : MIT Provides: bundled(golang(github.com/power-devops/perfstat)) = 62379fc # github.com/prometheus/client_golang : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.16.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.17.0 # github.com/prometheus/client_model : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.4.0 +Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 # github.com/prometheus/common : Apache-2.0 Provides: bundled(golang(github.com/prometheus/common)) = 0.44.0 # github.com/prometheus/procfs : Apache-2.0 @@ -147,7 +145,7 @@ Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.3.4 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.39.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.39.1 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD-2-Clause @@ -155,7 +153,7 @@ Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 # github.com/sasha-s/go-deadlock : Apache-2.0 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1 # github.com/shirou/gopsutil : BSD-3-Clause -Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.8 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.9 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD-2-Clause @@ -171,21 +169,21 @@ Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 # go.uber.org/mock : Apache-2.0 Provides: bundled(golang(go.uber.org/mock)) = 0.3.0 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.13.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.14.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 9212866 +Provides: bundled(golang(golang.org/x/exp)) = 7918f67 # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.13.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.15.0 +Provides: bundled(golang(golang.org/x/net)) = 0.17.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.12.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.13.0 # golang.org/x/text : BSD-3-Clause Provides: bundled(golang(golang.org/x/text)) = 0.13.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.3.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.13.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.14.0 # google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 From 850b400550e0bb52e8c32ae24f3a53032561a0f8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 28 Nov 2023 00:25:01 +0100 Subject: [PATCH 110/133] Update to version 1.26.1; Fixes RHBZ#2250334 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75db33d..e0c3dd4 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /syncthing-source-v1.24.0.tar.gz /syncthing-source-v1.25.0.tar.gz /syncthing-source-v1.26.0.tar.gz +/syncthing-source-v1.26.1.tar.gz diff --git a/sources b/sources index 964d809..e50053f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.26.0.tar.gz) = fa67b88650142eca7acb50635c205eeb8fc845346f68241f3ac32db8c9c6cb47d274c26f75d3c79bd7110c92aa40f702a298c37adac53719876d02b3bf337e8e +SHA512 (syncthing-source-v1.26.1.tar.gz) = 932c0faf1d7b9af67474ac4729d867b7495a023459aa59ed5f4210b5cba5ef5561bc82020f6e202dda549086db06c20844e7e5541f136892a8916c25439c754d diff --git a/syncthing.spec b/syncthing.spec index c18e440..61ce766 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.26.0 +%global basever 1.26.1 #%%global rcnum 0 Name: syncthing From 54b34c21fdbac0131b6b373a965ed73d5c558dc7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 28 Dec 2023 15:43:18 +0100 Subject: [PATCH 111/133] Update to version 1.27.1; Fixes RHBZ#2252714 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 38 +++++++++++++++++++------------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index e0c3dd4..705f0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ /syncthing-source-v1.25.0.tar.gz /syncthing-source-v1.26.0.tar.gz /syncthing-source-v1.26.1.tar.gz +/syncthing-source-v1.27.1.tar.gz diff --git a/sources b/sources index e50053f..794ec12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.26.1.tar.gz) = 932c0faf1d7b9af67474ac4729d867b7495a023459aa59ed5f4210b5cba5ef5561bc82020f6e202dda549086db06c20844e7e5541f136892a8916c25439c754d +SHA512 (syncthing-source-v1.27.1.tar.gz) = ef343cc6cf1b5a6dd28e787abc196c533ea6aa85590c969888841faf56a16d95240eee75262d0fd4c8b6cf44fe99a8cbb485365baafcd11d7a4107372a7b1d1c diff --git a/syncthing.spec b/syncthing.spec index 61ce766..213453a 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.26.1 +%global basever 1.27.1 #%%global rcnum 0 Name: syncthing @@ -91,9 +91,9 @@ Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 # 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)) = f7f687d +Provides: bundled(golang(github.com/google/pprof)) = a5a03c7 # github.com/google/uuid : BSD-3-Clause -Provides: bundled(golang(github.com/google/uuid)) = 1.3.1 +Provides: bundled(golang(github.com/google/uuid)) = 1.4.0 # github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 # github.com/hashicorp/golang-lru : MPL-2.0 @@ -107,13 +107,13 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.5 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.6 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.9 # github.com/maruel/panicparse : Apache-2.0 Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 # github.com/matttproud/golang_protobuf_extensions : Apache-2.0 -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.4 +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions/v2)) = 2.0.0 # github.com/maxbrunsfeld/counterfeiter : MIT Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.5.0 # github.com/minio/sha256-simd : Apache-2.0 @@ -121,13 +121,13 @@ Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # github.com/onsi/ginkgo : MIT -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.0 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.13.2 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.12.0 # github.com/petermattis/goid : Apache-2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = 1876fd5 +Provides: bundled(golang(github.com/petermattis/goid)) = f558c26 # github.com/pierrec/lz4 : BSD-3-Clause Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.18 # github.com/pkg/errors : BSD-2-Clause @@ -139,13 +139,13 @@ Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.17.0 # github.com/prometheus/client_model : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 # github.com/prometheus/common : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.44.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.45.0 # github.com/prometheus/procfs : Apache-2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause -Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.3.4 +Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.4.1 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.39.1 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.40.0 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/russross/blackfriday : BSD-2-Clause @@ -153,7 +153,7 @@ Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0 # github.com/sasha-s/go-deadlock : Apache-2.0 Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1 # github.com/shirou/gopsutil : BSD-3-Clause -Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.9 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.11 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD-2-Clause @@ -169,21 +169,21 @@ Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 # go.uber.org/mock : Apache-2.0 Provides: bundled(golang(go.uber.org/mock)) = 0.3.0 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.14.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.16.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 7918f67 +Provides: bundled(golang(golang.org/x/exp)) = 6522937 # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.13.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.14.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.17.0 +Provides: bundled(golang(golang.org/x/net)) = 0.19.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.13.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.15.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.13.0 +Provides: bundled(golang(golang.org/x/text)) = 0.14.0 # golang.org/x/time : BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = 0.3.0 +Provides: bundled(golang(golang.org/x/time)) = 0.5.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.14.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.16.0 # google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 From 4e23764f1895b3e6ac2651a583ba1693ab70a1c9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 8 Jan 2024 15:51:08 +0100 Subject: [PATCH 112/133] Update to version 1.27.2; Fixes RHBZ#2256512 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 705f0ce..8519cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ /syncthing-source-v1.26.0.tar.gz /syncthing-source-v1.26.1.tar.gz /syncthing-source-v1.27.1.tar.gz +/syncthing-source-v1.27.2.tar.gz diff --git a/sources b/sources index 794ec12..c5094a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.1.tar.gz) = ef343cc6cf1b5a6dd28e787abc196c533ea6aa85590c969888841faf56a16d95240eee75262d0fd4c8b6cf44fe99a8cbb485365baafcd11d7a4107372a7b1d1c +SHA512 (syncthing-source-v1.27.2.tar.gz) = 6b6bd57268b32b5db2377cf813229de978e26de606ac3bf2b515ddb35fd8131fafdb88abbfac1cb7d0f443224538cca7a6eba64f4bd737135f5a1c98e76439f9 diff --git a/syncthing.spec b/syncthing.spec index 213453a..b5a67a0 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.1 +%global basever 1.27.2 #%%global rcnum 0 Name: syncthing From 224aaa4fa2e5415fb027597a4913417636626383 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:06:07 +0000 Subject: [PATCH 113/133] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b9afe020cb51743d1871c2669a99d1b57055049f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 23:39:29 +0000 Subject: [PATCH 114/133] Rebuild for golang 1.22.0 From c316c25a7bb6f9f9bf09a690dbd5a2a11c08705c Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 12 Feb 2024 22:55:14 +0100 Subject: [PATCH 115/133] Update to version 1.27.3; Fixes RHBZ#2263121 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 54 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 8519cc1..d1a2605 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ /syncthing-source-v1.26.1.tar.gz /syncthing-source-v1.27.1.tar.gz /syncthing-source-v1.27.2.tar.gz +/syncthing-source-v1.27.3.tar.gz diff --git a/sources b/sources index c5094a3..8a9954f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.2.tar.gz) = 6b6bd57268b32b5db2377cf813229de978e26de606ac3bf2b515ddb35fd8131fafdb88abbfac1cb7d0f443224538cca7a6eba64f4bd737135f5a1c98e76439f9 +SHA512 (syncthing-source-v1.27.3.tar.gz) = 2965954f3832d984b1e21834b488e5b6cc8b3ca8324a915a0b41b14bade9d56865c7743627c738b1fff2fd4dfab317759ec0fbf86b0feae3db9dff778835186a diff --git a/syncthing.spec b/syncthing.spec index b5a67a0..a423bd2 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.2 +%global basever 1.27.3 #%%global rcnum 0 Name: syncthing @@ -50,8 +50,14 @@ Provides: bundled(moment) = 2.19.4 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # github.com/Azure/go-ntlmssp : MIT Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693 +# github.com/alecthomas/assert : MIT +Provides: bundled(golang(github.com/alecthomas/assert/v2)) = 2.4.1 # github.com/alecthomas/kong : MIT Provides: bundled(golang(github.com/alecthomas/kong)) = 0.8.1 +# github.com/alecthomas/repr : MIT +Provides: bundled(golang(github.com/alecthomas/repr)) = 0.3.0 +# github.com/alexbrainman/sspi : BSD-3-Clause +Provides: bundled(golang(github.com/alexbrainman/sspi)) = 1a75b47 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/calmh/incontainer : MIT @@ -72,12 +78,16 @@ Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.3 Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/flynn-archive/go-shlex : Apache-2.0 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 +# 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)) = 1.5.5 # github.com/go-ldap/ldap : MIT Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.6 +# github.com/go-logr/logr : Apache-2.0 +Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.1 # 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 @@ -86,16 +96,18 @@ Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 # github.com/gogo/protobuf : BSD-3-Clause Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 -# github.com/golang/protobuf : BSD-3-Clause -Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 # 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)) = a5a03c7 +Provides: bundled(golang(github.com/google/pprof)) = 960ae82 # github.com/google/uuid : BSD-3-Clause -Provides: bundled(golang(github.com/google/uuid)) = 1.4.0 +Provides: bundled(golang(github.com/google/uuid)) = 1.5.0 # github.com/greatroar/blobloom : Apache-2.0 Provides: bundled(golang(github.com/greatroar/blobloom)) = 0.7.2 +# github.com/hashicorp/errwrap : MPL-2.0 +Provides: bundled(golang(github.com/hashicorp/errwrap)) = 1.0.0 +# github.com/hashicorp/go-multierror : MPL-2.0 +Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 1.0.0 # 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 @@ -115,27 +127,31 @@ Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 # github.com/matttproud/golang_protobuf_extensions : Apache-2.0 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions/v2)) = 2.0.0 # github.com/maxbrunsfeld/counterfeiter : MIT -Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.5.0 +Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.7.0 # github.com/minio/sha256-simd : Apache-2.0 Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 +# 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.13.2 +# github.com/onsi/gomega : MIT +Provides: bundled(golang(github.com/onsi/gomega)) = 1.30.0 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.12.0 -# github.com/petermattis/goid : Apache-2.0 -Provides: bundled(golang(github.com/petermattis/goid)) = f558c26 # github.com/pierrec/lz4 : BSD-3-Clause -Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.18 +Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.19 # github.com/pkg/errors : BSD-2-Clause Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 +# 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)) = 62379fc # github.com/prometheus/client_golang : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.17.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.18.0 # github.com/prometheus/client_model : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 # github.com/prometheus/common : Apache-2.0 @@ -145,13 +161,13 @@ Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 # github.com/quic-go/qtls-go1-20 : BSD-3-Clause Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.4.1 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.40.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.40.1 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views 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/sasha-s/go-deadlock : Apache-2.0 -Provides: bundled(golang(github.com/sasha-s/go-deadlock)) = 0.3.1 # github.com/shirou/gopsutil : BSD-3-Clause Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.23.11 # github.com/syncthing/notify : MIT @@ -164,14 +180,16 @@ Provides: bundled(golang(github.com/thejerf/suture/v4)) = 4.0.2 Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 # 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.3.0 # github.com/yusufpapurcu/wmi : MIT Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 # go.uber.org/mock : Apache-2.0 -Provides: bundled(golang(go.uber.org/mock)) = 0.3.0 +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.16.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.17.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 6522937 +Provides: bundled(golang(golang.org/x/exp)) = be819d1 # golang.org/x/mod : BSD-3-Clause Provides: bundled(golang(golang.org/x/mod)) = 0.14.0 # golang.org/x/net : BSD-3-Clause @@ -183,9 +201,9 @@ Provides: bundled(golang(golang.org/x/text)) = 0.14.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.5.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.16.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.16.1 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.31.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.32.0 %description Syncthing replaces other file synchronization services with something From 415f9413998a94cb57b004355021102aa7a1d117 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 7 Mar 2024 13:46:36 +0100 Subject: [PATCH 116/133] Update to version 1.27.4; Fixes RHBZ#2267805 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 64 +++++++++++++++++++++++++++++--------------------- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index d1a2605..8cee760 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /syncthing-source-v1.27.1.tar.gz /syncthing-source-v1.27.2.tar.gz /syncthing-source-v1.27.3.tar.gz +/syncthing-source-v1.27.4.tar.gz diff --git a/sources b/sources index 8a9954f..20b46bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.3.tar.gz) = 2965954f3832d984b1e21834b488e5b6cc8b3ca8324a915a0b41b14bade9d56865c7743627c738b1fff2fd4dfab317759ec0fbf86b0feae3db9dff778835186a +SHA512 (syncthing-source-v1.27.4.tar.gz) = fc28ca066adeccd10281a6ccd50c336942bfbbdaedd954028cc2ee40c09ad85ef0a7fcfe733d3045d6979dd22cddd2fa5979d605440ebe3d2fd90c7f911c3c73 diff --git a/syncthing.spec b/syncthing.spec index a423bd2..d35f596 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.3 +%global basever 1.27.4 #%%global rcnum 0 Name: syncthing @@ -51,7 +51,7 @@ Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # github.com/Azure/go-ntlmssp : MIT Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693 # github.com/alecthomas/assert : MIT -Provides: bundled(golang(github.com/alecthomas/assert/v2)) = 2.4.1 +Provides: bundled(golang(github.com/alecthomas/assert/v2)) = 2.5.0 # github.com/alecthomas/kong : MIT Provides: bundled(golang(github.com/alecthomas/kong)) = 0.8.1 # github.com/alecthomas/repr : MIT @@ -61,7 +61,7 @@ Provides: bundled(golang(github.com/alexbrainman/sspi)) = 1a75b47 # 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)) = b3e71b1 +Provides: bundled(golang(github.com/calmh/incontainer)) = 1.0.0 # github.com/calmh/xdr : MIT Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 # github.com/ccding/go-stun : Apache-2.0 @@ -76,6 +76,8 @@ Provides: bundled(golang(github.com/chmduquesne/rollinghash)) = 4.0.0+inco Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.3 # 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/flynn-archive/go-shlex : Apache-2.0 Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 # github.com/fsnotify/fsnotify : BSD-3-Clause @@ -99,19 +101,19 @@ 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)) = 960ae82 +Provides: bundled(golang(github.com/google/pprof)) = fb44976 # github.com/google/uuid : BSD-3-Clause -Provides: bundled(golang(github.com/google/uuid)) = 1.5.0 +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.7.2 # github.com/hashicorp/errwrap : MPL-2.0 -Provides: bundled(golang(github.com/hashicorp/errwrap)) = 1.0.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.0.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.10 +Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.13 # github.com/jackpal/go-nat-pmp : Apache-2.0 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 # github.com/julienschmidt/httprouter : BSD-3-Clause @@ -120,14 +122,14 @@ Provides: bundled(golang(github.com/julienschmidt/httprouter)) = 1.3.0 Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a8 # github.com/klauspost/cpuid : MIT Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.6 +# github.com/kr/text : MIT +Provides: bundled(golang(github.com/kr/text)) = 0.2.0 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.9 # github.com/maruel/panicparse : Apache-2.0 Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 -# github.com/matttproud/golang_protobuf_extensions : Apache-2.0 -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions/v2)) = 2.0.0 # github.com/maxbrunsfeld/counterfeiter : MIT -Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.7.0 +Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.8.1 # github.com/minio/sha256-simd : Apache-2.0 Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT @@ -135,17 +137,19 @@ Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # 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.13.2 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.15.0 # github.com/onsi/gomega : MIT -Provides: bundled(golang(github.com/onsi/gomega)) = 1.30.0 +Provides: bundled(golang(github.com/onsi/gomega)) = 1.31.1 # github.com/oschwald/geoip2-golang : ISC Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 # github.com/oschwald/maxminddb-golang : ISC Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.12.0 # github.com/pierrec/lz4 : BSD-3-Clause -Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.19 +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 +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 @@ -155,13 +159,11 @@ Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.18.0 # github.com/prometheus/client_model : Apache-2.0 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 # github.com/prometheus/common : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.45.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.46.0 # github.com/prometheus/procfs : Apache-2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 -# github.com/quic-go/qtls-go1-20 : BSD-3-Clause -Provides: bundled(golang(github.com/quic-go/qtls-go1-20)) = 0.4.1 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.40.1 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.41.0 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/riywo/loginshell : MIT @@ -169,7 +171,11 @@ 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/v3)) = 3.23.11 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.24.1 +# github.com/stretchr/objx : MIT +Provides: bundled(golang(github.com/stretchr/objx)) = 0.5.1 +# github.com/stretchr/testify : MIT +Provides: bundled(golang(github.com/stretchr/testify)) = 1.8.4 # github.com/syncthing/notify : MIT Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 # github.com/syndtr/goleveldb : BSD-2-Clause @@ -181,29 +187,33 @@ Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 # 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.3.0 +Provides: bundled(golang(github.com/willabides/kongplete)) = 0.4.0 # github.com/yusufpapurcu/wmi : MIT -Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.3 +Provides: bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.4 +# go.uber.org/automaxprocs : MIT +Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.5.3 # go.uber.org/mock : Apache-2.0 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.17.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.19.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = be819d1 +Provides: bundled(golang(golang.org/x/exp)) = 2c58cdc # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.14.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.15.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.19.0 +Provides: bundled(golang(golang.org/x/net)) = 0.21.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.15.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.17.0 # golang.org/x/text : BSD-3-Clause Provides: bundled(golang(golang.org/x/text)) = 0.14.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.5.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.16.1 +Provides: bundled(golang(golang.org/x/tools)) = 0.17.0 # google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.32.0 +# gopkg.in/yaml.v3 : MIT AND Apache-2.0 +Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description Syncthing replaces other file synchronization services with something From 144e78d96ac34046b4f69a46b5844ed65c682e5b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 7 Mar 2024 14:24:32 +0100 Subject: [PATCH 117/133] Ignore some very unreliable tests for now --- syncthing.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index d35f596..b5b7297 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -368,7 +368,9 @@ export GO111MODULE=off %gotest %{goipath}/cmd/strelaypoolsrv %gotest %{goipath}/cmd/syncthing -%gotest %{goipath}/lib/api +# This test is very unreliable and fails ~50% of the time: +# https://github.com/syncthing/syncthing/issues/9455 +%gotest %{goipath}/lib/api || : %gotest %{goipath}/lib/beacon %gotest %{goipath}/lib/config From 07ba5bd1d1a87cd3cb0f848a32af03b80602ba34 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 11 Mar 2024 21:29:37 +0100 Subject: [PATCH 118/133] Re-enable lib/api tests and raise timeout to resolve failures --- ...-increase-timeout-from-1-second-to-6.patch | 27 +++++++++++++++++++ syncthing.spec | 9 ++++--- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch diff --git 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 new file mode 100644 index 0000000..5ff73d6 --- /dev/null +++ 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 +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 + diff --git a/syncthing.spec b/syncthing.spec index b5b7297..6ed6294 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -23,6 +23,10 @@ URL: https://syncthing.net # use official release tarball (contains vendored dependencies) Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz +# * increase some test timeouts to fix failures when running tests in parallel: +# https://github.com/syncthing/syncthing/issues/9455 +Patch: 0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch + BuildRequires: desktop-file-utils BuildRequires: systemd-rpm-macros @@ -367,10 +371,7 @@ export GO111MODULE=off %gotest %{goipath}/cmd/stdiscosrv %gotest %{goipath}/cmd/strelaypoolsrv %gotest %{goipath}/cmd/syncthing - -# This test is very unreliable and fails ~50% of the time: -# https://github.com/syncthing/syncthing/issues/9455 -%gotest %{goipath}/lib/api || : +%gotest %{goipath}/lib/api %gotest %{goipath}/lib/beacon %gotest %{goipath}/lib/config From b4b2c6d7c29678ede9cb10b3d89217f4eaa21ea6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 11 Apr 2024 12:47:45 +0200 Subject: [PATCH 119/133] Update to version 1.27.6; Fixes RHBZ#2272690 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 56 ++++++++++++++++++++++++-------------------------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 8cee760..6bf77be 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /syncthing-source-v1.27.2.tar.gz /syncthing-source-v1.27.3.tar.gz /syncthing-source-v1.27.4.tar.gz +/syncthing-source-v1.27.6.tar.gz diff --git a/sources b/sources index 20b46bf..08a67c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.4.tar.gz) = fc28ca066adeccd10281a6ccd50c336942bfbbdaedd954028cc2ee40c09ad85ef0a7fcfe733d3045d6979dd22cddd2fa5979d605440ebe3d2fd90c7f911c3c73 +SHA512 (syncthing-source-v1.27.6.tar.gz) = 2dbffd6002d557cc7ec3beab10d00f0e531d71ba60ed75fc20fd49f3d0c79b28197ed1c6795ef42717d12b8f4f594d1cadc8a67d0925f7f7f1cd20d1baa6edae diff --git a/syncthing.spec b/syncthing.spec index 6ed6294..ba05fac 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.4 +%global basever 1.27.6 #%%global rcnum 0 Name: syncthing @@ -54,12 +54,8 @@ Provides: bundled(moment) = 2.19.4 Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # github.com/Azure/go-ntlmssp : MIT Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693 -# github.com/alecthomas/assert : MIT -Provides: bundled(golang(github.com/alecthomas/assert/v2)) = 2.5.0 # github.com/alecthomas/kong : MIT -Provides: bundled(golang(github.com/alecthomas/kong)) = 0.8.1 -# github.com/alecthomas/repr : MIT -Provides: bundled(golang(github.com/alecthomas/repr)) = 0.3.0 +Provides: bundled(golang(github.com/alecthomas/kong)) = 0.9.0 # github.com/alexbrainman/sspi : BSD-3-Clause Provides: bundled(golang(github.com/alexbrainman/sspi)) = 1a75b47 # github.com/beorn7/perks : MIT @@ -73,11 +69,11 @@ Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.4 # 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.2.0 +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/cpuguy83/go-md2man : MIT -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.3 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.4 # github.com/d4l3k/messagediff : MIT Provides: bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1 # github.com/davecgh/go-spew : ISC @@ -105,7 +101,7 @@ 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)) = fb44976 +Provides: bundled(golang(github.com/google/pprof)) = 29b9bb0 # github.com/google/uuid : BSD-3-Clause Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 # github.com/greatroar/blobloom : Apache-2.0 @@ -117,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.13 +Provides: bundled(golang(github.com/jackpal/gateway)) = 1.0.14 # github.com/jackpal/go-nat-pmp : Apache-2.0 Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 # github.com/julienschmidt/httprouter : BSD-3-Clause @@ -125,7 +121,7 @@ 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.6 +Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.7 # github.com/kr/text : MIT Provides: bundled(golang(github.com/kr/text)) = 0.2.0 # github.com/lib/pq : MIT @@ -141,7 +137,7 @@ Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # 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.15.0 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.17.1 # github.com/onsi/gomega : MIT Provides: bundled(golang(github.com/onsi/gomega)) = 1.31.1 # github.com/oschwald/geoip2-golang : ISC @@ -157,17 +153,17 @@ 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)) = 62379fc +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.18.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.0 # github.com/prometheus/client_model : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.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.46.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.52.2 # github.com/prometheus/procfs : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.13.0 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.41.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.42.0 # github.com/rcrowley/go-metrics : BSD-2-Clause-Views Provides: bundled(golang(github.com/rcrowley/go-metrics)) = cf1acfc # github.com/riywo/loginshell : MIT @@ -175,17 +171,17 @@ 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/v3)) = 3.24.1 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.24.3 # github.com/stretchr/objx : MIT -Provides: bundled(golang(github.com/stretchr/objx)) = 0.5.1 +Provides: bundled(golang(github.com/stretchr/objx)) = 0.5.2 # github.com/stretchr/testify : MIT -Provides: bundled(golang(github.com/stretchr/testify)) = 1.8.4 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.9.0 # github.com/syncthing/notify : MIT 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.2 +Provides: bundled(golang(github.com/thejerf/suture/v4)) = 4.0.5 # github.com/urfave/cli : MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 # github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause @@ -199,23 +195,25 @@ Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.5.3 # go.uber.org/mock : Apache-2.0 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.19.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.22.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 2c58cdc +Provides: bundled(golang(golang.org/x/exp)) = c0f41cb # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.15.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.17.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net)) = 0.24.0 +# golang.org/x/sync : BSD-3-Clause +Provides: bundled(golang(golang.org/x/sync)) = 0.7.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.17.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.19.0 # golang.org/x/text : BSD-3-Clause Provides: bundled(golang(golang.org/x/text)) = 0.14.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.5.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.17.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.20.0 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.32.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.33.0 # gopkg.in/yaml.v3 : MIT AND Apache-2.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 From 264a1eb70f57f31b3e0e1fc54a018b200e742019 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 14 May 2024 16:52:21 +0200 Subject: [PATCH 120/133] Update to version 1.27.7 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6bf77be..eb1f9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ /syncthing-source-v1.27.3.tar.gz /syncthing-source-v1.27.4.tar.gz /syncthing-source-v1.27.6.tar.gz +/syncthing-source-v1.27.7.tar.gz diff --git a/sources b/sources index 08a67c4..4fc3b8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.6.tar.gz) = 2dbffd6002d557cc7ec3beab10d00f0e531d71ba60ed75fc20fd49f3d0c79b28197ed1c6795ef42717d12b8f4f594d1cadc8a67d0925f7f7f1cd20d1baa6edae +SHA512 (syncthing-source-v1.27.7.tar.gz) = 7eee3a021ed2411078928c92f5af52c100f717dfc53adc1d4b05050178040c4d30e39d1d5a4d8de3b49db0866957a3c3b5000e4810ecaebde16f6e9073fabf7a diff --git a/syncthing.spec b/syncthing.spec index ba05fac..0c4e09d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.6 +%global basever 1.27.7 #%%global rcnum 0 Name: syncthing From 6e1dc903a19ea251d3ba6400781ade7cefc6ae0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:54:40 +0000 Subject: [PATCH 121/133] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 39b8aee010259f4d549ddd0af71d19f2646305e3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 2 Aug 2024 17:18:48 +0200 Subject: [PATCH 122/133] Update to version 1.27.9; Fixes RHBZ#2290442 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 66 ++++++++++++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index eb1f9f1..44601e0 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /syncthing-source-v1.27.4.tar.gz /syncthing-source-v1.27.6.tar.gz /syncthing-source-v1.27.7.tar.gz +/syncthing-source-v1.27.9.tar.gz diff --git a/sources b/sources index 4fc3b8f..183de48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.7.tar.gz) = 7eee3a021ed2411078928c92f5af52c100f717dfc53adc1d4b05050178040c4d30e39d1d5a4d8de3b49db0866957a3c3b5000e4810ecaebde16f6e9073fabf7a +SHA512 (syncthing-source-v1.27.9.tar.gz) = 11c56dcf3b44f87581560b4f8f8f76d6ee851fc0421d85f458a32c3900bd0ee6bb2964b7d5253a343d61ba57e3aa40f2f8a94d6f5d5d5b0cf27dc1cc28a14fa1 diff --git a/syncthing.spec b/syncthing.spec index 0c4e09d..bbca39d 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.7 +%global basever 1.27.9 #%%global rcnum 0 Name: syncthing @@ -15,9 +15,10 @@ Release: %autorelease # 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 +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) URL: https://syncthing.net # use official release tarball (contains vendored dependencies) @@ -41,6 +42,7 @@ 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.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 @@ -56,8 +58,6 @@ Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 Provides: bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693 # github.com/alecthomas/kong : MIT Provides: bundled(golang(github.com/alecthomas/kong)) = 0.9.0 -# github.com/alexbrainman/sspi : BSD-3-Clause -Provides: bundled(golang(github.com/alexbrainman/sspi)) = 1a75b47 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/calmh/incontainer : MIT @@ -66,6 +66,8 @@ Provides: bundled(golang(github.com/calmh/incontainer)) = 1.0.0 Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 # github.com/ccding/go-stun : Apache-2.0 Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.4 +# 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 @@ -85,27 +87,27 @@ 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)) = 1.5.5 +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.6 -# github.com/go-logr/logr : Apache-2.0 -Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.1 +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 -Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 +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.8.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)) = 29b9bb0 +Provides: bundled(golang(github.com/google/pprof)) = 186aa03 # 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.7.2 +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 @@ -113,7 +115,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.14 +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/julienschmidt/httprouter : BSD-3-Clause @@ -122,14 +124,14 @@ Provides: bundled(golang(github.com/julienschmidt/httprouter)) = 1.3.0 Provides: bundled(golang(github.com/kballard/go-shellquote)) = 95032a8 # github.com/klauspost/cpuid : MIT Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.7 -# github.com/kr/text : MIT -Provides: bundled(golang(github.com/kr/text)) = 0.2.0 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.9 # github.com/maruel/panicparse : Apache-2.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.8.1 +# github.com/maxmind/geoipupdate : Apache-2.0 OR MIT +Provides: bundled(golang(github.com/maxmind/geoipupdate/v6)) = 6.1.0 # github.com/minio/sha256-simd : Apache-2.0 Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # github.com/miscreant/miscreant.go : MIT @@ -137,13 +139,11 @@ Provides: bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763 # 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.17.1 -# github.com/onsi/gomega : MIT -Provides: bundled(golang(github.com/onsi/gomega)) = 1.31.1 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.19.0 # github.com/oschwald/geoip2-golang : ISC -Provides: bundled(golang(github.com/oschwald/geoip2-golang)) = 1.9.0 +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.12.0 +Provides: bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.13.0 # github.com/pierrec/lz4 : BSD-3-Clause Provides: bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.21 # github.com/pkg/errors : BSD-2-Clause @@ -155,15 +155,17 @@ 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.19.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.1 # 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.52.2 +Provides: bundled(golang(github.com/prometheus/common)) = 0.54.0 # github.com/prometheus/procfs : Apache-2.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.13.0 +Provides: bundled(golang(github.com/prometheus/procfs)) = 0.15.1 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.42.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.44.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)) = cf1acfc # github.com/riywo/loginshell : MIT @@ -171,7 +173,7 @@ 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/v3)) = 3.24.3 +Provides: bundled(golang(github.com/shirou/gopsutil/v3)) = 3.24.5 # github.com/stretchr/objx : MIT Provides: bundled(golang(github.com/stretchr/objx)) = 0.5.2 # github.com/stretchr/testify : MIT @@ -183,7 +185,7 @@ Provides: bundled(golang(github.com/syndtr/goleveldb)) = 126854a # github.com/thejerf/suture : MIT Provides: bundled(golang(github.com/thejerf/suture/v4)) = 4.0.5 # github.com/urfave/cli : MIT -Provides: bundled(golang(github.com/urfave/cli)) = 1.22.14 +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 @@ -195,25 +197,25 @@ Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.5.3 # go.uber.org/mock : Apache-2.0 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.22.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.23.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = c0f41cb +Provides: bundled(golang(golang.org/x/exp)) = fd00a4e # golang.org/x/mod : BSD-3-Clause Provides: bundled(golang(golang.org/x/mod)) = 0.17.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.24.0 +Provides: bundled(golang(golang.org/x/net)) = 0.25.0 # golang.org/x/sync : BSD-3-Clause Provides: bundled(golang(golang.org/x/sync)) = 0.7.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.19.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.20.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.14.0 +Provides: bundled(golang(golang.org/x/text)) = 0.15.0 # golang.org/x/time : BSD-3-Clause Provides: bundled(golang(golang.org/x/time)) = 0.5.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.20.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.21.0 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.33.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.34.1 # gopkg.in/yaml.v3 : MIT AND Apache-2.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 From 2c25bc5d13d5924bf02d0d13e00b8f2bc7f61299 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 9 Sep 2024 16:11:51 +0200 Subject: [PATCH 123/133] Update to version 1.27.12; Fixes RHBZ#2303591 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 60 ++++++++++++++++++++++++-------------------------- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 44601e0..2fee05d 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ /syncthing-source-v1.27.6.tar.gz /syncthing-source-v1.27.7.tar.gz /syncthing-source-v1.27.9.tar.gz +/syncthing-source-v1.27.12.tar.gz diff --git a/sources b/sources index 183de48..9b5ddfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.9.tar.gz) = 11c56dcf3b44f87581560b4f8f8f76d6ee851fc0421d85f458a32c3900bd0ee6bb2964b7d5253a343d61ba57e3aa40f2f8a94d6f5d5d5b0cf27dc1cc28a14fa1 +SHA512 (syncthing-source-v1.27.12.tar.gz) = 4e46124936ab7670d2929b0817b014c5d9ab6c94a9ce47368c796ab59b1f03c7da983ade358ae98be7c83fb4b70d2c3a3709827257be9dc61c0d0e113022dd85 diff --git a/syncthing.spec b/syncthing.spec index bbca39d..6d1064a 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.9 +%global basever 1.27.12 #%%global rcnum 0 Name: syncthing @@ -24,10 +24,6 @@ URL: https://syncthing.net # use official release tarball (contains vendored dependencies) Source0: %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz -# * increase some test timeouts to fix failures when running tests in parallel: -# https://github.com/syncthing/syncthing/issues/9455 -Patch: 0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch - BuildRequires: desktop-file-utils BuildRequires: systemd-rpm-macros @@ -65,7 +61,7 @@ Provides: bundled(golang(github.com/calmh/incontainer)) = 1.0.0 # github.com/calmh/xdr : MIT Provides: bundled(golang(github.com/calmh/xdr)) = 1.1.0 # github.com/ccding/go-stun : Apache-2.0 -Provides: bundled(golang(github.com/ccding/go-stun)) = 0.1.4 +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 @@ -80,8 +76,6 @@ Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.4 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/flynn-archive/go-shlex : Apache-2.0 -Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 # 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 @@ -97,13 +91,13 @@ 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.8.1 +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)) = 186aa03 +Provides: bundled(golang(github.com/google/pprof)) = 813a5fb # github.com/google/uuid : BSD-3-Clause Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 # github.com/greatroar/blobloom : Apache-2.0 @@ -122,28 +116,28 @@ Provides: bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2 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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.7 # github.com/lib/pq : MIT Provides: bundled(golang(github.com/lib/pq)) = 1.10.9 +# github.com/lufia/plan9stats : BSD-3-Clause +Provides: bundled(golang(github.com/lufia/plan9stats)) = 39d0f17 # github.com/maruel/panicparse : Apache-2.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.8.1 # github.com/maxmind/geoipupdate : Apache-2.0 OR MIT Provides: bundled(golang(github.com/maxmind/geoipupdate/v6)) = 6.1.0 -# github.com/minio/sha256-simd : Apache-2.0 -Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 # 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.19.0 +Provides: bundled(golang(github.com/onsi/ginkgo/v2)) = 2.20.0 # 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.0 +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.21 # github.com/pkg/errors : BSD-2-Clause @@ -159,11 +153,11 @@ Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.19.1 # 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.54.0 +Provides: bundled(golang(github.com/prometheus/common)) = 0.55.0 # github.com/prometheus/procfs : Apache-2.0 Provides: bundled(golang(github.com/prometheus/procfs)) = 0.15.1 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.44.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.46.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 @@ -173,7 +167,9 @@ 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/v3)) = 3.24.5 +Provides: bundled(golang(github.com/shirou/gopsutil/v4)) = 4.24.7 +# github.com/shoenig/go-m1cpu : MPL-2.0 +Provides: bundled(golang(github.com/shoenig/go-m1cpu)) = 0.1.6 # github.com/stretchr/objx : MIT Provides: bundled(golang(github.com/stretchr/objx)) = 0.5.2 # github.com/stretchr/testify : MIT @@ -184,6 +180,10 @@ Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 Provides: bundled(golang(github.com/syndtr/goleveldb)) = 126854a # github.com/thejerf/suture : MIT 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.12 +# github.com/tklauser/numcpus : Apache-2.0 +Provides: bundled(golang(github.com/tklauser/numcpus)) = 0.6.1 # github.com/urfave/cli : MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.15 # github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause @@ -197,25 +197,25 @@ Provides: bundled(golang(go.uber.org/automaxprocs)) = 1.5.3 # go.uber.org/mock : Apache-2.0 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.23.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.26.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = fd00a4e +Provides: bundled(golang(golang.org/x/exp)) = 0cdaa3a # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.17.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.20.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net)) = 0.28.0 # golang.org/x/sync : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = 0.7.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.20.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.24.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.15.0 +Provides: bundled(golang(golang.org/x/text)) = 0.17.0 # golang.org/x/time : BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = 0.5.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.21.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.24.0 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.34.1 +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 @@ -348,7 +348,6 @@ mkdir -p %{buildroot}/%{_unitdir} mkdir -p %{buildroot}/%{_userunitdir} cp -pav etc/linux-systemd/system/syncthing@.service %{buildroot}/%{_unitdir}/ -cp -pav etc/linux-systemd/system/syncthing-resume.service %{buildroot}/%{_unitdir}/ cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/ # unmark source files as executable @@ -447,7 +446,6 @@ export GO111MODULE=off %{_mandir}/*/syncthing* %{_unitdir}/syncthing@.service -%{_unitdir}/syncthing-resume.service %{_userunitdir}/syncthing.service From 7f91832a081df6ffb4601146386df90930b66307 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 28 Oct 2024 12:13:13 +0100 Subject: [PATCH 124/133] Update to version 1.28.0; Fixes RHBZ#2319211 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 60 +++++++++++++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 2fee05d..084aa00 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /syncthing-source-v1.27.7.tar.gz /syncthing-source-v1.27.9.tar.gz /syncthing-source-v1.27.12.tar.gz +/syncthing-source-v1.28.0.tar.gz diff --git a/sources b/sources index 9b5ddfb..5f51a5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.12.tar.gz) = 4e46124936ab7670d2929b0817b014c5d9ab6c94a9ce47368c796ab59b1f03c7da983ade358ae98be7c83fb4b70d2c3a3709827257be9dc61c0d0e113022dd85 +SHA512 (syncthing-source-v1.28.0.tar.gz) = 1a11a77b7dd6007bd6817cf055ff3c3fca7294e4b0eb32132361dccb94dcc80a46a556f302a3c13bece5580aec3d6d74d23045615bf982975db9858bd2692df2 diff --git a/syncthing.spec b/syncthing.spec index 6d1064a..4e8622c 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.27.12 +%global basever 1.28.0 #%%global rcnum 0 Name: syncthing @@ -53,13 +53,15 @@ Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # 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)) = 0.9.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.5 # 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.1.0 +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 @@ -71,11 +73,13 @@ 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/cpuguy83/go-md2man : MIT -Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.4 +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.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 @@ -97,7 +101,7 @@ 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)) = 813a5fb +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 @@ -112,14 +116,18 @@ Provides: bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.7 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 +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/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)) = 39d0f17 +Provides: bundled(golang(github.com/lufia/plan9stats)) = 873cd01 # github.com/maruel/panicparse : Apache-2.0 Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.3.1 # github.com/maxbrunsfeld/counterfeiter : MIT @@ -133,7 +141,7 @@ 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.20.0 +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 @@ -149,15 +157,17 @@ 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.19.1 +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.55.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.4.0 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.46.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 @@ -167,9 +177,7 @@ 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.24.7 -# github.com/shoenig/go-m1cpu : MPL-2.0 -Provides: bundled(golang(github.com/shoenig/go-m1cpu)) = 0.1.6 +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 @@ -181,9 +189,9 @@ Provides: bundled(golang(github.com/syndtr/goleveldb)) = 126854a # github.com/thejerf/suture : MIT 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.12 +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.6.1 +Provides: bundled(golang(github.com/tklauser/numcpus)) = 0.8.0 # github.com/urfave/cli : MIT Provides: bundled(golang(github.com/urfave/cli)) = 1.22.15 # github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause @@ -193,31 +201,33 @@ 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.5.3 +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.4.0 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.26.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)) = 0cdaa3a +Provides: bundled(golang(golang.org/x/exp)) = 701f63a # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.20.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.28.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.8.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.24.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.17.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.6.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.24.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.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) +Provides: bundled(golang(sigs.k8s.io/yaml)) = 1.4.0 %description Syncthing replaces other file synchronization services with something @@ -306,7 +316,7 @@ 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/strelaypoolsrv +%gobuild -o _bin/strelaypoolsrv %{goipath}/cmd/infra/strelaypoolsrv %install @@ -368,7 +378,7 @@ export GOPATH=$(pwd)/_build:%{gopath} export GO111MODULE=off %gotest %{goipath}/cmd/stdiscosrv -%gotest %{goipath}/cmd/strelaypoolsrv +%gotest %{goipath}/cmd/infra/strelaypoolsrv %gotest %{goipath}/cmd/syncthing %gotest %{goipath}/lib/api %gotest %{goipath}/lib/beacon From 520fcf08e685ace64ad7f8dac84627e613822d69 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 2 Jan 2025 19:12:27 +0100 Subject: [PATCH 125/133] Update to version 1.18.1; Fixes RHBZ#2330159 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 084aa00..61b37ac 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /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 diff --git a/sources b/sources index 5f51a5b..de49629 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.28.0.tar.gz) = 1a11a77b7dd6007bd6817cf055ff3c3fca7294e4b0eb32132361dccb94dcc80a46a556f302a3c13bece5580aec3d6d74d23045615bf982975db9858bd2692df2 +SHA512 (syncthing-source-v1.28.1.tar.gz) = fe5156d963c1396b7a52676e8f7c2113ee9803318d5501d6aaf9992a4646fc95b5aca2dcee58c4cd1982c17924b339183f0aea303037c19147158f84083462d1 diff --git a/syncthing.spec b/syncthing.spec index 4e8622c..fd126c9 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.28.0 +%global basever 1.28.1 #%%global rcnum 0 Name: syncthing @@ -101,7 +101,7 @@ 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)) = f4c0cfd +Provides: bundled(golang(github.com/google/pprof)) = a352233 # github.com/google/uuid : BSD-3-Clause Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 # github.com/greatroar/blobloom : Apache-2.0 @@ -125,7 +125,7 @@ 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 +Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.11 # github.com/lufia/plan9stats : BSD-3-Clause Provides: bundled(golang(github.com/lufia/plan9stats)) = 873cd01 # github.com/maruel/panicparse : Apache-2.0 @@ -157,7 +157,7 @@ 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.20.4 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.20.5 # 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 @@ -167,7 +167,7 @@ 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.4.0 # github.com/quic-go/quic-go : MIT -Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.47.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.48.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 @@ -191,9 +191,9 @@ 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.8.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.15 +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 @@ -205,25 +205,25 @@ 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.4.0 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.27.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.28.0 # golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = 701f63a +Provides: bundled(golang(golang.org/x/exp)) = f66d83c # golang.org/x/mod : BSD-3-Clause 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.29.0 +Provides: bundled(golang(golang.org/x/net)) = 0.30.0 # golang.org/x/sync : BSD-3-Clause 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.25.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.26.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.18.0 +Provides: bundled(golang(golang.org/x/text)) = 0.19.0 # golang.org/x/time : BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = 0.6.0 +Provides: bundled(golang(golang.org/x/time)) = 0.7.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.25.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.26.0 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.34.2 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.35.1 # 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) From 6c2a09c1494ad8281f0fdb3b76f9e6a7c1ea8135 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:11:19 +0000 Subject: [PATCH 126/133] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 79eec3333183eebf9057995edb8f274f57bdce2b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 12 Mar 2025 17:14:35 +0100 Subject: [PATCH 127/133] Update to version 1.29.3; Fixes RHBZ#2335781 --- .gitignore | 1 + ..._test-fix-non-constant-format-string.patch | 25 ++++++++ ...-increase-timeout-from-1-second-to-6.patch | 27 -------- ...e_test-fix-non-constant-format-strin.patch | 34 ++++++++++ sources | 2 +- syncthing.spec | 62 +++++++++---------- 6 files changed, 92 insertions(+), 59 deletions(-) create mode 100644 0001-lib-api-api_test-fix-non-constant-format-string.patch delete mode 100644 0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch create mode 100644 0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch diff --git a/.gitignore b/.gitignore index 61b37ac..5409637 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ /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 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 new file mode 100644 index 0000000..20f22c2 --- /dev/null +++ b/0001-lib-api-api_test-fix-non-constant-format-string.patch @@ -0,0 +1,25 @@ +From e983a6d622f5ddc7968fdf06bfc6cf0c027444eb Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +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/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 deleted file mode 100644 index 5ff73d6..0000000 --- a/0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0eb79d77f145cb6794ab31506e7a40bdfbbdef10 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -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 - 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 new file mode 100644 index 0000000..68eb294 --- /dev/null +++ b/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch @@ -0,0 +1,34 @@ +From 4a9469f9969c646098a7d23d387aad150de1259c Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +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/sources b/sources index de49629..1472847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.28.1.tar.gz) = fe5156d963c1396b7a52676e8f7c2113ee9803318d5501d6aaf9992a4646fc95b5aca2dcee58c4cd1982c17924b339183f0aea303037c19147158f84083462d1 +SHA512 (syncthing-source-v1.29.3.tar.gz) = c674e48a52b928794fe5316c6888551ead7c17efa458011fcfde58edc5524249598d434744746acdf6937f38e10d6cd5aac41518d06fd98a07ee40aa24f72d4a diff --git a/syncthing.spec b/syncthing.spec index fd126c9..970731c 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.28.1 +%global basever 1.29.3 #%%global rcnum 0 Name: syncthing @@ -24,6 +24,10 @@ 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 @@ -53,9 +57,9 @@ Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # 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.2.1 +Provides: bundled(golang(github.com/alecthomas/kong)) = 1.8.1 # github.com/aws/aws-sdk-go : Apache-2.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.6 # github.com/beorn7/perks : MIT Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 # github.com/calmh/incontainer : MIT @@ -79,7 +83,7 @@ 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.0 +Provides: bundled(golang(github.com/ebitengine/purego)) = 0.8.2 # 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 @@ -87,7 +91,7 @@ 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.7 # github.com/go-ldap/ldap : MIT -Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.8 +Provides: bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.10 # 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 @@ -96,8 +100,6 @@ 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 @@ -113,7 +115,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.15 +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 @@ -122,16 +124,14 @@ 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.11 # 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.3.1 +Provides: bundled(golang(github.com/maruel/panicparse/v2)) = 2.4.0 # github.com/maxbrunsfeld/counterfeiter : MIT -Provides: bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.8.1 +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 @@ -147,7 +147,7 @@ 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.21 +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 @@ -157,17 +157,17 @@ 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.20.5 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.21.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.60.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.4.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.48.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.50.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 @@ -177,17 +177,17 @@ 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.24.9 +Provides: bundled(golang(github.com/shirou/gopsutil/v4)) = 4.25.2 # 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.9.0 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.10.0 # github.com/syncthing/notify : MIT -Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 +Provides: bundled(golang(github.com/syncthing/notify)) = f0fa8f9 # 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.5 +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 @@ -203,27 +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.4.0 +Provides: bundled(golang(go.uber.org/mock)) = 0.5.0 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.28.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.35.0 # golang.org/x/exp : BSD-3-Clause Provides: bundled(golang(golang.org/x/exp)) = f66d83c # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.21.0 +Provides: bundled(golang(golang.org/x/mod)) = 0.23.0 # golang.org/x/net : BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = 0.30.0 +Provides: bundled(golang(golang.org/x/net)) = 0.35.0 # golang.org/x/sync : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = 0.8.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.11.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.26.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.30.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.19.0 +Provides: bundled(golang(golang.org/x/text)) = 0.22.0 # golang.org/x/time : BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = 0.7.0 +Provides: bundled(golang(golang.org/x/time)) = 0.10.0 # golang.org/x/tools : BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = 0.26.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.30.0 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.35.1 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.36.5 # 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) From 9fd61ed369b17e2e9ba58758d0abe10d7d77d4d5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 13 Apr 2025 16:25:33 +0200 Subject: [PATCH 128/133] Update to version 1.29.5 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 5409637..57f297c 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /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 diff --git a/sources b/sources index 1472847..8604639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.29.3.tar.gz) = c674e48a52b928794fe5316c6888551ead7c17efa458011fcfde58edc5524249598d434744746acdf6937f38e10d6cd5aac41518d06fd98a07ee40aa24f72d4a +SHA512 (syncthing-source-v1.29.5.tar.gz) = a11ee3e95ba656f2bfceddde10ef13d86dffc0cba78f428bf5cbba13a8bb6e0ef7eb9c8b75317596d56b7880465cf8972be6cf77258c7c53529c16d5310cc43d diff --git a/syncthing.spec b/syncthing.spec index 970731c..23c8503 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.29.3 +%global basever 1.29.5 #%%global rcnum 0 Name: syncthing @@ -57,7 +57,7 @@ Provides: bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8 # 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.8.1 +Provides: bundled(golang(github.com/alecthomas/kong)) = 1.9.0 # github.com/aws/aws-sdk-go : Apache-2.0 Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.6 # github.com/beorn7/perks : MIT @@ -157,7 +157,7 @@ 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.21.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.21.1 # 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 @@ -205,23 +205,23 @@ 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.0 # golang.org/x/crypto : BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = 0.35.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.36.0 # golang.org/x/exp : BSD-3-Clause Provides: bundled(golang(golang.org/x/exp)) = f66d83c # golang.org/x/mod : BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = 0.23.0 +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.35.0 +Provides: bundled(golang(golang.org/x/net)) = 0.37.0 # golang.org/x/sync : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = 0.11.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.12.0 # golang.org/x/sys : BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.30.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.31.0 # golang.org/x/text : BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.22.0 +Provides: bundled(golang(golang.org/x/text)) = 0.23.0 # golang.org/x/time : BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = 0.10.0 +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.30.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.31.0 # google.golang.org/protobuf : BSD-3-Clause Provides: bundled(golang(google.golang.org/protobuf)) = 1.36.5 # gopkg.in/yaml.v3 : MIT AND Apache-2.0 From 08f883766e6e251129e8850be6565b0a526de699 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 26 May 2025 13:51:44 +0200 Subject: [PATCH 129/133] Update to version 1.29.6 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 20 ++++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 57f297c..57b7f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ /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 diff --git a/sources b/sources index 8604639..57d0cc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.29.5.tar.gz) = a11ee3e95ba656f2bfceddde10ef13d86dffc0cba78f428bf5cbba13a8bb6e0ef7eb9c8b75317596d56b7880465cf8972be6cf77258c7c53529c16d5310cc43d +SHA512 (syncthing-source-v1.29.6.tar.gz) = 5d7364c2c82a6e359ca13c27c5fe1419c273f3070843382a6f2284370476c9eba5179f4622cc007fd598c908ddc2e77c2c9299804f186b4e1ed45112b094822d diff --git a/syncthing.spec b/syncthing.spec index 23c8503..d292a82 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,6 @@ %bcond_with devel -%global basever 1.29.5 +%global basever 1.29.6 #%%global rcnum 0 Name: syncthing @@ -54,10 +54,14 @@ 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.17.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/internal)) = 1.10.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.0 # 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.9.0 +Provides: bundled(golang(github.com/alecthomas/kong)) = 1.10.0 # github.com/aws/aws-sdk-go : Apache-2.0 Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.6 # github.com/beorn7/perks : MIT @@ -129,7 +133,7 @@ Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.11 # 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.4.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 @@ -167,17 +171,17 @@ 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.50.0 +Provides: bundled(golang(github.com/quic-go/quic-go)) = 0.50.1 # 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)) = cf1acfc +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.2 +Provides: bundled(golang(github.com/shirou/gopsutil/v4)) = 4.25.3 # github.com/stretchr/objx : MIT Provides: bundled(golang(github.com/stretchr/objx)) = 0.5.2 # github.com/stretchr/testify : MIT @@ -211,7 +215,7 @@ Provides: bundled(golang(golang.org/x/exp)) = f66d83c # 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.37.0 +Provides: bundled(golang(golang.org/x/net)) = 0.38.0 # golang.org/x/sync : BSD-3-Clause Provides: bundled(golang(golang.org/x/sync)) = 0.12.0 # golang.org/x/sys : BSD-3-Clause @@ -223,7 +227,7 @@ 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.31.0 # google.golang.org/protobuf : BSD-3-Clause -Provides: bundled(golang(google.golang.org/protobuf)) = 1.36.5 +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) From e5158135f8093cc6be84d1736c24aef6064ee582 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:00:16 +0000 Subject: [PATCH 130/133] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 026ea3a8c297a4c13228759ce526684ff0ee1c54 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 18:40:50 -0500 Subject: [PATCH 131/133] Rebuild for golang-1.25.0 From 77e317900f7ef1e1bc77ce072f87d8335a5ccd57 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 17 Aug 2025 13:11:50 +0200 Subject: [PATCH 132/133] Update to version 1.30.0 --- .gitignore | 1 + sources | 2 +- syncthing.spec | 80 +++++++++++++++----------------------------------- 3 files changed, 26 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 57b7f5b..96d755b 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /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 diff --git a/sources b/sources index 57d0cc9..cb41ca6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.29.6.tar.gz) = 5d7364c2c82a6e359ca13c27c5fe1419c273f3070843382a6f2284370476c9eba5179f4622cc007fd598c908ddc2e77c2c9299804f186b4e1ed45112b094822d +SHA512 (syncthing-source-v1.30.0.tar.gz) = 30c69b4dc3373b915da39ecca85c785ecbb19f847b49c1e95e3c5d4417d02415e9a991d3b3d9984f7ae02594d4805c80cf86aba22e33456d352b76a9e5bd3fef diff --git a/syncthing.spec b/syncthing.spec index d292a82..563d026 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,4 @@ -%bcond_with devel - -%global basever 1.29.6 +%global basever 1.30.0 #%%global rcnum 0 Name: syncthing @@ -55,15 +53,15 @@ 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.17.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/internal)) = 1.10.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.0 +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.10.0 +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.6 +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 @@ -80,6 +78,8 @@ 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 +87,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.2 +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)) = 1.5.7 +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.10 +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 @@ -107,7 +107,7 @@ 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)) = a352233 +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 @@ -128,8 +128,6 @@ 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/klauspost/compress : BSD-3-Clause AND Apache-2.0 -Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.11 # github.com/lufia/plan9stats : BSD-3-Clause Provides: bundled(golang(github.com/lufia/plan9stats)) = 873cd01 # github.com/maruel/panicparse : Apache-2.0 @@ -145,7 +143,7 @@ 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.20.2 +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 @@ -161,7 +159,7 @@ 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.21.1 +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 @@ -171,7 +169,7 @@ 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.50.1 +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 @@ -181,13 +179,13 @@ 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.3 +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)) = f0fa8f9 +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 @@ -207,25 +205,23 @@ 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.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.36.0 -# golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = f66d83c +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.38.0 +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.12.0 +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.31.0 +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.23.0 +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.31.0 +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 @@ -243,23 +239,6 @@ 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) @@ -369,10 +348,6 @@ 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 @@ -475,12 +450,5 @@ export GO111MODULE=off %{_mandir}/man1/strelaysrv* -%if %{with devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md AUTHORS -%endif - - %changelog %autochangelog From 2e35c268259448bd0a2ab7dc8e0414283503240e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 15:12:37 +0200 Subject: [PATCH 133/133] rebuild