diff --git a/sanlock-3.8.5.tar.gz b/sanlock-3.8.5.tar.gz deleted file mode 100644 index 351e21aee22243a7459bf2686c3af4824474e4e8..0000000000000000000000000000000000000000 Binary files a/sanlock-3.8.5.tar.gz and /dev/null differ diff --git a/sanlock-3.9.4.tar.gz b/sanlock-3.9.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8e540fe71b74a9bd068f732c71f80770dd843b22 Binary files /dev/null and b/sanlock-3.9.4.tar.gz differ diff --git a/sanlock.spec b/sanlock.spec index acb98de60186b42b2976af6be575e61e1a8718e6..419e7bd16d097397daab59bc7f2eaaa5ff002d14 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,14 +1,15 @@ Name: sanlock -Version: 3.8.5 +Version: 3.9.4 Release: 1 Summary: A shared storage lock manager -License: GPLv2 and GPLv2+ and LGPLv2+ +License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later URL: https://pagure.io/sanlock/ Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz Patch1: Add-sanlk-reset-command-t-options.patch BuildRequires: libblkid-devel libaio-devel python3 python3-devel systemd-units gcc +BuildRequires: libuuid-devel python3-setuptools Requires(pre): shadow Requires(post): systemd-units systemd-sysv Requires(preun): systemd-units @@ -76,13 +77,15 @@ make -C python install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT PY_VERSION=3 make -C reset install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service -install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-wdmd -install -D -m 0644 init.d/wdmd.service.native $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service +install -D -m 0755 init.d/systemd-wdmd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-wdmd +install -D -m 0644 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service install -D -m 0644 init.d/sanlk-resetd.service $RPM_BUILD_ROOT/%{_unitdir}/sanlk-resetd.service install -D -m 0644 src/logrotate.sanlock $RPM_BUILD_ROOT/etc/logrotate.d/sanlock install -D -m 0644 src/sanlock.conf $RPM_BUILD_ROOT/etc/sanlock/sanlock.conf install -D -m 0644 init.d/wdmd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/wdmd +install -p -D -m 0644 src/sanlock.sysusers $RPM_BUILD_ROOT/%{_sysusersdir}/sanlock.conf + install -Dd -m 0755 $RPM_BUILD_ROOT/etc/wdmd.d install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlock install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlk-resetd @@ -119,6 +122,7 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \ %config(noreplace) %{_sysconfdir}/logrotate.d/sanlock %config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf %config(noreplace) %{_sysconfdir}/sysconfig/wdmd +%{_sysusersdir}/sanlock.conf %doc init.d/sanlock %doc init.d/sanlock.service %doc init.d/wdmd.service @@ -152,6 +156,21 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \ %changelog +* Fri Oct 11 2024 yaoxin - 3.9.4-1 +- Update to 3.9.4: + * Make the watchdog timeout configurable + * wdmd: close watchdog when not used + * userstorage: replace by PyPI userstorage + * sanlock: skip short delay in delta lease reacquire + * sanlock: use product_uuid for host name + * wdmd: fix timing for iTCO_wdt + * sanlock: save client_id in token and report in status and use in -C + * sanlock: include startup message in syslog + * sanlock: improve repeated ballots in paxos_acquire + * sanlock: fix zero io timeout for direct requests + * sanlock: fix release writing zero dblock values + * sanlock: skip delay when same host acquires delta lease + * Wed Apr 12 2023 wangjie5911 - 3.8.5-1 - update to 3.8.5 and sync patch Add sanlk_reset command t options.