diff --git a/0004-test-load-libaio.so-instead-of-libaio.so.1.patch b/0004-test-load-libaio.so-instead-of-libaio.so.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..d2f566a54f0b923f7267d4ac273f2bb0d8ae54ca --- /dev/null +++ b/0004-test-load-libaio.so-instead-of-libaio.so.1.patch @@ -0,0 +1,27 @@ +From 367f461470a14a5441bbc016a72eede23b4ed151 Mon Sep 17 00:00:00 2001 +From: Klaus Wenninger +Date: Wed, 20 Mar 2024 08:47:37 +0100 +Subject: [PATCH] test: load libaio.so instead of libaio.so.1 + +as that is rather what sbd would link against without preloading +on distros linking different library versions under these 2 names +--- + tests/sbd-testbed.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/sbd-testbed.c b/tests/sbd-testbed.c +index 91920f2..02844a7 100644 +--- a/tests/sbd-testbed.c ++++ b/tests/sbd-testbed.c +@@ -154,7 +154,7 @@ init (void) + orig_fopen = (orig_fopen_f_type)dlsym_fatal(RTLD_NEXT,"fopen"); + orig_fclose = (orig_fclose_f_type)dlsym_fatal(RTLD_NEXT,"fclose"); + +- handle = dlopen("libaio.so.1", RTLD_NOW); ++ handle = dlopen("libaio.so", RTLD_NOW); + if (!handle) { + fprintf(stderr, "Failed opening libaio.so.1\n"); + exit(1); +-- +2.25.1 + diff --git a/sbd.spec b/sbd.spec index 8fd6d2ccc4a0735c78e446885fc8ee46c120bf9f..34b25c7b6560e41c08d39d65bdd7f372943bf4ea 100644 --- a/sbd.spec +++ b/sbd.spec @@ -2,7 +2,7 @@ %global shortcommit %(echo %{longcommit}|cut -c1-8) %global modified %(echo %{longcommit}-|cut -f2 -d-) %global github_owner Clusterlabs -%global buildnum 1 +%global buildnum 2 %global watchdog_timeout_default 5 @@ -35,6 +35,7 @@ Patch0: 0001-Fix-the-problem-of-service-error-when-uninstalling.patch Patch1: 0001-Fix-query-watchdog-avoid-issues-on-heap-allocation-f.patch Patch2: 0002-Refactor-sbd-md-alloc-de-alloc-reverse-order.patch Patch3: 0003-spec-convert-license-naming-to-SPDX.patch +Patch4: 0004-test-load-libaio.so-instead-of-libaio.so.1.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libuuid-devel @@ -150,6 +151,9 @@ fi %{_libdir}/libsbdtestbed* %changelog +* Thu Apr 25 2024 zouzhimin - 1.5.2-2 +- test: load libaio.so instead of libaio.so.1 + * Wed Mar 27 2024 bizhiyuan - 1.5.2-1 - Update to 1.5.2