From 527ab5edec9f92131bd21255bd6a2d989bdd09cfa9d9552d99625ce3d0b8b8ca Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 19 Feb 2019 12:50:14 +0000 Subject: [PATCH 1/3] Accepting request 677328 from home:mkittler:branches:network - Update to 1.0.1 OBS-URL: https://build.opensuse.org/request/show/677328 OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=156 --- syncthing-source-v1.0.0.tar.gz | 3 --- syncthing-source-v1.0.0.tar.gz.asc | 11 ----------- syncthing-source-v1.0.1.tar.gz | 3 +++ syncthing-source-v1.0.1.tar.gz.asc | 11 +++++++++++ syncthing.changes | 5 +++++ syncthing.spec | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 syncthing-source-v1.0.0.tar.gz delete mode 100644 syncthing-source-v1.0.0.tar.gz.asc create mode 100644 syncthing-source-v1.0.1.tar.gz create mode 100644 syncthing-source-v1.0.1.tar.gz.asc diff --git a/syncthing-source-v1.0.0.tar.gz b/syncthing-source-v1.0.0.tar.gz deleted file mode 100644 index 54b85ed..0000000 --- a/syncthing-source-v1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27435f9ef7c276736ec16781ad6b27fecb28053b8ffb16e0bae40c1e9bb62225 -size 10801212 diff --git a/syncthing-source-v1.0.0.tar.gz.asc b/syncthing-source-v1.0.0.tar.gz.asc deleted file mode 100644 index 8f5a18d..0000000 --- a/syncthing-source-v1.0.0.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJcKyW0AAoJENJubtAAZUo+AsEH/27jLpl3fUDKk1eDEQTD74YD -0ZHmaUhqfR5X4t9cM69wUlodAL6Qw0A2pqzAkiKgRCKpMIBDsuNV0IdYX5jYo6uO -Sl2WNbzJmUXtrKvkwGBYeFq+d4pxh4COZmd0R87D3Z3soHtG3DQTvlKw0qBmjp2a -rzDjQEgFHDPna+F2VcEQJBYSZH39qhk2GZ8Bq8QuPN8IZRFYGbI8FcTNelGNfxdD -R8d/MA6VlB0OQyIK4i18Nn01cbxQ54xPWyz1ISHIkE6yOguWCoQcOqRk1E/qwTbC -S9Bhns2rKpAffSBWw0eS2f2tt1Vu0aIj8DvvM3Bl1SNvsmWJPGcRzGmXP9CCy0A= -=X+UL ------END PGP SIGNATURE----- diff --git a/syncthing-source-v1.0.1.tar.gz b/syncthing-source-v1.0.1.tar.gz new file mode 100644 index 0000000..8f6505d --- /dev/null +++ b/syncthing-source-v1.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c36291efcea790df9db3b67a39a64e32a77332489abdae8260a295dae9015a3d +size 6876569 diff --git a/syncthing-source-v1.0.1.tar.gz.asc b/syncthing-source-v1.0.1.tar.gz.asc new file mode 100644 index 0000000..03950dc --- /dev/null +++ b/syncthing-source-v1.0.1.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJcWTJTAAoJENJubtAAZUo+LXMH/3C0BeqvvhPoXV+Qc+G4ixxn +Xn1oep9CZ5jQvzwrWDRCc6c+h6W6ie/nZehJHLBIUXaOpVJYHzovqVDN0JwS9fgq +z4uUGbuF0G4Qi75vqGiAjm9nJiE4e9PY6MdEYzx3tQpdwC7qGns+xF+tquAdEAsS +1lTbEdqNhgZoZNNJ/fxg6TlVoMn8+h/ImIUbJGuS5BS8rbNocvgdJZbW0mmh8I3K +UgWT8BGTuoTTgb67ihQR9v51W/zMrK3cLK1Pqp/w7xY+CbcuYa5AFAGPueBtpJAk +cRKXIq/4PNdVmwagjsDHylCdnBKb5nY+HXL/BAHVMcnwKxuiw9NkpO9re3pC6ac= +=6isG +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index 39785ca..b97f0df 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 19 10:45:23 UTC 2019 - Marius Kittler + +- Update to 1.0.1 + ------------------------------------------------------------------- Thu Jan 31 10:21:31 UTC 2019 - Hans-Peter Jansen diff --git a/syncthing.spec b/syncthing.spec index b53c91f..8f3992c 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: Continuous File Synchronisation License: MPL-2.0 From 6b91d0808192396828e9e77e6e6ae88a16390770cb031fd8514b95bec9cb83fc Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 19 Feb 2019 13:01:31 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=157 --- syncthing.changes | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/syncthing.changes b/syncthing.changes index b97f0df..5bde384 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,7 +1,26 @@ ------------------------------------------------------------------- Tue Feb 19 10:45:23 UTC 2019 - Marius Kittler -- Update to 1.0.1 +- Update to version 1.0.1: + * Directory status "box" character not readable by + screen readers / not colour blindness friendly + (gh#syncthing/syncthing#2697). + * "Automatic upgrades" web GUI option in pre-release versions is + misleading (gh#syncthing/syncthing#4216). + * Incorrectly out of synch, sequence number oddness + (gh#syncthing/syncthing#5340). + * Deleted files show up as failed scans + (gh#syncthing/syncthing#5385). + * gui: Missing icon in footer (gh#syncthing/syncthing#5389). + * Data race in model.(*folder).startWatch() + (gh#syncthing/syncthing#5392). + * Scan errors about ignored files displayed in web UI + (gh#syncthing/syncthing#5397). + * panic: runtime error: Invalid memory address or nil pointer + dereference in ignore.go (gh#syncthing/syncthing#5401). + * Illegal characters in directory name on auto accept + (gh#syncthing/syncthing#5411). + * Consider switching to Go modules (gh#syncthing/syncthing#5148). ------------------------------------------------------------------- Thu Jan 31 10:21:31 UTC 2019 - Hans-Peter Jansen From 5c69908f7077b16c1542b6de1501d487f5a1b78b515c9304ad0a0801f4b0b50e Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 26 Feb 2019 21:40:28 +0000 Subject: [PATCH 3/3] Accepting request 679442 from home:bhwachter - Package additional binaries * Add CLI (stcli) to main package * Add relay server (strelaysrv) to relaysrv subpackage OBS-URL: https://build.opensuse.org/request/show/679442 OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=158 --- syncthing.changes | 7 +++++++ syncthing.spec | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/syncthing.changes b/syncthing.changes index 5bde384..9954f87 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 26 11:11:02 UTC 2019 - Bernd Wachter + +- Package additional binaries + * Add CLI (stcli) to main package + * Add relay server (strelaysrv) to relaysrv subpackage + ------------------------------------------------------------------- Tue Feb 19 10:45:23 UTC 2019 - Marius Kittler diff --git a/syncthing.spec b/syncthing.spec index 8f3992c..a806896 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -36,6 +36,16 @@ Syncthing is an application that synchronises files across multiple devices. This means the creation, modification or deletion of files on one machine will automatically be replicated to other devices. +%package relaysrv +Summary: Relay server for syncthing +Group: Productivity/Networking/File-Sharing +Requires(pre): pwdutils + +%description relaysrv +Syncthing requires relay servers for NAT traversal. This package +contains the necessary files for setting up a relay server, either +joined to the syncthing relay pool or private. + %prep %setup -q -n %{name} @@ -58,6 +68,17 @@ 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 +install -dm 0750 %{buildroot}/%{_localstatedir}/lib/strelaysrv +install -Dpm 0644 cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ + %{buildroot}%{_unitdir}/strelaysrv.service +sed -i '/Service\]/a EnvironmentFile=-\/etc\/default/strelaysrv' \ + %{buildroot}%{_unitdir}/strelaysrv.service +sed -i 's,^ExecStart=.*,ExecStart=/usr/bin/strelaysrv $OPTIONS,' \ + %{buildroot}%{_unitdir}/strelaysrv.service install -Dpm 0644 etc/linux-systemd/system/%{name}@.service \ %{buildroot}%{_unitdir}/%{name}@.service install -Dpm 0644 etc/linux-systemd/system/%{name}-resume.service \ @@ -72,33 +93,53 @@ install -Dpm 0644 %{name}.firewall \ %pre %service_add_pre %{name}-resume.service +%pre relaysrv +%service_add_pre strelaysrv.service +/usr/sbin/groupadd -r strelaysrv &>/dev/null ||: +/usr/sbin/useradd -g strelaysrv -s /bin/false -r -c "User for syncthing relay server" -d /var/lib/strelaysrv strelaysrv &>/dev/null ||: + %post %service_add_post %{name}-resume.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 %systemd_user_post %{name}.service %endif +%post relaysrv +%service_add_post strelaysrv.service + %preun %service_del_preun %{name}@.service %{name}-resume.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 %systemd_user_preun %{name}.service %endif +%preun relaysrv +%service_del_preun strelaysrv.service + %postun %service_del_postun %{name}-resume.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 %systemd_user_postun %{name}.service %endif +%postun relaysrv +%service_del_postun strelaysrv.service + %files %license LICENSE %doc AUTHORS CONDUCT.md CONTRIBUTING.md README.md %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %{_bindir}/%{name} +%{_bindir}/stcli %{_unitdir}/%{name}@.service %{_unitdir}/%{name}-resume.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 %{_userunitdir}/%{name}.service %endif +%files relaysrv +%{_bindir}/strelaysrv +%{_unitdir}/strelaysrv.service +%dir %attr(750,strelaysrv,strelaysrv) %{_localstatedir}/lib/strelaysrv + %changelog