[packages/resource-agents] - updated to 4.1.1 - added sizeof patch (fixes build with gcc 8) - honour libexecdir

[qboosh]

commit 9d31d8924525038cbefe0ed44486b91747b4e05d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 3 18:52:00 2018 +0200

    - updated to 4.1.1
    - added sizeof patch (fixes build with gcc 8)
    - honour libexecdir

 resource-agents-sizeof.patch | 11 +++++++++++
 resource-agents.spec         | 35 +++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 8 deletions(-)
---
diff --git a/resource-agents.spec b/resource-agents.spec
index 6ed0b4a..f0dfebf 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -2,18 +2,19 @@
 Summary:	Reusable cluster resource scripts
 Summary(pl.UTF-8):	Skrypty wielokrotnego użytku do obsługi zasobów klastrowych
 Name:		resource-agents
-Version:	4.0.1
+Version:	4.1.1
 Release:	1
 License:	GPL v2+, LGPL v2.1+
 Group:		Daemons
 #Source0Download: https://github.com/ClusterLabs/resource-agents/releases
 Source0:	https://github.com/ClusterLabs/resource-agents/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	8530431861e659d4ce2f04afcc4efc03
+# Source0-md5:	82e3a335f942347f1b7c27b9f8e8e984
 Source1:	ldirectord.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-no_header_parsing.patch
 Patch1:		%{name}-bash.patch
 Patch2:		%{name}-ac.patch
+Patch3:		%{name}-sizeof.patch
 URL:		http://www.linux-ha.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10.1
@@ -41,6 +42,19 @@ environment.
 Skrypty pozwalające na działanie popularnych usług w środowisku
 wysokiej dostępności (High Availability).
 
+%package devel
+Summary:	Resource Agents header file
+Summary(pl.UTF-8):	Plik nagłówkowy Resource Agents
+Group:		Development/Libraries
+# doesn't require base
+Conflicts:	resource-agents < 4.1.1
+
+%description devel
+Resource Agents header file.
+
+%description devel -l pl.UTF-8
+Plik nagłówkowy Resource Agents.
+
 %package -n ldirectord
 Summary:	A Monitoring Daemon for Maintaining High Availability Resources
 Summary(pl.UTF-8):	Demon monitorujący do utrzymywania zasobów z wysoką dostępnością
@@ -69,6 +83,7 @@ współpracuje z kodem heartbeat (http://www.linux-ha.org/).
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
@@ -137,11 +152,11 @@ fi
 %dir %{_sysconfdir}/ha.d/resource.d
 %{_sysconfdir}/ha.d/shellfuncs
 
-%attr(755,root,root) %{_libdir}/heartbeat/send_arp
-%attr(755,root,root) %{_libdir}/heartbeat/send_ua
-%attr(755,root,root) %{_libdir}/heartbeat/sfex_daemon
-%attr(755,root,root) %{_libdir}/heartbeat/findif
-%attr(755,root,root) %{_libdir}/heartbeat/tickle_tcp
+%attr(755,root,root) %{_libexecdir}/heartbeat/send_arp
+%attr(755,root,root) %{_libexecdir}/heartbeat/send_ua
+%attr(755,root,root) %{_libexecdir}/heartbeat/sfex_daemon
+%attr(755,root,root) %{_libexecdir}/heartbeat/findif
+%attr(755,root,root) %{_libexecdir}/heartbeat/tickle_tcp
 
 %dir %{_prefix}/lib/ocf
 %dir %{_prefix}/lib/ocf/lib
@@ -167,7 +182,7 @@ fi
 
 %{_datadir}/resource-agents
 
-%{_includedir}/heartbeat/agent_config.h
+%{systemdunitdir}/resource-agents-deps.target
 
 %attr(1755,root,root) /var/run/resource-agents
 %{systemdtmpfilesdir}/%{name}.conf
@@ -176,6 +191,10 @@ fi
 %{_mandir}/man8/ocf-tester.8*
 %{_mandir}/man8/sfex_init.8*
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/heartbeat/agent_config.h
+
 %files -n ldirectord
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/ldirectord.cf
diff --git a/resource-agents-sizeof.patch b/resource-agents-sizeof.patch
new file mode 100644
index 0000000..8bf4ff3
--- /dev/null
+++ b/resource-agents-sizeof.patch
@@ -0,0 +1,11 @@
+--- resource-agents-4.1.1/tools/sfex_lib.c.orig	2018-03-05 10:25:31.000000000 +0100
++++ resource-agents-4.1.1/tools/sfex_lib.c	2018-09-02 20:08:37.594025340 +0200
+@@ -426,7 +426,7 @@
+     return -1;
+   }
+   ldata->count = atoi ((char *) (block->count));
+-  strncpy ((char *) (ldata->nodename), (const char *) (block->nodename), sizeof(block->nodename));
++  strncpy ((char *) (ldata->nodename), (const char *) (block->nodename), sizeof(ldata->nodename));
+ 
+ #ifdef SFEX_DEBUG
+   cl_log(LOG_INFO, "status: %c\n", ldata->status);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/resource-agents.git/commitdiff/9d31d8924525038cbefe0ed44486b91747b4e05d