[packages/resource-agents] - updated to 4.10.0 - removed obsolete no_header_parsing patch - added types patch (fix format strin

[qboosh]

commit d7c2f26ebe446106bad8e2d6c4fc949eb5f81b59
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 7 19:13:17 2022 +0100

    - updated to 4.10.0
    - removed obsolete no_header_parsing patch
    - added types patch (fix format strings)

 resource-agents-no_header_parsing.patch | 15 ---------------
 resource-agents-types.patch             | 25 +++++++++++++++++++++++++
 resource-agents.spec                    | 22 +++++++++++++---------
 3 files changed, 38 insertions(+), 24 deletions(-)
---
diff --git a/resource-agents.spec b/resource-agents.spec
index 2089811..0ab36d9 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,19 +1,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.5.0
-Release:	2
+Version:	4.10.0
+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:	265fd01a2b4119b7b733c829c4c36d32
+# Source0-md5:	fffe3881b839846a6dc587ef83ec4cd5
 Source1:	ldirectord.init
 Source2:	%{name}.tmpfiles
-Patch0:		%{name}-no_header_parsing.patch
+Patch0:		%{name}-types.patch
 Patch1:		%{name}-bash.patch
 Patch2:		%{name}-ac.patch
-URL:		http://www.linux-ha.org/
+URL:		https://github.com/ClusterLabs/resource-agents
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10.1
 BuildRequires:	cluster-glue-libs-devel
@@ -24,10 +24,11 @@ BuildRequires:	libnet-devel >= 1.0
 BuildRequires:	libxslt-progs
 BuildRequires:	openssl-tools
 BuildRequires:	perl-tools-pod
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 1:0.18
 BuildRequires:	python-devel >= 1:2.7
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
+BuildRequires:	systemd-devel
 BuildRequires:	which
 Requires:	cluster-glue
 Requires:	python >= 1:2.7
@@ -64,19 +65,19 @@ Requires(post,preun):	/sbin/chkconfig
 Requires:	ipvsadm
 Requires:	rc-scripts
 Provides:	heartbeat-ldirectord
-Obsoletes:	heartbeat-ldirectord
+Obsoletes:	heartbeat-ldirectord < 3.0
 
 %description -n ldirectord
 The Linux Director Daemon (ldirectord) is a stand alone daemon for
 monitoring the services on real servers. Currently, HTTP, HTTPS, and
 FTP services are supported. ldirectord is simple to install and works
-with the heartbeat code (http://www.linux-ha.org/).
+with Pacemaker.
 
 %description -n ldirectord -l pl.UTF-8
 Demon Linux Director (ldirectord) to samodzielny demon do
 monitorowania usług na rzeczywistych serwerach. Obecnie obsługiwane są
 usługi HTTP, HTTPS i FTP. ldirectord jest prosty do zainstalowania i
-współpracuje z kodem heartbeat (http://www.linux-ha.org/).
+współpracuje Pacemakerem.
 
 %prep
 %setup -q
@@ -103,6 +104,7 @@ CFLAGS="%{rpmcflags} -fno-strict-aliasing"
 	--enable-fatal-warnings \
 	--with-initdir=/etc/rc.d/init.d \
 	--with-ocf-root=%{_prefix}/lib/ocf \
+	--with-ras-set=all \
 	--with-systemdsystemunitdir=%{systemdunitdir}
 
 %{__make}
@@ -158,6 +160,7 @@ fi
 %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/storage_mon
 %attr(755,root,root) %{_libexecdir}/heartbeat/tickle_tcp
 
 %dir %{_prefix}/lib/ocf
@@ -197,6 +200,7 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/heartbeat/agent_config.h
+%{_npkgconfigdir}/resource-agents.pc
 
 %files -n ldirectord
 %defattr(644,root,root,755)
diff --git a/resource-agents-no_header_parsing.patch b/resource-agents-no_header_parsing.patch
deleted file mode 100644
index 71c109d..0000000
--- a/resource-agents-no_header_parsing.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ClusterLabs-resource-agents-b735277/configure.ac~	2011-06-29 14:51:48.000000000 +0200
-+++ ClusterLabs-resource-agents-b735277/configure.ac	2012-07-04 18:29:56.185645216 +0200
-@@ -366,12 +366,6 @@
- 
- AC_CHECK_HEADERS(heartbeat/glue_config.h)
- 
--if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
--  OCF_ROOT_DIR=`extract_header_define heartbeat/glue_config.h OCF_ROOT_DIR`
--else
--  enable_libnet=no
--fi
--
- AC_DEFINE_UNQUOTED(OCF_ROOT_DIR,"$OCF_ROOT_DIR", OCF root directory - specified by the OCF standard)
- AC_SUBST(OCF_ROOT_DIR)
- 
diff --git a/resource-agents-types.patch b/resource-agents-types.patch
new file mode 100644
index 0000000..3d35418
--- /dev/null
+++ b/resource-agents-types.patch
@@ -0,0 +1,25 @@
+--- resource-agents-4.10.0/tools/storage_mon.c.orig	2021-11-03 10:12:01.000000000 +0100
++++ resource-agents-4.10.0/tools/storage_mon.c	2022-02-07 18:30:47.352605699 +0100
+@@ -1,3 +1,4 @@
++#include <inttypes.h>
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <stdlib.h>
+@@ -60,7 +61,7 @@ static void *test_device(const char *dev
+ 		exit(-1);
+ 	}
+ 	if (verbose) {
+-		fprintf(stderr, "%s: size=%zu\n", device, devsize);
++		fprintf(stderr, "%s: size=%"PRIu64"\n", device, devsize);
+ 	}
+ 	/* Don't fret about real randomness */
+ 	srand(time(NULL) + getpid());
+@@ -84,7 +85,7 @@ static void *test_device(const char *dev
+ 		exit(-1);
+ 	}
+ 	if (res < (int)sizeof(buffer)) {
+-		fprintf(stderr, "Failed to read %ld bytes from %s, got %d\n", sizeof(buffer), device, res);
++		fprintf(stderr, "Failed to read %zd bytes from %s, got %d\n", sizeof(buffer), device, res);
+ 		close(device_fd);
+ 		exit(-1);
+ 	}
================================================================

---- gitweb:

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