From dcaf84bba57da42dbd7bce98d2eb009e0313e0761d28406f1c5828273b6c1db6 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 18 Aug 2020 15:47:35 +0000 Subject: [PATCH] Accepting request 827606 from home:mkittler:branches:network - Prevent the build system to download Go modules which would require an internet connection during the build - Update to 1.8.0 - The 1.8.0 release - adds the experimental copyRangeMethod config on folders, for use on filesystems with copy-on-write support. Please see https://docs.syncthing.net/advanced/folder-copyrangemethod.html for details. - adds TCP hole punching, used to establish high performance TCP connections in certain NAT scenarios where only relay or QUIC connections could be used previously. - adds a configuration to file versioning for how often to run cleanup. This defaults to once an hour, but is configurable from very frequently to never. - The 1.7.0 release performs a database migration to optimize for clusters with many devices. - The 1.6.0 release performs a database schema migration, and adds the BlockPullOrder, DisableFsync and MaxConcurrentWrites folder options to the configuration schema. The LocalChangeDetected event no longer has the action set to added for new files, instead showing modified for all local file changes. - The 1.5.0 release changes the default location for the index database under some circumstances. Two new flags can also be used to affect the location of the configuration (-config) and database (-data) separately. The old -home flag is equivalent to setting both of these to the same directory. When no flags are given the following logic is used to determine the data location: If a database exists in the old default location, that location is still used. This means existing installations are not affected by this change. If $XDG_DATA_HOME is set, use $XDG_DATA_HOME/syncthing. If ~/.local/share/syncthing exists, use that location. Use the old default location. OBS-URL: https://build.opensuse.org/request/show/827606 OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=193 --- syncthing-source-v1.4.2.tar.gz | 3 --- syncthing-source-v1.4.2.tar.gz.asc | 11 --------- syncthing-source-v1.8.0.tar.gz | 3 +++ syncthing-source-v1.8.0.tar.gz.asc | 11 +++++++++ syncthing.changes | 38 ++++++++++++++++++++++++++++++ syncthing.spec | 33 +++++++++++++------------- 6 files changed, 69 insertions(+), 30 deletions(-) delete mode 100644 syncthing-source-v1.4.2.tar.gz delete mode 100644 syncthing-source-v1.4.2.tar.gz.asc create mode 100644 syncthing-source-v1.8.0.tar.gz create mode 100644 syncthing-source-v1.8.0.tar.gz.asc diff --git a/syncthing-source-v1.4.2.tar.gz b/syncthing-source-v1.4.2.tar.gz deleted file mode 100644 index ab1e131..0000000 --- a/syncthing-source-v1.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:061af43c1bbfcdf949499cdc50a325fff7cd67fb48f9d270adb52b4decbab899 -size 10440033 diff --git a/syncthing-source-v1.4.2.tar.gz.asc b/syncthing-source-v1.4.2.tar.gz.asc deleted file mode 100644 index f48cdde..0000000 --- a/syncthing-source-v1.4.2.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEbBAABCAAGBQJejXrFAAoJENJubtAAZUo+UVIH9jwRwn0vwfNmdFAIqiPuABsG -TNltKsBYTuJ3teHbtHm5s1hAyDvhBHOLlNkm4FyVuoPjzcgxpL6oryp2IzNKq8HR -eRdC1nQAsPzV+2sTvyNbXGs995OqNdToszVpTDUZ6UByV0FM2MJrmpcs2WqH6v6c -ynshoUb1RW3wFMUk17rDd3zZy+Lk3LPLxBQ2dFeV9HWEhfMzTwdw6xyyouTBBmCf -x4JbOemOVOKf5eDOdWE2MTeEN8nNYwqsjUPYabFJVq8OCInFUGo/wRo1UwcyqXms -CwICZSyAAWu3sTYFityGRa0ULo5VCScwC62G7OTxsc5Rf23mXCocv+6CEs/qgA== -=bZcn ------END PGP SIGNATURE----- diff --git a/syncthing-source-v1.8.0.tar.gz b/syncthing-source-v1.8.0.tar.gz new file mode 100644 index 0000000..217f87a --- /dev/null +++ b/syncthing-source-v1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04d78fbe6015334c284bf46ffcf8feb6b2b690ef810f2f0c5732cdee5cd8142a +size 11663728 diff --git a/syncthing-source-v1.8.0.tar.gz.asc b/syncthing-source-v1.8.0.tar.gz.asc new file mode 100644 index 0000000..ba74b7f --- /dev/null +++ b/syncthing-source-v1.8.0.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJfMmERAAoJENJubtAAZUo+EXwH/iKHY9hiBfO1+0kJUrMU8qCr +pk7gl5J0OVyuSD+wMlOiZfSNrInH7IF3uV58hsXre5KseYgc5pVEh2Q5mQHL3rWY +xZqPH5dCleoGHi3zapyI9W5uxuKAtAN04BXtyOeqyOifYptLqgIPNOL+j7QLmxNn +zqJPR7BSTEa6BjkvW1iEUQGB8TqzZRDdyIlF8CxvLU1sq8OxEoxsYvae/HZ+piKA +J2ScGJUq75dbwnRJSeak8S+wh2d7abdSlCDGoo+a1aGQcW+i6kZXckxHzOIo+YNq +fJrjkvCgB1g+ByUcoW9jvf2bt5304rwm/Blxo746GljFtLFUhuBL6pECgLbbLCU= +=PQvq +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index acaf7b0..b41d523 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue Aug 18 11:46:09 UTC 2020 - Marius Kittler + +- Prevent the build system to download Go modules which would require an + internet connection during the build +- Update to 1.8.0 + - The 1.8.0 release + - adds the experimental copyRangeMethod config on folders, for use on + filesystems with copy-on-write support. Please see + https://docs.syncthing.net/advanced/folder-copyrangemethod.html for + details. + - adds TCP hole punching, used to establish high performance TCP + connections in certain NAT scenarios where only relay or QUIC + connections could be used previously. + - adds a configuration to file versioning for how often to run cleanup. + This defaults to once an hour, but is configurable from very + frequently to never. + - The 1.7.0 release performs a database migration to optimize for clusters + with many devices. + - The 1.6.0 release performs a database schema migration, and adds the + BlockPullOrder, DisableFsync and MaxConcurrentWrites folder + options to the configuration schema. The LocalChangeDetected event no + longer has the action set to added for new files, instead showing modified + for all local file changes. + - The 1.5.0 release changes the default location for the index database under + some circumstances. Two new flags can also be used to affect the + location of the configuration (-config) and database (-data) + separately. The old -home flag is equivalent to setting both of these + to the same directory. When no flags are given the following logic is + used to determine the data location: + + If a database exists in the old default location, that location is + still used. This means existing installations are not affected by this + change. + If $XDG_DATA_HOME is set, use $XDG_DATA_HOME/syncthing. + If ~/.local/share/syncthing exists, use that location. + Use the old default location. + ------------------------------------------------------------------- Wed Apr 8 07:50:58 UTC 2020 - Martin Rey diff --git a/syncthing.spec b/syncthing.spec index df2d1e4..e6a6016 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 1.4.2 +Version: 1.8.0 Release: 0 Summary: Continuous File Synchronisation License: MPL-2.0 @@ -51,31 +51,32 @@ joined to the syncthing relay pool or private. %setup -q -n %{name} %build -export BUILD_USER=abuild -export BUILD_HOST=openSUSE -mkdir -p build/src/ build/vendor/ -export GOPATH="$PWD/build:$PWD/build/vendor" +# move source archive which is extracted as "syncthing" to be "src/github.com/syncthing/syncthing" +cd .. +install -d "src/github.com/syncthing/" +mv %{name} "src/github.com/syncthing/"%{name} +mkdir syncthing +cd "$PWD/src/github.com/syncthing/"%{name} -mkdir -p build/src/github.com/%{name}/%{name} -ls | sed '/^build$/d' | xargs cp -at build/src/github.com/%{name}/%{name} -cp -a vendor build/vendor/src +# set build environment, in particular use "-mod=vendor" to use the Go modules from the source archive's vendor dir +export BUILD_USER=abuild BUILD_HOST=openSUSE +export CGO_CPPFLAGS="${CPPFLAGS}" CGO_CFLAGS="${CFLAGS}" CGO_CXXFLAGS="${CXXFLAGS}" CGO_LDFLAGS="${LDFLAGS}" +export GOFLAGS="-trimpath -mod=vendor" -pushd build/src/github.com/%{name}/%{name}/ # build and install stcli which has no dedicated target and can not be built with -no-upgrade go run build.go -version v%{version} install all # build and install syncthing without automatic updates go run build.go -no-upgrade -version v%{version} install # build and install strelaysrv without automatic updates go run build.go -no-upgrade -version v%{version} install strelaysrv -popd %install -install -Dpm 0755 build/src/github.com/%{name}/%{name}/bin/%{name} \ - %{buildroot}%{_bindir}/%{name} -install -Dpm 0755 build/src/github.com/%{name}/%{name}/bin/stcli \ - %{buildroot}%{_bindir}/stcli -install -Dpm 0755 build/src/github.com/%{name}/%{name}/bin/strelaysrv \ - %{buildroot}%{_bindir}/strelaysrv +st_dir=$PWD +cd ../src/github.com/syncthing/%{name} +mv LICENSE AUTHORS CONDUCT.md CONTRIBUTING.md README.md "$st_dir" +install -Dpm 0755 bin/%{name} %{buildroot}%{_bindir}/%{name} +install -Dpm 0755 bin/stcli %{buildroot}%{_bindir}/stcli +install -Dpm 0755 bin/strelaysrv %{buildroot}%{_bindir}/strelaysrv install -dm 0750 %{buildroot}/%{_localstatedir}/lib/strelaysrv install -Dpm 0644 cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ %{buildroot}%{_unitdir}/strelaysrv.service