diff --git a/harden_syncthing-resume.service.patch b/harden_syncthing-resume.service.patch deleted file mode 100644 index ce90e37..0000000 --- a/harden_syncthing-resume.service.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: syncthing/etc/linux-systemd/system/syncthing-resume.service -=================================================================== ---- syncthing.orig/etc/linux-systemd/system/syncthing-resume.service -+++ syncthing/etc/linux-systemd/system/syncthing-resume.service -@@ -4,6 +4,17 @@ Documentation=man:syncthing(1) - After=sleep.target - - [Service] -+# added automatically, for details please see -+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort -+PrivateDevices=true -+ProtectHostname=true -+ProtectClock=true -+ProtectKernelTunables=true -+ProtectKernelModules=true -+ProtectKernelLogs=true -+ProtectControlGroups=true -+RestrictRealtime=true -+# end of automatic additions - Type=oneshot - ExecStart=-/usr/bin/pkill -HUP -x syncthing - diff --git a/syncthing-source-v1.27.10.tar.gz b/syncthing-source-v1.27.10.tar.gz new file mode 100644 index 0000000..ab07463 --- /dev/null +++ b/syncthing-source-v1.27.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d34ca078653ceb3c54d1475929dd1b19e0c2d6601ab6a7ffe48c88d79b90c4dc +size 15431543 diff --git a/syncthing-source-v1.27.10.tar.gz.asc b/syncthing-source-v1.27.10.tar.gz.asc new file mode 100644 index 0000000..ec3b246 --- /dev/null +++ b/syncthing-source-v1.27.10.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEN8hFVOfgomHk924e0m5u0ABlSj4FAmaxwRgACgkQ0m5u0ABl +Sj7YOQgAov03nVdlcOuswm/6Qme4c8V5Suu9wqVUIFyuvgf41qO6WFTYipOMBgCC +DPE/MAuR6DcwGWVThHDu+SXqFUubDGQsCZygQ/HPWZXsG4G9VfrI+VlSGbnoiSpo +Ot09ZXFCV6APHcK9ukz4JgT1K/T9HLw8Yok1TwBdX1EgBIpAYSmpDDAoWlfKzZUw +Y00CaY/2NNvORuJ6/tdeumO0D8RTZmcHvBgS3KopJNlNJrmQNlNdOFrMN0g2s4k7 +L7qDBu87XDqPcl3TYSLskpqN3oQJ0qUCYVTWo5J0E6syUbXkw11+l8fRK6fdHNUn +Djew+B5DrhmmLZesYEXobdk2cXf2yA== +=XF3B +-----END PGP SIGNATURE----- diff --git a/syncthing-source-v1.27.9.tar.gz b/syncthing-source-v1.27.9.tar.gz deleted file mode 100644 index 15bba77..0000000 --- a/syncthing-source-v1.27.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82364794e5dfc912128dd47bd1da3304396bc8a0cae3d1fdb15d9a86a51085e9 -size 15394317 diff --git a/syncthing-source-v1.27.9.tar.gz.asc b/syncthing-source-v1.27.9.tar.gz.asc deleted file mode 100644 index b1c87b8..0000000 --- a/syncthing-source-v1.27.9.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEN8hFVOfgomHk924e0m5u0ABlSj4FAmaD3WIACgkQ0m5u0ABl -Sj5ErQgAmyCTWexSggGR0ZRtzlvY2Zni4eNwgjPHOfcmSy4f/LrieZTFtm4Nrch6 -RI7KJ89SjWbXkDmjZFrTkGGUwVyzJ9V3vQ3wYWwBTMsi688P48J40cWwoZnkp1WR -ynbi4qzriXcxUU6tCB9QdTFpz8LRDic4Mpa/TrGz/RDyHVzqnZDUvlsf3Pu0rOIB -+cXaifY3ftMLYCAbDfd347DIpD+Cab4wi9PiaKGJpf8Nzq6HkThPtUxFxgTtELlW -GVfvuIRRGYC0CGAisDuoaT7vusqtYQEo0ukoanprOm0M1P87G6JARzqORxrIycsf -h6x/kECBP2vkKJwKuUSgXsOmVyZveQ== -=F4wT ------END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index d4da172..0ba40b0 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 6 08:22:39 UTC 2024 - Marius Kittler + +- Update to 1.27.10 + * Bugfixes: + #9455: lib/api tests unreliable, failing ~50% of the time on Fedora Linux + #9499: Data race in fakeFS (testing) + * Remove resume service (and the related patch + harden_syncthing-resume.service.patch) as it was removed + upstream + ------------------------------------------------------------------- Tue Jul 2 11:45:07 UTC 2024 - Marius Kittler diff --git a/syncthing.spec b/syncthing.spec index ccaeee1..3733de6 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 1.27.9 +Version: 1.27.10 Release: 0 Summary: Continuous File Synchronisation License: MPL-2.0 @@ -28,8 +28,7 @@ Source1: https://github.com/%{name}/%{name}/releases/download/v%{version} Source2: %{name}.keyring Source3: %{name}-relaysrv-user.conf Patch0: harden_strelaysrv.service.patch -Patch1: harden_syncthing-resume.service.patch -Patch2: harden_syncthing@.service.patch +Patch1: harden_syncthing@.service.patch BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools BuildRequires: update-desktop-files @@ -101,8 +100,6 @@ sed -i 's,^ReadWritePaths=.*,ReadWritePaths=/var/lib/syncthing-relaysrv,' \ %{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 \ - %{buildroot}%{_unitdir}/%{name}-resume.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 install -Dpm 0644 etc/linux-systemd/user/%{name}.service \ %{buildroot}%{_userunitdir}/%{name}.service @@ -112,13 +109,11 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}-relaysrv.conf %suse_update_desktop_file -i "syncthing-ui" %pre -%service_add_pre %{name}-resume.service %pre relaysrv -f %{name}-strelaysrv.pre %service_add_pre strelaysrv.service %post -%service_add_post %{name}-resume.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 %systemd_user_post %{name}.service %endif @@ -127,7 +122,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}-relaysrv.conf %service_add_post strelaysrv.service %preun -%service_del_preun %{name}@.service %{name}-resume.service +%service_del_preun %{name}@.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 %systemd_user_preun %{name}.service %endif @@ -136,7 +131,6 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}-relaysrv.conf %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 @@ -150,7 +144,6 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}-relaysrv.conf %{_bindir}/%{name} %{_datadir}/applications/syncthing-ui.desktop %{_unitdir}/%{name}@.service -%{_unitdir}/%{name}-resume.service %if 0%{?suse_version} >= 1500 || 0%{?sle_version} > 120300 %{_userunitdir}/%{name}.service %endif