From 95ecf6f6233d254cf26d1055c2fac2347e87830621368e0aa9a512556b955e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 18 Dec 2024 16:18:55 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main sbd revision
 fe73b6e8e1edc5f2c2f36370fc70ae74

---
 _servicedata                      |  2 +-
 sbd-1.5.2+20230316.5ec38cf.tar.xz |  3 ---
 sbd-1.5.2+20241209.5946119.tar.xz |  3 +++
 sbd.changes                       | 16 ++++++++++++++++
 sbd.spec                          | 25 +++++++++++++++++++++----
 5 files changed, 41 insertions(+), 8 deletions(-)
 delete mode 100644 sbd-1.5.2+20230316.5ec38cf.tar.xz
 create mode 100644 sbd-1.5.2+20241209.5946119.tar.xz

diff --git a/_servicedata b/_servicedata
index 89cad67..c53f213 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/ClusterLabs/sbd.git</param>
-    <param name="changesrevision">0e4534ebdfe8d7a37beb0028e604e560a5674891</param>
+    <param name="changesrevision">12dbb6938254450859fbc17cbabeefebff8346c6</param>
   </service>
 </servicedata>
\ No newline at end of file
diff --git a/sbd-1.5.2+20230316.5ec38cf.tar.xz b/sbd-1.5.2+20230316.5ec38cf.tar.xz
deleted file mode 100644
index 2b1b91c..0000000
--- a/sbd-1.5.2+20230316.5ec38cf.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67bed84ee1bf81855294ae8012a29211c3c92cf93f696f0adec09f2abe009ee9
-size 72836
diff --git a/sbd-1.5.2+20241209.5946119.tar.xz b/sbd-1.5.2+20241209.5946119.tar.xz
new file mode 100644
index 0000000..cd5ca03
--- /dev/null
+++ b/sbd-1.5.2+20241209.5946119.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98e8029a36e002adb8d314d9e9fb7d5850dd27f6c79f79318516d2f2d8aa18d0
+size 73440
diff --git a/sbd.changes b/sbd.changes
index 05dc040..ae62658 100644
--- a/sbd.changes
+++ b/sbd.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Dec 09 08:24:47 UTC 2024 - Yan Gao <ygao@suse.com>
+
+- Update to version 1.5.2+20241209.5946119:
+- spec: try finding and using libaio.so.x library name (gh#ClusterLabs/sbd#157)
+- tests: ability to specify a libaio name (gh#ClusterLabs/sbd#157)
+
+-------------------------------------------------------------------
+Mon Dec 02 09:43:34 UTC 2024 - Yan Gao <ygao@suse.com>
+
+- Update to version 1.5.2+20241126.6cc9ac9:
+- sbd-inquisitor: avoid parsing SBD_DELAY_START as a time duration if its value is boolean false (gh#ClusterLabs/sbd#156)
+- test: load libaio.so instead of libaio.so.1
+- move time difference / timeout calculation to single place
+- use int for timeouts & latency instead of wild mix and casts
+
 -------------------------------------------------------------------
 Tue Jun 20 04:16:55 UTC 2023 - Yan Gao <ygao@suse.com>
 
diff --git a/sbd.spec b/sbd.spec
index 454abf6..741b702 100644
--- a/sbd.spec
+++ b/sbd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package sbd
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2013 Lars Marowsky-Bree
 #
 # All modifications and additions to the file contributed by third parties
@@ -46,10 +46,18 @@
 # by setting below to an explicit 'yes' or 'no'.
 %global sync_resource_startup_sysconfig ""
 
+# Try finding and using libaio.so.x library name i.e. the one with the major
+# version number such as libaio.so.1
+%global libaio_name %(readlink -f %{_libdir}/libaio.so | xargs basename | cut -d "." -f 1-3)
+
+%if "%{libaio_name}" != "" && "%{libaio_name}" != "libaio.so"
+%global specify_libaio 1
+%endif
+
 Name:           sbd
-Version:        1.5.2+20230316.5ec38cf
+Version:        1.5.2+20241209.5946119
 Release:        0
-Summary:        Storage-based death
+Summary:        Shared-storage based death
 License:        GPL-2.0-or-later
 Group:          Productivity/Clustering/HA
 URL:            https://github.com/ClusterLabs/sbd
@@ -78,12 +86,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
 %description
-This package contains the storage-based death functionality.
+A highly reliable fencing or Shoot-the-other-node-in-the-head (STONITH)
+mechanism that works by utilizing shared storage.
 
 %package devel
 Summary:        Storage-based death environment for regression tests
 Group:          Productivity/Clustering/HA
 Requires:       %{name} = %{version}-%{release}
+%if ! 0%{?specify_libaio}
+# Requires libaio-devel for the generic symbolic link libaio.so
+Requires:       libaio-devel
+%endif
 
 %description devel
 This package provides an environment + testscripts for
@@ -95,6 +108,10 @@ regression-testing sbd.
 %build
 ./autogen.sh
 
+%if 0%{?specify_libaio}
+export CFLAGS="${CFLAGS} -DLIBAIO_NAME=%{libaio_name}"
+%endif
+
 %configure --with-watchdog-timeout-default=%{watchdog_timeout_default} \
            --with-sync-resource-startup-default=%{?with_sync_resource_startup_default:yes}%{!?with_sync_resource_startup_default:no}  \
            --with-sync-resource-startup-sysconfig=%{sync_resource_startup_sysconfig} \