Attachment 183012 Details for Bug 219546 – resource-agents-4.0.1.patch

[patch] resource-agents-4.0.1.patch

resource-agents-4.0.1.patch (text/plain), 11.43 KB, created by David Shane Holden on 2017-05-28 16:26:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Shane Holden

Created: 2017-05-28 16:26:08 UTC

Size: 11.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 441912)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	resource-agents
>-PORTVERSION=	3.9.7
>-PORTREVISION=	2
>+PORTVERSION=	4.0.1
> DISTVERSIONPREFIX=v
> CATEGORIES=	net-mgmt
> 
>@@ -25,7 +24,6 @@
> USE_GCC=	yes
> USE_GNOME=	glib20
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-ocf-root=${PREFIX}/etc/ocf
> 
> SHEBANG_LANG=	sh
> sh_OLD_CMD=	${SH}
>@@ -32,6 +30,12 @@
> sh_CMD=		${LOCALBASE}/bin/bash
> SHEBANG_FILES=	heartbeat/* \
> 		ldirectord/ldirectord.in \
>+		rgmanager/src/resources/*.sh \
>+		rgmanager/src/resources/*.sh.in \
>+		rgmanager/src/resources/ocf-shellfuncs \
>+		rgmanager/src/resources/svclib_nfslock \
>+		rgmanager/src/resources/utils/*.pl \
>+		rgmanager/src/resources/utils/*.sh \
> 		tools/ocft/ocft.in \
> 		tools/ocf-tester.in
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 441912)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ClusterLabs-resource-agents-v3.9.7_GH0.tar.gz) = e5bd62658fbc236acb83b709f64b2cd9fae52aa4a420a44fed5eb667e928b152
>-SIZE (ClusterLabs-resource-agents-v3.9.7_GH0.tar.gz) = 646048
>+TIMESTAMP = 1495224952
>+SHA256 (ClusterLabs-resource-agents-v4.0.1_GH0.tar.gz) = 863f83c724bad3a8bcff12b9c8712406c43e010041868826cad7b78fd8cfb9fb
>+SIZE (ClusterLabs-resource-agents-v4.0.1_GH0.tar.gz) = 659123
>Index: files/patch-tools_ocf_tester.in
>===================================================================
>--- files/patch-tools_ocf_tester.in	(revision 441912)
>+++ files/patch-tools_ocf_tester.in	(working copy)
>@@ -4,7 +4,7 @@
>  test_permissions() {
>      action=meta-data
>      debug ${1:-"Testing permissions with uid nobody"}
>--    su nobody -s /bin/sh $agent $action > /dev/null
>+-    su nobody -s /bin/sh -c "$agent $action" > /dev/null
> +    su -m nobody -c "$agent $action" > /dev/null
>  }
>  
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 441912)
>+++ pkg-plist	(working copy)
>@@ -1,114 +1,119 @@
> etc/ha.d/resource.d/ldirectord
> etc/ha.d/shellfuncs
> etc/logrotate.d/ldirectord
>-etc/ocf/lib/heartbeat/apache-conf.sh
>-etc/ocf/lib/heartbeat/findif.sh
>-etc/ocf/lib/heartbeat/http-mon.sh
>-etc/ocf/lib/heartbeat/mysql-common.sh
>-etc/ocf/lib/heartbeat/nfsserver-redhat.sh
>-etc/ocf/lib/heartbeat/ocf-binaries
>-etc/ocf/lib/heartbeat/ocf-directories
>-etc/ocf/lib/heartbeat/ocf-distro
>-etc/ocf/lib/heartbeat/ocf-rarun
>-etc/ocf/lib/heartbeat/ocf-returncodes
>-etc/ocf/lib/heartbeat/ocf-shellfuncs
>-etc/ocf/lib/heartbeat/ora-common.sh
>-etc/ocf/lib/heartbeat/sapdb-nosha.sh
>-etc/ocf/lib/heartbeat/sapdb.sh
>-etc/ocf/resource.d/heartbeat/.ocf-binaries
>-etc/ocf/resource.d/heartbeat/.ocf-directories
>-etc/ocf/resource.d/heartbeat/.ocf-returncodes
>-etc/ocf/resource.d/heartbeat/.ocf-shellfuncs
>-etc/ocf/resource.d/heartbeat/AoEtarget
>-etc/ocf/resource.d/heartbeat/AudibleAlarm
>-etc/ocf/resource.d/heartbeat/CTDB
>-etc/ocf/resource.d/heartbeat/ClusterMon
>-etc/ocf/resource.d/heartbeat/Delay
>-etc/ocf/resource.d/heartbeat/Dummy
>-etc/ocf/resource.d/heartbeat/EvmsSCC
>-etc/ocf/resource.d/heartbeat/Evmsd
>-etc/ocf/resource.d/heartbeat/Filesystem
>-etc/ocf/resource.d/heartbeat/ICP
>-etc/ocf/resource.d/heartbeat/IPaddr
>-etc/ocf/resource.d/heartbeat/IPaddr2
>-etc/ocf/resource.d/heartbeat/IPsrcaddr
>-etc/ocf/resource.d/heartbeat/LVM
>-etc/ocf/resource.d/heartbeat/LinuxSCSI
>-etc/ocf/resource.d/heartbeat/MailTo
>-etc/ocf/resource.d/heartbeat/ManageRAID
>-etc/ocf/resource.d/heartbeat/ManageVE
>-etc/ocf/resource.d/heartbeat/Pure-FTPd
>-etc/ocf/resource.d/heartbeat/Raid1
>-etc/ocf/resource.d/heartbeat/Route
>-etc/ocf/resource.d/heartbeat/SAPDatabase
>-etc/ocf/resource.d/heartbeat/SAPInstance
>-etc/ocf/resource.d/heartbeat/SendArp
>-etc/ocf/resource.d/heartbeat/ServeRAID
>-etc/ocf/resource.d/heartbeat/SphinxSearchDaemon
>-etc/ocf/resource.d/heartbeat/Squid
>-etc/ocf/resource.d/heartbeat/Stateful
>-etc/ocf/resource.d/heartbeat/SysInfo
>-etc/ocf/resource.d/heartbeat/VIPArip
>-etc/ocf/resource.d/heartbeat/VirtualDomain
>-etc/ocf/resource.d/heartbeat/WAS
>-etc/ocf/resource.d/heartbeat/WAS6
>-etc/ocf/resource.d/heartbeat/WinPopup
>-etc/ocf/resource.d/heartbeat/Xen
>-etc/ocf/resource.d/heartbeat/Xinetd
>-etc/ocf/resource.d/heartbeat/anything
>-etc/ocf/resource.d/heartbeat/apache
>-etc/ocf/resource.d/heartbeat/asterisk
>-etc/ocf/resource.d/heartbeat/clvm
>-etc/ocf/resource.d/heartbeat/conntrackd
>-etc/ocf/resource.d/heartbeat/db2
>-etc/ocf/resource.d/heartbeat/dhcpd
>-etc/ocf/resource.d/heartbeat/dnsupdate
>-etc/ocf/resource.d/heartbeat/docker
>-etc/ocf/resource.d/heartbeat/eDir88
>-etc/ocf/resource.d/heartbeat/ethmonitor
>-etc/ocf/resource.d/heartbeat/exportfs
>-etc/ocf/resource.d/heartbeat/fio
>-etc/ocf/resource.d/heartbeat/galera
>-etc/ocf/resource.d/heartbeat/iSCSILogicalUnit
>-etc/ocf/resource.d/heartbeat/iSCSITarget
>-etc/ocf/resource.d/heartbeat/ids
>-etc/ocf/resource.d/heartbeat/iface-bridge
>-etc/ocf/resource.d/heartbeat/iface-vlan
>-etc/ocf/resource.d/heartbeat/iscsi
>-etc/ocf/resource.d/heartbeat/jboss
>-etc/ocf/resource.d/heartbeat/kamailio
>-etc/ocf/resource.d/heartbeat/ldirectord
>-etc/ocf/resource.d/heartbeat/lxc
>-etc/ocf/resource.d/heartbeat/mysql
>-etc/ocf/resource.d/heartbeat/mysql-proxy
>-etc/ocf/resource.d/heartbeat/nagios
>-etc/ocf/resource.d/heartbeat/named
>-etc/ocf/resource.d/heartbeat/nfsnotify
>-etc/ocf/resource.d/heartbeat/nfsserver
>-etc/ocf/resource.d/heartbeat/nginx
>-etc/ocf/resource.d/heartbeat/oracle
>-etc/ocf/resource.d/heartbeat/oralsnr
>-etc/ocf/resource.d/heartbeat/pgsql
>-etc/ocf/resource.d/heartbeat/pingd
>-etc/ocf/resource.d/heartbeat/portblock
>-etc/ocf/resource.d/heartbeat/postfix
>-etc/ocf/resource.d/heartbeat/pound
>-etc/ocf/resource.d/heartbeat/proftpd
>-etc/ocf/resource.d/heartbeat/rabbitmq-cluster
>-etc/ocf/resource.d/heartbeat/redis
>-etc/ocf/resource.d/heartbeat/rsyncd
>-etc/ocf/resource.d/heartbeat/rsyslog
>-etc/ocf/resource.d/heartbeat/scsi2reservation
>-etc/ocf/resource.d/heartbeat/sfex
>-etc/ocf/resource.d/heartbeat/sg_persist
>-etc/ocf/resource.d/heartbeat/slapd
>-etc/ocf/resource.d/heartbeat/symlink
>-etc/ocf/resource.d/heartbeat/syslog-ng
>-etc/ocf/resource.d/heartbeat/tomcat
>-etc/ocf/resource.d/heartbeat/varnish
>-etc/ocf/resource.d/heartbeat/vmware
>-etc/ocf/resource.d/heartbeat/zabbixserver
>-etc/ocf/resource.d/redhat
>+lib/ocf/lib/heartbeat/apache-conf.sh
>+lib/ocf/lib/heartbeat/findif.sh
>+lib/ocf/lib/heartbeat/http-mon.sh
>+lib/ocf/lib/heartbeat/mysql-common.sh
>+lib/ocf/lib/heartbeat/nfsserver-redhat.sh
>+lib/ocf/lib/heartbeat/ocf-binaries
>+lib/ocf/lib/heartbeat/ocf-directories
>+lib/ocf/lib/heartbeat/ocf-distro
>+lib/ocf/lib/heartbeat/ocf-rarun
>+lib/ocf/lib/heartbeat/ocf-returncodes
>+lib/ocf/lib/heartbeat/ocf-shellfuncs
>+lib/ocf/lib/heartbeat/ora-common.sh
>+lib/ocf/lib/heartbeat/sapdb-nosha.sh
>+lib/ocf/lib/heartbeat/sapdb.sh
>+lib/ocf/resource.d/heartbeat/.ocf-binaries
>+lib/ocf/resource.d/heartbeat/.ocf-directories
>+lib/ocf/resource.d/heartbeat/.ocf-returncodes
>+lib/ocf/resource.d/heartbeat/.ocf-shellfuncs
>+lib/ocf/resource.d/heartbeat/AoEtarget
>+lib/ocf/resource.d/heartbeat/AudibleAlarm
>+lib/ocf/resource.d/heartbeat/CTDB
>+lib/ocf/resource.d/heartbeat/ClusterMon
>+lib/ocf/resource.d/heartbeat/Delay
>+lib/ocf/resource.d/heartbeat/Dummy
>+lib/ocf/resource.d/heartbeat/EvmsSCC
>+lib/ocf/resource.d/heartbeat/Evmsd
>+lib/ocf/resource.d/heartbeat/Filesystem
>+lib/ocf/resource.d/heartbeat/ICP
>+lib/ocf/resource.d/heartbeat/IPaddr
>+lib/ocf/resource.d/heartbeat/IPaddr2
>+lib/ocf/resource.d/heartbeat/IPsrcaddr
>+lib/ocf/resource.d/heartbeat/LVM
>+lib/ocf/resource.d/heartbeat/LinuxSCSI
>+lib/ocf/resource.d/heartbeat/MailTo
>+lib/ocf/resource.d/heartbeat/ManageRAID
>+lib/ocf/resource.d/heartbeat/ManageVE
>+lib/ocf/resource.d/heartbeat/Pure-FTPd
>+lib/ocf/resource.d/heartbeat/Raid1
>+lib/ocf/resource.d/heartbeat/Route
>+lib/ocf/resource.d/heartbeat/SAPDatabase
>+lib/ocf/resource.d/heartbeat/SAPInstance
>+lib/ocf/resource.d/heartbeat/SendArp
>+lib/ocf/resource.d/heartbeat/ServeRAID
>+lib/ocf/resource.d/heartbeat/SphinxSearchDaemon
>+lib/ocf/resource.d/heartbeat/Squid
>+lib/ocf/resource.d/heartbeat/Stateful
>+lib/ocf/resource.d/heartbeat/SysInfo
>+lib/ocf/resource.d/heartbeat/VIPArip
>+lib/ocf/resource.d/heartbeat/VirtualDomain
>+lib/ocf/resource.d/heartbeat/WAS
>+lib/ocf/resource.d/heartbeat/WAS6
>+lib/ocf/resource.d/heartbeat/WinPopup
>+lib/ocf/resource.d/heartbeat/Xen
>+lib/ocf/resource.d/heartbeat/Xinetd
>+lib/ocf/resource.d/heartbeat/anything
>+lib/ocf/resource.d/heartbeat/apache
>+lib/ocf/resource.d/heartbeat/asterisk
>+lib/ocf/resource.d/heartbeat/awseip
>+lib/ocf/resource.d/heartbeat/awsvip
>+lib/ocf/resource.d/heartbeat/clvm
>+lib/ocf/resource.d/heartbeat/conntrackd
>+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/eDir88
>+lib/ocf/resource.d/heartbeat/ethmonitor
>+lib/ocf/resource.d/heartbeat/exportfs
>+lib/ocf/resource.d/heartbeat/fio
>+lib/ocf/resource.d/heartbeat/galera
>+lib/ocf/resource.d/heartbeat/garbd
>+lib/ocf/resource.d/heartbeat/iSCSILogicalUnit
>+lib/ocf/resource.d/heartbeat/iSCSITarget
>+lib/ocf/resource.d/heartbeat/ids
>+lib/ocf/resource.d/heartbeat/iface-bridge
>+lib/ocf/resource.d/heartbeat/iface-vlan
>+lib/ocf/resource.d/heartbeat/iscsi
>+lib/ocf/resource.d/heartbeat/jboss
>+lib/ocf/resource.d/heartbeat/kamailio
>+lib/ocf/resource.d/heartbeat/ldirectord
>+lib/ocf/resource.d/heartbeat/lxc
>+lib/ocf/resource.d/heartbeat/mysql
>+lib/ocf/resource.d/heartbeat/mysql-proxy
>+lib/ocf/resource.d/heartbeat/nagios
>+lib/ocf/resource.d/heartbeat/named
>+lib/ocf/resource.d/heartbeat/nfsnotify
>+lib/ocf/resource.d/heartbeat/nfsserver
>+lib/ocf/resource.d/heartbeat/nginx
>+lib/ocf/resource.d/heartbeat/oracle
>+lib/ocf/resource.d/heartbeat/oralsnr
>+lib/ocf/resource.d/heartbeat/pgagent
>+lib/ocf/resource.d/heartbeat/pgsql
>+lib/ocf/resource.d/heartbeat/pingd
>+lib/ocf/resource.d/heartbeat/portblock
>+lib/ocf/resource.d/heartbeat/postfix
>+lib/ocf/resource.d/heartbeat/pound
>+lib/ocf/resource.d/heartbeat/proftpd
>+lib/ocf/resource.d/heartbeat/rabbitmq-cluster
>+lib/ocf/resource.d/heartbeat/redis
>+lib/ocf/resource.d/heartbeat/rsyncd
>+lib/ocf/resource.d/heartbeat/rsyslog
>+lib/ocf/resource.d/heartbeat/scsi2reservation
>+lib/ocf/resource.d/heartbeat/sfex
>+lib/ocf/resource.d/heartbeat/sg_persist
>+lib/ocf/resource.d/heartbeat/slapd
>+lib/ocf/resource.d/heartbeat/symlink
>+lib/ocf/resource.d/heartbeat/syslog-ng
>+lib/ocf/resource.d/heartbeat/tomcat
>+lib/ocf/resource.d/heartbeat/varnish
>+lib/ocf/resource.d/heartbeat/vmware
>+lib/ocf/resource.d/heartbeat/vsftpd
>+lib/ocf/resource.d/heartbeat/zabbixserver
>+lib/ocf/resource.d/redhat
> include/heartbeat/agent_config.h
> libexec/heartbeat/findif
> %%MANPAGES%%man/man7/ocf_heartbeat_AoEtarget.7.gz
>@@ -161,6 +166,7 @@
> %%MANPAGES%%man/man7/ocf_heartbeat_exportfs.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_fio.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_galera.7.gz
>+%%MANPAGES%%man/man7/ocf_heartbeat_garbd.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_iSCSILogicalUnit.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_iSCSITarget.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_ids.7.gz
>@@ -172,6 +178,7 @@
> %%MANPAGES%%man/man7/ocf_heartbeat_lxc.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_mysql-proxy.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_mysql.7.gz
>+%%MANPAGES%%man/man7/ocf_heartbeat_nagios.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_named.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_nfsnotify.7.gz
> %%MANPAGES%%man/man7/ocf_heartbeat_nfsserver.7.gz
>@@ -267,6 +274,7 @@
> share/cluster/utils/tomcat-parse-config.pl
> share/cluster/vm.sh
> %%PORTDOCS%%%%DOCSDIR%%/README.webapps
>+%%DATADIR%%/metadata.rng
> %%DATADIR%%/ocft/README
> %%DATADIR%%/ocft/README.zh_CN
> %%DATADIR%%/ocft/caselib

Actions: View | Diff

Attachments on bug 219546: 182901 | 183012