diff --git a/.gitignore b/.gitignore index e69de29..bc50586 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,12 @@ +/dlm-3.99.0.tar.gz +/dlm-3.99.1.tar.gz +/dlm-3.99.2.tar.gz +/dlm-3.99.3.tar.gz +/dlm-3.99.4.tar.gz +/dlm-3.99.5.tar.gz +/dlm-4.0.0.tar.gz +/dlm-4.0.1.tar.gz +/dlm-4.0.4.tar.gz +/dlm-4.0.5.tar.gz +/dlm-4.0.6.tar.gz +/dlm-4.0.9.tar.gz diff --git a/0001-New-location-of-major-and-minor-macros-for-glibc-2.2.patch b/0001-New-location-of-major-and-minor-macros-for-glibc-2.2.patch new file mode 100644 index 0000000..3d8290b --- /dev/null +++ b/0001-New-location-of-major-and-minor-macros-for-glibc-2.2.patch @@ -0,0 +1,41 @@ +From d006495e2f95969522e60c6ea83ff226f098d413 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 24 Mar 2018 08:50:07 +0000 +Subject: [PATCH] New location of major() and minor() macros for glibc 2.27. + +glibc 2.27 moves the major() and minor() macros to the + header file. + +Signed-off-by: Richard W.M. Jones +--- + dlm_controld/dlm_daemon.h | 1 + + libdlm/libdlm.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h +index 6cb0f11c..731818c5 100644 +--- a/dlm_controld/dlm_daemon.h ++++ b/dlm_controld/dlm_daemon.h +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include + +diff --git a/libdlm/libdlm.c b/libdlm/libdlm.c +index a9e61955..ebfba457 100644 +--- a/libdlm/libdlm.c ++++ b/libdlm/libdlm.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_SELINUX + #include + #endif +-- +2.15.1 + diff --git a/0001-dlm_controld-libsystemd-broke-itself.patch b/0001-dlm_controld-libsystemd-broke-itself.patch new file mode 100644 index 0000000..f1dd4a9 --- /dev/null +++ b/0001-dlm_controld-libsystemd-broke-itself.patch @@ -0,0 +1,28 @@ +From 2eefc91150a3292c2be82f4139207e06b4c4bba4 Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Fri, 10 Jun 2016 13:13:48 -0500 +Subject: [PATCH] dlm_controld: libsystemd broke itself + +--- + dlm_controld/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index 13d6339ab263..cf556c9d72b8 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -62,9 +62,9 @@ LIB_CFLAGS += $(BIN_CFLAGS) + LIB_LDFLAGS += -Wl,-z,relro -pie + + ifeq ($(USE_SD_NOTIFY),yes) +- BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \ ++ BIN_CFLAGS += $(shell pkg-config --cflags libsystemd) \ + -DUSE_SD_NOTIFY +- BIN_LDFLAGS += $(shell pkg-config --libs libsystemd-daemon) ++ BIN_LDFLAGS += $(shell pkg-config --libs libsystemd) + endif + + all: $(LIB_TARGET) $(BIN_TARGET) +-- +1.8.3.1 + diff --git a/dlm.spec b/dlm.spec new file mode 100644 index 0000000..c8c32d2 --- /dev/null +++ b/dlm.spec @@ -0,0 +1,243 @@ +Name: dlm +Version: 4.0.9 +Release: 3%{?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 +BuildRequires: gcc +BuildRequires: glibc-kernheaders +BuildRequires: corosynclib-devel >= 1.99.9 +BuildRequires: pacemaker-libs-devel >= 1.1.7 +BuildRequires: libxml2-devel +BuildRequires: systemd-units +BuildRequires: systemd-devel +Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz + +# 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 +%{?fedora:Requires: kernel-modules-extra} +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Conflicts: cman + +%description +The kernel dlm requires a user daemon to control membership. + +%prep +%setup -q +# %patch0 -p1 -b .0001-foo.patch + +%build +# upstream does not require configure +# upstream does not support _smp_mflags +CFLAGS=$RPM_OPT_FLAGS make +CFLAGS=$RPM_OPT_FLAGS make -C fence + +%install +rm -rf $RPM_BUILD_ROOT +make install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT +make -C fence install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT + +install -Dm 0644 init/dlm.service %{buildroot}%{_unitdir}/dlm.service +install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm + +%post +%systemd_post dlm.service + +%preun +%systemd_preun dlm.service + +%postun +%systemd_postun_with_restart dlm.service + +%files +%doc README.license +%{_unitdir}/dlm.service +%{_sbindir}/dlm_controld +%{_sbindir}/dlm_tool +%{_sbindir}/dlm_stonith +%{_mandir}/man8/dlm* +%{_mandir}/man5/dlm* +%{_mandir}/man3/*dlm* +%config(noreplace) %{_sysconfdir}/sysconfig/dlm + +%package lib +Summary: Library for %{name} +Conflicts: clusterlib + +%description lib +The %{name}-lib package contains the libraries needed to use the dlm +from userland applications. + +%ldconfig_scriptlets lib + +%files lib +/usr/lib/udev/rules.d/*-dlm.rules +%{_libdir}/libdlm*.so.* + +%package devel +Summary: Development files for %{name} +Requires: %{name}-lib = %{version}-%{release} +Conflicts: clusterlib-devel + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%files devel +%{_libdir}/libdlm*.so +%{_includedir}/libdlm*.h +%{_libdir}/pkgconfig/*.pc + +%changelog +* Mon Jul 27 2020 Fedora Release Engineering - 4.0.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 4.0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 31 2019 David Teigland - 4.0.9-1 +- New upstream realease + +* Wed Jul 24 2019 Fedora Release Engineering - 4.0.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 4.0.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 4.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Mar 24 2018 Richard W.M. Jones - 4.0.6-8 +- Fixes for glibc 2.27, required for riscv64. + +* Wed Feb 07 2018 Fedora Release Engineering - 4.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Oct 10 2017 Troy Dawson - 4.0.6-5 +- Cleanup spec file conditionals + +* Wed Aug 02 2017 Fedora Release Engineering - 4.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 4.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 4.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jun 10 2016 David Teigland - 4.0.6-2 +- try fixing broken libsystemd + +* Fri Jun 10 2016 David Teigland - 4.0.6-1 +- New upstream release + +* Tue Apr 26 2016 David Teigland - 4.0.5-1 +- New upstream release + +* Mon Feb 22 2016 David Teigland - 4.0.4-1 +- New upstream release dlm-4.0.4 + +* Wed Feb 03 2016 Fedora Release Engineering - 4.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 4.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 4.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 4.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 4.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 06 2013 David Teigland - 4.0.1-1 +- New usptream release, fencing fixes + +* Wed Feb 13 2013 Fedora Release Engineering - 4.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 06 2012 David Teigland - 4.0.0-1 +- New upstream release, systemd fixes + +* Wed Sep 05 2012 Václav Pavlín - 3.99.5-7 +- Scriptlets replaced with new systemd macros (#850093) + +* Tue Aug 28 2012 David Teigland - 3.99.5-6 +- only fedora requires kernel-modules-extra + +* Thu Aug 16 2012 David Teigland - 3.99.5-5 +- dlm_controld: remove fence_all from cli + +* Thu Aug 16 2012 David Teigland - 3.99.5-4 +- dlm_stonith: include errno.h + +* Thu Aug 16 2012 David Teigland - 3.99.5-3 +- dlm_controld: fix uninitialized mem for fence_all config + +* Wed Jul 18 2012 Fedora Release Engineering - 3.99.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 21 2012 David Teigland - 3.99.5-1 +- New upstream release + +* Wed May 30 2012 David Teigland - 3.99.4-2 +- Limit rhel arches + +* Mon May 21 2012 David Teigland - 3.99.4-1 +- New upstream release + +* Mon May 14 2012 David Teigland - 3.99.3-1 +- New upstream release + +* Wed Apr 11 2012 Fabio M. Di Nitto - 3.99.2-1 +- New upstream release + +* Thu Mar 29 2012 Fabio M. Di Nitto - 3.99.1-4 +- Merge back from F17 + +* Wed Mar 21 2012 David Teigland - 3.99.1-3 +- Fix dlm_stonith linking + +* Wed Mar 21 2012 David Teigland - 3.99.1-2 +- Require pacemaker-libs-devel to build dlm_stonith + +* Wed Mar 21 2012 David Teigland - 3.99.1-1 +- Update to 3.99.1 + +* Fri Mar 16 2012 Fabio M. Di Nitto - 3.99.0-8 +- Rebuild against new corosync (soname change). + +* Thu Feb 16 2012 Fabio M. Di Nitto - 3.99.0-7 +- Update to upstream HEAD 2ad89c869git. +- Bump BuildRequires and Requires to new corosync + +* Mon Feb 13 2012 Fabio M. Di Nitto - 3.99.0-6 +- Fix init/systemd service to use /etc/sysconfig/dlm + +* Mon Feb 6 2012 Fabio M. Di Nitto - 3.99.0-5 +- Fix systemd service to recognize /etc/sysconfig/dlm_controld + +* Fri Feb 3 2012 Fabio M. Di Nitto - 3.99.0-4 +- Fix systemd service to modprobe dlm + +* Fri Feb 3 2012 Fabio M. Di Nitto - 3.99.0-3 +- Add patch to fix udev rules and make sure dlm_controld can find + its devices + +* Thu Feb 2 2012 Fabio M. Di Nitto - 3.99.0-2 +- Add Conflicts with clusterlib/cman as necessary + +* Tue Jan 24 2012 David Teigland - 3.99.0-1 +- initial package + diff --git a/sources b/sources new file mode 100644 index 0000000..a32b3ce --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (dlm-4.0.9.tar.gz) = 85b252cb784b7d8366a040118ca0d0cb518f95ce4fca67d03f7e9df3c12da48ccea8ea09a04162a24a7b88d445fb77437d4ac10f941965091dd7c4e8e4ca22e8