net-mgmt/resource-agents: update 4.5.0 to 4.6.1

  Makefile
    - added 'redis' to BUILD_DEPENDS (silent build warnings);
    - REINPLACE_CMD setting correct PATH for 'redis-cli';
    - replaced also redis' default config file path using LOCALBASE.

  files/
    - removed 'patch-heartbeat_tomcat': fixed in upstream (05e673c)

4 files changed, 18 insertions, 20 deletions

diff --git a/net-mgmt/resource-agents/Makefile b/net-mgmt/resource-agents/Makefile
index 622c475354f8..11c8198eb8a1 100644
--- a/net-mgmt/resource-agents/Makefile
+++ b/net-mgmt/resource-agents/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	resource-agents
-PORTVERSION=	4.5.0
+PORTVERSION=	4.6.1
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
@@ -12,7 +12,8 @@ COMMENT=	OCF Compliant Resource Agents
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:shells/bash
+BUILD_DEPENDS=	bash:shells/bash \
+		redis-cli:databases/redis
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake gnome pkgconfig python shebangfix
@@ -52,6 +53,10 @@ post-patch:
 	  ${WRKSRC}/heartbeat/sybaseASE.in \
 	  ${WRKSRC}/rgmanager/src/resources/utils/config-utils.sh.in \
 	  ${WRKSRC}/rgmanager/src/resources/ASEHAagent.sh.in
+	${REINPLACE_CMD} 's|/etc/redis|${LOCALBASE}/etc/redis|g' \
+	  ${WRKSRC}/heartbeat/redis.in
+	${REINPLACE_CMD} 's|/usr/bin/redis|${LOCALBASE}/bin/redis|g' \
+	  ${WRKSRC}/heartbeat/redis.in	
 
 post-install:
 	${RM} ${STAGEDIR}/${LOCALBASE}/resource-agents.conf
diff --git a/net-mgmt/resource-agents/distinfo b/net-mgmt/resource-agents/distinfo
index 921f7d6a672e..a711c1c4a125 100644
--- a/net-mgmt/resource-agents/distinfo
+++ b/net-mgmt/resource-agents/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591015610
-SHA256 (ClusterLabs-resource-agents-v4.5.0_GH0.tar.gz) = 729d57a18241b3da54dda1bf7e02c1b9368329c1f2dbd653708b1bc70f445f59
-SIZE (ClusterLabs-resource-agents-v4.5.0_GH0.tar.gz) = 787148
+TIMESTAMP = 1592852466
+SHA256 (ClusterLabs-resource-agents-v4.6.1_GH0.tar.gz) = 29cac0cdb1e461b8fac489c1dbe7114d920eabacf3c7b6d15a05a8aa55defdb3
+SIZE (ClusterLabs-resource-agents-v4.6.1_GH0.tar.gz) = 799688
diff --git a/net-mgmt/resource-agents/files/patch-heartbeat_tomcat b/net-mgmt/resource-agents/files/patch-heartbeat_tomcat
deleted file mode 100644
index 35856972d53f..000000000000
--- a/net-mgmt/resource-agents/files/patch-heartbeat_tomcat
+++ /dev/null
@@ -1,15 +0,0 @@
-During the build process all of the RAs are run to gather their meta-data.
-This patch prevents directories from being created during build causing
-poudriere to complain about the file system being modified.
-
---- heartbeat/tomcat.orig	2016-04-05 14:11:59 UTC
-+++ heartbeat/tomcat
-@@ -597,7 +597,7 @@ CATALINA_BASE="${OCF_RESKEY_catalina_bas
- CATALINA_OUT="${OCF_RESKEY_catalina_out-$CATALINA_BASE/logs/catalina.out}"
- 
- CATALINA_PID=$OCF_RESKEY_catalina_pid
--if [ -z "$CATALINA_PID" ]; then
-+if [ -z "$CATALINA_PID" -a "$COMMAND" != "meta-data" ]; then
- 	mkdir -p "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
- 	if [ "${RESOURCE_TOMCAT_USER}" != "root" ]; then
- 		chown ${RESOURCE_TOMCAT_USER} "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
diff --git a/net-mgmt/resource-agents/pkg-plist b/net-mgmt/resource-agents/pkg-plist
index 29f6f94af681..5697d286c049 100644
--- a/net-mgmt/resource-agents/pkg-plist
+++ b/net-mgmt/resource-agents/pkg-plist
@@ -75,11 +75,14 @@ lib/ocf/resource.d/heartbeat/azure-events
 lib/ocf/resource.d/heartbeat/azure-lb
 lib/ocf/resource.d/heartbeat/clvm
 lib/ocf/resource.d/heartbeat/conntrackd
+lib/ocf/resource.d/heartbeat/crypt
 lib/ocf/resource.d/heartbeat/db2
 lib/ocf/resource.d/heartbeat/dhcpd
 lib/ocf/resource.d/heartbeat/dnsupdate
 lib/ocf/resource.d/heartbeat/docker
+lib/ocf/resource.d/heartbeat/docker-compose
 lib/ocf/resource.d/heartbeat/dovecot
+lib/ocf/resource.d/heartbeat/dummypy
 lib/ocf/resource.d/heartbeat/eDir88
 lib/ocf/resource.d/heartbeat/ethmonitor
 lib/ocf/resource.d/heartbeat/exportfs
@@ -103,6 +106,7 @@ lib/ocf/resource.d/heartbeat/lxc
 lib/ocf/resource.d/heartbeat/lxd-info
 lib/ocf/resource.d/heartbeat/machine-info
 lib/ocf/resource.d/heartbeat/mariadb
+lib/ocf/resource.d/heartbeat/mdraid
 lib/ocf/resource.d/heartbeat/minio
 lib/ocf/resource.d/heartbeat/mpathpersist
 lib/ocf/resource.d/heartbeat/mysql
@@ -198,11 +202,14 @@ libexec/heartbeat/findif
 %%MANPAGES%%man/man7/ocf_heartbeat_azure-lb.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_clvm.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_conntrackd.7.gz
+%%MANPAGES%%man/man7/ocf_heartbeat_crypt.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_db2.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_dhcpd.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_dnsupdate.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_docker.7.gz
+%%MANPAGES%%man/man7/ocf_heartbeat_docker-compose.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_dovecot.7.gz
+%%MANPAGES%%man/man7/ocf_heartbeat_dummypy.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_eDir88.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_ethmonitor.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_exportfs.7.gz
@@ -225,6 +232,7 @@ libexec/heartbeat/findif
 %%MANPAGES%%man/man7/ocf_heartbeat_lxd-info.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_machine-info.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_mariadb.7.gz
+%%MANPAGES%%man/man7/ocf_heartbeat_mdraid.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_minio.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_mpathpersist.7.gz
 %%MANPAGES%%man/man7/ocf_heartbeat_mysql-proxy.7.gz