From 9d49fe906af41189d68086f5941f09071efe3a7d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 11 Jan 2022 12:55:19 -0500 Subject: [PATCH] import dlm-4.1.1-1.el9 --- .dlm.metadata | 2 +- .gitignore | 2 +- SOURCES/0001-stonith_helper-fix-build.patch | 39 --------------------- SPECS/dlm.spec | 19 +++++----- 4 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 SOURCES/0001-stonith_helper-fix-build.patch diff --git a/.dlm.metadata b/.dlm.metadata index 81bc089..5098f65 100644 --- a/.dlm.metadata +++ b/.dlm.metadata @@ -1 +1 @@ -3655865fa215e6b50e6b82ba66cb13f2d8005f67 SOURCES/dlm-4.0.9.tar.gz +a8fef90c11d7da2a9420eb19aab221952686881c SOURCES/dlm-4.1.1.tar.gz diff --git a/.gitignore b/.gitignore index f5568aa..e73fad4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dlm-4.0.9.tar.gz +SOURCES/dlm-4.1.1.tar.gz diff --git a/SOURCES/0001-stonith_helper-fix-build.patch b/SOURCES/0001-stonith_helper-fix-build.patch deleted file mode 100644 index 574fa29..0000000 --- a/SOURCES/0001-stonith_helper-fix-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5afd9fdc0ef202633f57abc063a5a2c6cef1d61d Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Wed, 28 Jul 2021 16:12:43 -0500 -Subject: [PATCH] stonith_helper: fix build - -include stdlib -use pkg-config to get pacemaker headers ---- - fence/Makefile | 1 + - fence/stonith_helper.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/fence/Makefile b/fence/Makefile -index b927879eb141..1f6dd6b2c40e 100644 ---- a/fence/Makefile -+++ b/fence/Makefile -@@ -20,6 +20,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - CFLAGS += -fPIE -DPIE - CFLAGS += `xml2-config --cflags` - CFLAGS += -I../include -+CFLAGS += $(shell pkg-config --cflags pacemaker-fencing) - - LDFLAGS += -Wl,-z,relro -pie - LDFLAGS += `xml2-config --libs` -diff --git a/fence/stonith_helper.c b/fence/stonith_helper.c -index 3a0768af2830..b1db352ae04f 100644 ---- a/fence/stonith_helper.c -+++ b/fence/stonith_helper.c -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.7.5 - diff --git a/SPECS/dlm.spec b/SPECS/dlm.spec index b5ce806..c7939ec 100644 --- a/SPECS/dlm.spec +++ b/SPECS/dlm.spec @@ -1,13 +1,13 @@ Name: dlm -Version: 4.0.9 -Release: 7%{?dist} +Version: 4.1.1 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ # For a breakdown of the licensing, see README.license -Summary: Kernel Distributed Lock Manager control daemon and tool -URL: https://fedorahosted.org/cluster +Summary: dlm control daemon and tool +URL: https://pagure.io/dlm BuildRequires: gcc BuildRequires: glibc-kernheaders -BuildRequires: corosynclib-devel >= 1.99.9 +BuildRequires: corosynclib-devel >= 3.1.0 BuildRequires: pacemaker-libs-devel >= 1.1.7 BuildRequires: libxml2-devel BuildRequires: systemd-units @@ -15,14 +15,14 @@ BuildRequires: systemd-devel BuildRequires: make Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz -Patch0: 0001-stonith_helper-fix-build.patch +# Patch0: 0001-foo.patch %if 0%{?rhel} && 0%{?rhel} <= 7 ExclusiveArch: i686 x86_64 %endif Requires: %{name}-lib = %{version}-%{release} -Requires: corosync >= 1.99.9 +Requires: corosync >= 3.1.0 %{?fedora:Requires: kernel-modules-extra} Requires(post): systemd-units Requires(preun): systemd-units @@ -34,7 +34,7 @@ The kernel dlm requires a user daemon to control membership. %prep %setup -q -%patch0 -p1 -b .0001-stonith_helper-fix-build.patch +# %patch0 -p1 -b .0001-foo.patch %build # upstream does not require configure @@ -99,6 +99,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Mon Nov 15 2021 David Teigland - 4.1.1-1 +- new upstream version + * Wed Aug 25 2021 David Teigland - 4.0.9-7 - fix pacemaker header