From c48fe11a0b5d1aaadaaa450a8d834b8da3260815e9929e32b58d6ec1ab3166b0 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 9 Aug 2015 23:01:12 +0000 Subject: [PATCH 1/5] - Update to 0.11.19. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=21 --- syncthing-0.11.18.tar.gz | 3 --- syncthing-0.11.19.tar.gz | 3 +++ syncthing.changes | 9 +++++++++ syncthing.firewall | 5 +++++ syncthing.spec | 5 ++++- 5 files changed, 21 insertions(+), 4 deletions(-) delete mode 100644 syncthing-0.11.18.tar.gz create mode 100644 syncthing-0.11.19.tar.gz create mode 100644 syncthing.firewall diff --git a/syncthing-0.11.18.tar.gz b/syncthing-0.11.18.tar.gz deleted file mode 100644 index 5228452..0000000 --- a/syncthing-0.11.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd93392687e545e2b779d10754e24cd49ecbfc03cabaceac381b5a3e69693be6 -size 3391683 diff --git a/syncthing-0.11.19.tar.gz b/syncthing-0.11.19.tar.gz new file mode 100644 index 0000000..4a56655 --- /dev/null +++ b/syncthing-0.11.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a57bbf9264f8db03e22657958e2b0d77438acc2180be8a24a8d9965d63a00cff +size 3393477 diff --git a/syncthing.changes b/syncthing.changes index b87bc65..0693a39 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Aug 9 21:43:38 UTC 2015 - sor.alexei@meowr.ru + +- Update to 0.11.19: + * Properly rename config files during integration tests. + * Add timeout for peek. + * Handle multiple case insensitivity prefixes in ignores. +- Add a SUSEfirewall rule. + ------------------------------------------------------------------- Sun Aug 2 09:32:36 UTC 2015 - sor.alexei@meowr.ru diff --git a/syncthing.firewall b/syncthing.firewall new file mode 100644 index 0000000..551f04c --- /dev/null +++ b/syncthing.firewall @@ -0,0 +1,5 @@ +## Name: HTTP Server +## Description: Opens ports for Syncthing. + +# space separated list of allowed TCP ports +TCP="21025 21026 22000" diff --git a/syncthing.spec b/syncthing.spec index 08f2871..8196988 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,13 +17,14 @@ Name: syncthing -Version: 0.11.18 +Version: 0.11.19 Release: 0 Summary: FOSS Continuous File Synchronization License: MPL-2.0 Group: Productivity/Networking/File-Sharing Url: https://syncthing.net/ Source: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: %{name}.firewall BuildRequires: go >= 1.3 BuildRequires: systemd BuildRequires: systemd-rpm-macros @@ -50,6 +51,7 @@ install -Dm 0644 etc/linux-systemd/system/%{name}@.service \ %{buildroot}%{_unitdir}/%{name}@.service install -Dm 0644 etc/linux-systemd/user/%{name}.service \ %{buildroot}%{_userunitdir}/%{name}.service +install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %pre %service_add_pre %{name}@.service @@ -75,6 +77,7 @@ install -Dm 0644 etc/linux-systemd/user/%{name}.service \ %files %defattr(-,root,root) %doc AUTHORS CONDUCT.md CONTRIBUTING.md LICENSE README.md +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy %{_bindir}/%{name} %{_unitdir}/%{name}@.service %if 0%{?suse_version} > 1320 From 95d13e27efcd641429bdc040b03a35b7c054de9b0b36522a19b23a3536ee9a92 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 9 Aug 2015 23:02:03 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=22 --- syncthing.firewall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncthing.firewall b/syncthing.firewall index 551f04c..bf9f587 100644 --- a/syncthing.firewall +++ b/syncthing.firewall @@ -1,4 +1,4 @@ -## Name: HTTP Server +## Name: FOSS Continuous File Synchronization ## Description: Opens ports for Syncthing. # space separated list of allowed TCP ports From 3a15f4387981eb5316dbd4914e670f985aafcc5302064216f07cbad9515bc43e Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 9 Aug 2015 23:04:25 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=23 --- syncthing.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncthing.spec b/syncthing.spec index 8196988..eb51e70 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -77,7 +77,7 @@ install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d %files %defattr(-,root,root) %doc AUTHORS CONDUCT.md CONTRIBUTING.md LICENSE README.md -%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %{_bindir}/%{name} %{_unitdir}/%{name}@.service %if 0%{?suse_version} > 1320 From 0740733df787cf866765616c2536f08c1202b4530f49f76df4371394524b3559 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 9 Aug 2015 23:07:01 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=24 --- syncthing.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syncthing.spec b/syncthing.spec index eb51e70..e56fb2e 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -58,19 +58,19 @@ install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d %post %service_add_post %{name}@.service -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 %systemd_user_post %{name}.service %endif %preun %service_del_preun %{name}@.service -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 %systemd_user_preun %{name}.service %endif %postun %service_del_postun %{name}@.service -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 %systemd_user_postun %{name}.service %endif @@ -80,7 +80,7 @@ install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %{_bindir}/%{name} %{_unitdir}/%{name}@.service -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 %{_userunitdir}/%{name}.service %endif From a65556b1c2f91821f405489d60be0103b278ab8f1de054e5bbd80f4212889820 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 9 Aug 2015 23:07:40 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=25 --- syncthing.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syncthing.spec b/syncthing.spec index e56fb2e..eb51e70 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -58,19 +58,19 @@ install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d %post %service_add_post %{name}@.service -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%if 0%{?suse_version} > 1320 %systemd_user_post %{name}.service %endif %preun %service_del_preun %{name}@.service -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%if 0%{?suse_version} > 1320 %systemd_user_preun %{name}.service %endif %postun %service_del_postun %{name}@.service -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%if 0%{?suse_version} > 1320 %systemd_user_postun %{name}.service %endif @@ -80,7 +80,7 @@ install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %{_bindir}/%{name} %{_unitdir}/%{name}@.service -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%if 0%{?suse_version} > 1320 %{_userunitdir}/%{name}.service %endif