diff --git a/.dlm.metadata b/.dlm.metadata new file mode 100644 index 0000000..df92db0 --- /dev/null +++ b/.dlm.metadata @@ -0,0 +1 @@ +84b761550b04752330f23952b0ddde7138f51520 SOURCES/dlm-4.0.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-dlm_stonith-add-man-page.patch b/SOURCES/0001-dlm_stonith-add-man-page.patch new file mode 100644 index 0000000..4bc796e --- /dev/null +++ b/SOURCES/0001-dlm_stonith-add-man-page.patch @@ -0,0 +1,57 @@ +From 01b5a1828fa3817ff1c6b8dd9bb024750eea830f Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Thu, 1 Aug 2013 11:37:06 -0500 +Subject: [PATCH] dlm_stonith: add man page + +Signed-off-by: David Teigland +--- + fence/dlm_stonith.8 | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + create mode 100644 fence/dlm_stonith.8 + +diff --git a/fence/dlm_stonith.8 b/fence/dlm_stonith.8 +new file mode 100644 +index 0000000..14993d9 +--- /dev/null ++++ b/fence/dlm_stonith.8 +@@ -0,0 +1,37 @@ ++.TH DLM_STONITH 8 2013-08-01 dlm dlm ++ ++.SH NAME ++dlm_stonith \- a proxy for fencing via stonith/pacemaker ++ ++.SH SYNOPSIS ++.B dlm_stonith ++ ++.SH DESCRIPTION ++ ++dlm_controld can use dlm_stonith as a proxy fence agent when ++the stonith/pacemaker system performs actual fencing. ++ ++dlm_stonith is run by dlm_controld, and is not meant to be ++run manually. dlm_controld provides the options on stdin ++as key=val; command line options are for testing. ++ ++If fencing was successful, this program has a zero exit code. ++If fencing failed, this program has a non-zero exit code. ++ ++.SH OPTIONS ++ ++.BI \-n " nodeid" ++ ++The nodeid of the target node. (stdin key is "node") ++ ++.BI \-t " fail_time" ++ ++The wall time at which the target node failed. The wall time at which the ++node is fenced must be later than this for fencing to succeed. (stdin key ++is "fail_time") For "wall time" see ++.BR time (2). ++ ++.SH SEE ALSO ++.BR dlm_controld (8), ++.BR dlm.conf (5) ++ +-- +1.8.3.1 + diff --git a/SOURCES/0002-dlm_stonith-install-man-page.patch b/SOURCES/0002-dlm_stonith-install-man-page.patch new file mode 100644 index 0000000..430c788 --- /dev/null +++ b/SOURCES/0002-dlm_stonith-install-man-page.patch @@ -0,0 +1,37 @@ +From f8a4ed037cc32ef77ecce635a072859356c9e300 Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Thu, 1 Aug 2013 12:03:44 -0500 +Subject: [PATCH] dlm_stonith: install man page + +Signed-off-by: David Teigland +--- + fence/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fence/Makefile b/fence/Makefile +index b4c59dd..77bf0fd 100644 +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -1,10 +1,10 @@ + DESTDIR= + PREFIX=/usr + BINDIR=$(PREFIX)/sbin +-#MANDIR=$(PREFIX)/share/man ++MANDIR=$(PREFIX)/share/man + + BIN_TARGET = dlm_stonith +-#MAN_TARGET = dlm_stonith.8 ++MAN_TARGET = dlm_stonith.8 + + BIN_SOURCE = stonith_helper.c + +@@ -53,5 +53,5 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(BINDIR) + $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 + $(INSTALL) -c -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR) +-# $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ ++ $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ + +-- +1.8.3.1 + diff --git a/SOURCES/0003-libdlm-udev-dir-now-under-usr-lib.patch b/SOURCES/0003-libdlm-udev-dir-now-under-usr-lib.patch new file mode 100644 index 0000000..9134c77 --- /dev/null +++ b/SOURCES/0003-libdlm-udev-dir-now-under-usr-lib.patch @@ -0,0 +1,26 @@ +From 102d3c248c59f8f36a9d5088afd4eed787583e04 Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Thu, 1 Aug 2013 12:11:00 -0500 +Subject: [PATCH 3/3] libdlm: udev dir now under /usr/lib + +Signed-off-by: David Teigland +--- + libdlm/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdlm/Makefile b/libdlm/Makefile +index 76d3504..e7cdb17 100644 +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -5,7 +5,7 @@ LIBDIR=$(PREFIX)/$(LIBNUM) + HDRDIR=$(PREFIX)/include + MANDIR=$(PREFIX)/share/man + PKGDIR=$(LIBDIR)/pkgconfig +-UDEVDIR=/lib/udev/rules.d ++UDEVDIR=/usr/lib/udev/rules.d + + LIB_NAME = libdlm + LIB_MAJOR = 3 +-- +1.8.3.1 + diff --git a/SPECS/dlm.spec b/SPECS/dlm.spec new file mode 100644 index 0000000..79a093e --- /dev/null +++ b/SPECS/dlm.spec @@ -0,0 +1,118 @@ +Name: dlm +Version: 4.0.2 +Release: 2%{?dist} +License: GPLv2 and GPLv2+ and LGPLv2+ +# For a breakdown of the licensing, see README.license +Group: System Environment/Kernel +Summary: dlm control daemon and tool +URL: https://fedorahosted.org/cluster +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: http://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{version}.tar.gz + +Patch0: 0001-dlm_stonith-add-man-page.patch +Patch1: 0002-dlm_stonith-install-man-page.patch +Patch2: 0003-libdlm-udev-dir-now-under-usr-lib.patch + +%if 0%{?rhel} +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-dlm_stonith-add-man-page.patch +%patch1 -p1 -b .0002-dlm_stonith-install-man-page.patch +%patch2 -p1 -b .0003-libdlm-udev-dir-now-under-usr-lib.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 +%defattr(-,root,root,-) +%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} +Group: System Environment/Libraries +Conflicts: clusterlib + +%description lib +The %{name}-lib package contains the libraries needed to use the dlm +from userland applications. + +%post lib -p /sbin/ldconfig + +%postun lib -p /sbin/ldconfig + +%files lib +%defattr(-,root,root,-) +/usr/lib/udev/rules.d/*-dlm.rules +%{_libdir}/libdlm*.so.* + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +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 +%defattr(-,root,root,-) +%{_libdir}/libdlm*.so +%{_includedir}/libdlm*.h +%{_libdir}/pkgconfig/*.pc + +%changelog +* Thu Aug 01 2013 David Teigland - 4.0.2-2 +- Add dlm_stonith man page, move udev file from /lib to /usr/lib + +* Wed Jul 31 2013 David Teigland - 4.0.2-1 +- New upstream release +