diff --git a/fix-failed-to-parse-pid-from-pid-file.patch b/fix-failed-to-parse-pid-from-pid-file.patch deleted file mode 100644 index 1dafa83556bd229c4f4e9cd4eec09815d8915424..0000000000000000000000000000000000000000 --- a/fix-failed-to-parse-pid-from-pid-file.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 60366e7a877919b7767736cbbb7850588f461490 Mon Sep 17 00:00:00 2001 -From: caodongxia <315816521@qq.com> -Date: Wed, 25 Aug 2021 16:12:22 +0800 -Subject: [PATCH] fix failed to parse pid from pid-file - ---- - ldirectord/systemd/ldirectord.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ldirectord/systemd/ldirectord.service.in b/ldirectord/systemd/ldirectord.service.in -index 191f62a..aafc2dc 100644 ---- a/ldirectord/systemd/ldirectord.service.in -+++ b/ldirectord/systemd/ldirectord.service.in -@@ -4,6 +4,7 @@ Documentation=man:ldirectord(8) - - [Service] - ExecStart=@sbindir@/ldirectord start -+ExecStartPost=/usr/bin/sleep 0.1 - ExecStartPost=/usr/bin/touch /var/lock/subsys/ldirectord - ExecStop=@sbindir@/ldirectord stop - ExecStopPost=@RM@ -f /var/lock/subsys/ldirectord --- -2.27.0 - diff --git a/resource-agents-4.12.0.tar.gz b/resource-agents-4.12.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0ad6b5a92e4ef06636f4f349a1a3ddcd737a7c10 Binary files /dev/null and b/resource-agents-4.12.0.tar.gz differ diff --git a/resource-agents.spec b/resource-agents.spec index 3a7d32b7d26d80f2b527f31736f65828a37b06ca..c361100df8fb507d09efc2d36305fb5d8d0be24f 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -1,23 +1,28 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts -Version: 4.2.0 -Release: 4 -License: GPLv2+ and LGPLv2+ +Version: 4.12.0 +Release: 1 +License: GPL-2.0-or-later and LGPL-2.1-or-later URL: https://github.com/ClusterLabs/resource-agents -Source0: https://github.com/ClusterLabs/resource-agents/archive/v4.2.0.tar.gz -Patch0000: fix-failed-to-parse-pid-from-pid-file.patch +Source0: https://github.com/ClusterLabs/resource-agents/archive/refs/tags/v4.12.0.tar.gz#/%{name}-%{version}.tar.gz Obsoletes: heartbeat-resources <= %{version} Provides: heartbeat-resources = %{version} -BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python3-devel -BuildRequires: libxslt glib2-devel which docbook-style-xsl docbook-dtds + +BuildRequires: make automake autoconf pkgconfig gcc perl python3-devel +BuildRequires: libxslt glib2-devel systemd which docbook-style-xsl docbook-dtds Requires: bash grep sed gawk procps-ng hostname net-tools psmisc util-linux Requires: e2fsprogs xfsprogs nfs-utils cifs-utils iproute lvm2 + +%ifarch x86_64 +BuildRequires: python3-pyroute2 +%endif + %description Resource agent is a standardized interface for a cluster resource. In translates a standard set of operations into steps specific to the resource or application, and interprets their results as success or failure. %package -n ldirectord -License: GPLv2+ +License: GPL-2.0-or-later Summary: Monitoring Daemon for Maintaining High Availability Resources Obsoletes: heartbeat-ldirectord <= %{version} Provides: heartbeat-ldirectord = %{version} @@ -30,11 +35,6 @@ Ldirectord is a daemon to monitor and administer real servers in a cluster of lo balanced virtual servers.Currently, HTTP, HTTPS, and FTP services are supported. ldirectord typically is started from heartbeat but can also be run from the command line. -%package help -Summary: Help documentation for resource-agents -%description help -Help documentation for resource-agents. - %prep %autosetup -n %{name}-%{version} -p1 @@ -50,11 +50,16 @@ export CFLAGS="$(echo '%{optflags}')" %make_build %install -%make_install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +rm -rf %{buildroot}/usr/share/doc/resource-agents %files -%doc AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL +%doc AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL ChangeLog +%doc heartbeat/README.galera %doc doc/README.webapps +%doc %{_datadir}/%{name}/ra-api-1.dtd +%doc %{_datadir}/%{name}/metadata.rng %dir %{_usr}/lib/ocf %dir %{_usr}/lib/ocf/resource.d %dir %{_usr}/lib/ocf/lib @@ -70,9 +75,12 @@ export CFLAGS="$(echo '%{optflags}')" %{_sbindir}/ocft %{_includedir}/heartbeat %dir %attr (1755, root, root) %{_var}/run/resource-agents +%{_mandir}/man7/*.7* +%{_mandir}/man8/ocf-tester.8* %dir %{_sysconfdir}/ha.d %{_sysconfdir}/ha.d/shellfuncs %{_libexecdir}/heartbeat +%{_datadir}/pkgconfig/resource-agents.pc %preun -n ldirectord %systemd_preun ldirectord.service @@ -86,21 +94,20 @@ export CFLAGS="$(echo '%{optflags}')" %files -n ldirectord %{_sbindir}/ldirectord -%doc COPYING ldirectord/ldirectord.cf +%doc ldirectord/ldirectord.cf COPYING +%{_mandir}/man8/ldirectord.8* %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %dir %{_sysconfdir}/ha.d %dir %{_sysconfdir}/ha.d/resource.d %{_sysconfdir}/ha.d/resource.d/ldirectord %{_unitdir}/ldirectord.service %exclude %{_sysconfdir}/init.d/ldirectord - -%files help -%doc heartbeat/README.galera ChangeLog -%doc %{_datadir}/%{name}/{ra-api-1.dtd,metadata.rng} -%{_mandir}/man7/*.7* -%{_mandir}/man8/{ocf-tester.8*,ldirectord.8*} +%{_usr}/lib/ocf/resource.d/heartbeat/ldirectord %changelog +* Fri Sep 1 2023 zouzhimin - 4.12.0-1 +- Upgrade package to 4.12.0 + * Wed Aug 25 2021 caodongxia - 4.2.0-4 - Fix failed to parse pid from pid-file diff --git a/v4.2.0.tar.gz b/v4.2.0.tar.gz deleted file mode 100644 index d4e1043579e90b8ebf4fac3981660550dea89dd7..0000000000000000000000000000000000000000 Binary files a/v4.2.0.tar.gz and /dev/null differ