Resolves: RHEL-64143

.gitignore

@@ -33,3 +33,4 @@
 /sanlock-3.8.5.tar.gz
 /sanlock-3.9.0.tar.gz
 /sanlock-3.9.4.tar.gz
+/sanlock-3.9.5.tar.gz

0001-systemd-wdmd-work-around-race-with-udev-setting-soft.patch

@@ -0,0 +1,29 @@
+From 9c626f97b25bf1973ece91c6f5dd67628bb0abd1 Mon Sep 17 00:00:00 2001
+From: David Teigland <teigland@redhat.com>
+Date: Fri, 18 Oct 2024 12:57:49 -0500
+Subject: [PATCH] systemd-wdmd: work around race with udev setting softdog
+ label
+
+After modprobe softdog, udev wants to set permission and/or label
+on the watchdog device.  Wait until that's done before trying to
+test/probe the watchdog device.  RHEL-56479
+---
+ init.d/systemd-wdmd | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/init.d/systemd-wdmd b/init.d/systemd-wdmd
+index 001609736287..c3126c408a89 100644
+--- a/init.d/systemd-wdmd
++++ b/init.d/systemd-wdmd
+@@ -19,6 +19,8 @@ watchdog_check() {
+ 	if [ $retval -ne 0 ]; then
+ 		echo -n $"Loading the softdog kernel module: "
+ 		modprobe softdog
++		# handle delay in udev setting permission/label
++		udevadm settle
+ 
+ 		watchdog_probe
+ 		retval=$?
+-- 
+2.46.2
+

modprobe-softdog-udevadm-settle.patch

@@ -0,0 +1,12 @@
+diff --git a/init.d/systemd-wdmd b/init.d/systemd-wdmd
+index 001609736287..c358afa14af7 100644
+--- a/init.d/systemd-wdmd
++++ b/init.d/systemd-wdmd
+@@ -19,6 +19,7 @@ watchdog_check() {
+ 	if [ $retval -ne 0 ]; then
+ 		echo -n $"Loading the softdog kernel module: "
+ 		modprobe softdog
++		udevadm settle
+ 
+ 		watchdog_probe
+ 		retval=$?

sanlock.spec

@@ -1,6 +1,6 @@
 Name:           sanlock
-Version:        3.9.4
-Release:        3%{?dist}
+Version:        3.9.5
+Release:        1%{?dist}
 Summary:        A shared storage lock manager
 License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later
 URL:            https://pagure.io/sanlock/
@@ -19,7 +19,7 @@ Requires(preun): systemd-units
 Requires(postun): systemd-units
 Source0:        https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz
 
-Patch0: 0001-sanlock-fix-invalid-strcpy-in-direct-dump.patch
+Patch0: 0001-systemd-wdmd-work-around-race-with-udev-setting-soft.patch
 
 %description
 The sanlock daemon manages leases for applications on hosts using shared storage.
@@ -126,6 +126,9 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/libsanlock_client.pc
 
 %changelog
+* Tue Oct 22 2024 David Teigland <teigland@redhat.com> - 3.9.5-1
+- new upstream release
+
 * Thu Oct 03 2024 David Teigland <teigland@redhat.com> - 3.9.4-3
 - fix install of sanlock.sysusers
 

sources

@@ -1 +1 @@
-SHA512 (sanlock-3.9.4.tar.gz) = e20e191230f84a33125c3dc4498fc2700ae43ce80946c2436ec619b420520f5c9d70f761a71016192240da6f587f66b9e63ee1221c75eb74f346df5a55252b6f
+SHA512 (sanlock-3.9.5.tar.gz) = 2342ee57d98c0e209d92ad809aae22f919c02920a2db194be2fc4f60677c32c2f27621ab0183b69c36ae1d0814753fb3461985bc4a8d1bced879b403ff0cf400