From 732d81f1bef38df54cb427dadb02d21685c35a1783de98c5174b255aacada2bf Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 14 Sep 2017 05:11:21 +0000 Subject: [PATCH 1/2] - Update to version 0.14.37. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=111 --- syncthing-source-v0.14.32.tar.gz | 3 --- syncthing-source-v0.14.32.tar.gz.asc | 11 ----------- syncthing-source-v0.14.37.tar.gz | 3 +++ syncthing-source-v0.14.37.tar.gz.asc | 11 +++++++++++ syncthing.changes | 27 +++++++++++++++++++++++++++ syncthing.spec | 3 +-- 6 files changed, 42 insertions(+), 16 deletions(-) delete mode 100644 syncthing-source-v0.14.32.tar.gz delete mode 100644 syncthing-source-v0.14.32.tar.gz.asc create mode 100644 syncthing-source-v0.14.37.tar.gz create mode 100644 syncthing-source-v0.14.37.tar.gz.asc diff --git a/syncthing-source-v0.14.32.tar.gz b/syncthing-source-v0.14.32.tar.gz deleted file mode 100644 index cc41f78..0000000 --- a/syncthing-source-v0.14.32.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33fcf9ab1a8595304d5f8dbd708df12e983a17e7aea2946bbdd8f95280f95eaa -size 7906564 diff --git a/syncthing-source-v0.14.32.tar.gz.asc b/syncthing-source-v0.14.32.tar.gz.asc deleted file mode 100644 index b731267..0000000 --- a/syncthing-source-v0.14.32.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJZZG+dAAoJENJubtAAZUo+hKkIAK5ZpHpRvttS2xU0q+Mxc5Df -GXlxrQ8QrJziSSVaggDrMQ6pFXnTLM+zOdOK8qz/aUtR3FPXsVem/YZK5rpO9Gat -RZcQN/WvUs48EEDFYbEB9EOeI+Si92dmqspxT6/1mLo3tz9y3IaelEdJ0MyaFcrM -305iPGgMar6S9mF4ZTSWudJ6irzZemGEzAjO8CNu+TOy5+5Tu6yhwBxJlapoB8zP -ekR7E7lnsJG4x9VX6j03uF4TFmUTiinHOK1kVi3cEC6bVFJxnOwMFCj5bgm92DaV -L/t53JkLy5KvgOIkTERiifYJxKS2o0YAJkhl02TcYpET98wiyy+nSgU+3s0u68k= -=0pKt ------END PGP SIGNATURE----- diff --git a/syncthing-source-v0.14.37.tar.gz b/syncthing-source-v0.14.37.tar.gz new file mode 100644 index 0000000..8d8c916 --- /dev/null +++ b/syncthing-source-v0.14.37.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5424fef0b19ab65ec9cf96a46cfbd4bc204b8559293cd3afb22ca99d4827ba0b +size 8400825 diff --git a/syncthing-source-v0.14.37.tar.gz.asc b/syncthing-source-v0.14.37.tar.gz.asc new file mode 100644 index 0000000..67a1a20 --- /dev/null +++ b/syncthing-source-v0.14.37.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJZrp3/AAoJENJubtAAZUo+e00IAK7p9MyrNKrRLDuWu6jKfTgk +znOuSnMPmHP4kA5ITDBJiscNPYARzPKwSWI7Ga5P0wPKqZTacZWTbw2raxtjRVhG +FPN/+5zWNuhQzir28mVycHfIIQyhoZ1ctUfzjNcLNutkB8uJdMbdYWPzKwd48SWU +rEuyP6d7+Nm8vUfa+L1RCRe0CorUj5sfR1w0Cp4y+weLEuWA72sHXs3UqGB1t4SW +3poOelvasbKh0tP3sbtB/5U3Hz9yn+yKJLK2zid1NGZR/ZJPC2uYoRV8X53avoY4 +bzDE7rH6eod9OYVdvsJ4jDpTc8HvrQk9gtg0ww3FYXVfkA/7fg5EKXrCJueia5I= +=3kq4 +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index a5e180f..4466a7e 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Sep 14 05:05:45 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 0.14.37 (changes since 0.14.32): + * Relative version paths are now correctly relative to the + directory path (gh#syncthing/syncthing#4188). + * Remote devices now show bytes remaining to synchronise + (gh#syncthing/syncthing#4227). + * Editing ignore patterns no longer incorrectly shows included + patterns (gh#syncthing/syncthing#4249). + * The new directory dialogue now suggests a default path. + Adjustable via advanced config defaultFolderPath + (gh#syncthing/syncthing#2157). + * The build script no longer sets -installsuffix by default + (gh#syncthing/syncthing#4272). + * Prevent a vulnerability that allows file overwrite via + versioned symlinks (gh#syncthing/syncthing#4286). + * Symlinks are deleted from versioned directories on startup + (gh#syncthing/syncthing#4288). + * Directory paths are no longer reset when editing a directory + without a label (gh#syncthing/syncthing#4297). + * Better detect synchronisation conflicts that happen while + synchronising (gh#syncthing/syncthing#3742, + gh#syncthing/syncthing#4305). + * Fix a crash related to a nil reference in ignore handling + (gh#syncthing/syncthing#4300). + ------------------------------------------------------------------- Fri Jul 21 13:30:37 UTC 2017 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 206fbd8..c069e2f 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.32 +Version: 0.14.37 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0 @@ -103,7 +103,6 @@ install -Dpm 0644 %{name}.firewall \ %endif %files -%defattr(-,root,root) %doc AUTHORS CONDUCT.md CONTRIBUTING.md LICENSE README.md %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %{_bindir}/%{name} From 320ad18180fe101e82b3443fb1fa4bab44990ee251db37a1ce1910260261c881 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 14 Sep 2017 05:39:05 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=112 --- syncthing.changes | 2 ++ syncthing.spec | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/syncthing.changes b/syncthing.changes index 4466a7e..1d03335 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -24,6 +24,8 @@ Thu Sep 14 05:05:45 UTC 2017 - sor.alexei@meowr.ru gh#syncthing/syncthing#4305). * Fix a crash related to a nil reference in ignore handling (gh#syncthing/syncthing#4300). +- Stop requiring golang.org/x/net/context. + ------------------------------------------------------------------- Fri Jul 21 13:30:37 UTC 2017 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index c069e2f..ea16156 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -30,12 +30,9 @@ Source3: %{name}.firewall BuildRequires: go >= 1.5 BuildRequires: systemd BuildRequires: systemd-rpm-macros -%if 0%{?suse_version} <= 1320 -BuildRequires: golang-org-x-net-context -%endif %description -Syncthing replaces proprietary sync and cloud services with +Syncthing replaces proprietary synch and cloud services with something open, trustworthy and decentralised. 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 @@ -50,9 +47,6 @@ cp -f %{SOURCE3} %{name}.firewall sed -i '/^RestartForceExitStatus=/d;s/^\(SuccessExitStatus=\).*$/\12/' \ etc/linux-systemd/system/syncthing@.service %endif -%if 0%{?suse_version} <= 1320 -find -type f -name '*.go' -exec sed -i 's|"context"|"golang.org/x/net/context"|' {} \; -%endif %build mkdir -p build/src/ build/vendor/