View | Details | Raw Unified | Return to bug 219546 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +7 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	resource-agents
4
PORTNAME=	resource-agents
5
PORTVERSION=	3.9.7
5
PORTVERSION=	4.0.1
6
PORTREVISION=	2
7
DISTVERSIONPREFIX=v
6
DISTVERSIONPREFIX=v
8
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
9
8
Lines 25-31 Link Here
25
USE_GCC=	yes
24
USE_GCC=	yes
26
USE_GNOME=	glib20
25
USE_GNOME=	glib20
27
GNU_CONFIGURE=	yes
26
GNU_CONFIGURE=	yes
28
CONFIGURE_ARGS=	--with-ocf-root=${PREFIX}/etc/ocf
29
27
30
SHEBANG_LANG=	sh
28
SHEBANG_LANG=	sh
31
sh_OLD_CMD=	${SH}
29
sh_OLD_CMD=	${SH}
Lines 32-37 Link Here
32
sh_CMD=		${LOCALBASE}/bin/bash
30
sh_CMD=		${LOCALBASE}/bin/bash
33
SHEBANG_FILES=	heartbeat/* \
31
SHEBANG_FILES=	heartbeat/* \
34
		ldirectord/ldirectord.in \
32
		ldirectord/ldirectord.in \
33
		rgmanager/src/resources/*.sh \
34
		rgmanager/src/resources/*.sh.in \
35
		rgmanager/src/resources/ocf-shellfuncs \
36
		rgmanager/src/resources/svclib_nfslock \
37
		rgmanager/src/resources/utils/*.pl \
38
		rgmanager/src/resources/utils/*.sh \
35
		tools/ocft/ocft.in \
39
		tools/ocft/ocft.in \
36
		tools/ocf-tester.in
40
		tools/ocf-tester.in
37
41
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (ClusterLabs-resource-agents-v3.9.7_GH0.tar.gz) = e5bd62658fbc236acb83b709f64b2cd9fae52aa4a420a44fed5eb667e928b152
1
TIMESTAMP = 1495224952
2
SIZE (ClusterLabs-resource-agents-v3.9.7_GH0.tar.gz) = 646048
2
SHA256 (ClusterLabs-resource-agents-v4.0.1_GH0.tar.gz) = 863f83c724bad3a8bcff12b9c8712406c43e010041868826cad7b78fd8cfb9fb
3
SIZE (ClusterLabs-resource-agents-v4.0.1_GH0.tar.gz) = 659123
(-)files/patch-tools_ocf_tester.in (-1 / +1 lines)
Lines 4-10 Link Here
4
 test_permissions() {
4
 test_permissions() {
5
     action=meta-data
5
     action=meta-data
6
     debug ${1:-"Testing permissions with uid nobody"}
6
     debug ${1:-"Testing permissions with uid nobody"}
7
-    su nobody -s /bin/sh $agent $action > /dev/null
7
-    su nobody -s /bin/sh -c "$agent $action" > /dev/null
8
+    su -m nobody -c "$agent $action" > /dev/null
8
+    su -m nobody -c "$agent $action" > /dev/null
9
 }
9
 }
10
 
10
 
(-)pkg-plist (-108 / +116 lines)
Lines 1-114 Link Here
1
etc/ha.d/resource.d/ldirectord
1
etc/ha.d/resource.d/ldirectord
2
etc/ha.d/shellfuncs
2
etc/ha.d/shellfuncs
3
etc/logrotate.d/ldirectord
3
etc/logrotate.d/ldirectord
4
etc/ocf/lib/heartbeat/apache-conf.sh
4
lib/ocf/lib/heartbeat/apache-conf.sh
5
etc/ocf/lib/heartbeat/findif.sh
5
lib/ocf/lib/heartbeat/findif.sh
6
etc/ocf/lib/heartbeat/http-mon.sh
6
lib/ocf/lib/heartbeat/http-mon.sh
7
etc/ocf/lib/heartbeat/mysql-common.sh
7
lib/ocf/lib/heartbeat/mysql-common.sh
8
etc/ocf/lib/heartbeat/nfsserver-redhat.sh
8
lib/ocf/lib/heartbeat/nfsserver-redhat.sh
9
etc/ocf/lib/heartbeat/ocf-binaries
9
lib/ocf/lib/heartbeat/ocf-binaries
10
etc/ocf/lib/heartbeat/ocf-directories
10
lib/ocf/lib/heartbeat/ocf-directories
11
etc/ocf/lib/heartbeat/ocf-distro
11
lib/ocf/lib/heartbeat/ocf-distro
12
etc/ocf/lib/heartbeat/ocf-rarun
12
lib/ocf/lib/heartbeat/ocf-rarun
13
etc/ocf/lib/heartbeat/ocf-returncodes
13
lib/ocf/lib/heartbeat/ocf-returncodes
14
etc/ocf/lib/heartbeat/ocf-shellfuncs
14
lib/ocf/lib/heartbeat/ocf-shellfuncs
15
etc/ocf/lib/heartbeat/ora-common.sh
15
lib/ocf/lib/heartbeat/ora-common.sh
16
etc/ocf/lib/heartbeat/sapdb-nosha.sh
16
lib/ocf/lib/heartbeat/sapdb-nosha.sh
17
etc/ocf/lib/heartbeat/sapdb.sh
17
lib/ocf/lib/heartbeat/sapdb.sh
18
etc/ocf/resource.d/heartbeat/.ocf-binaries
18
lib/ocf/resource.d/heartbeat/.ocf-binaries
19
etc/ocf/resource.d/heartbeat/.ocf-directories
19
lib/ocf/resource.d/heartbeat/.ocf-directories
20
etc/ocf/resource.d/heartbeat/.ocf-returncodes
20
lib/ocf/resource.d/heartbeat/.ocf-returncodes
21
etc/ocf/resource.d/heartbeat/.ocf-shellfuncs
21
lib/ocf/resource.d/heartbeat/.ocf-shellfuncs
22
etc/ocf/resource.d/heartbeat/AoEtarget
22
lib/ocf/resource.d/heartbeat/AoEtarget
23
etc/ocf/resource.d/heartbeat/AudibleAlarm
23
lib/ocf/resource.d/heartbeat/AudibleAlarm
24
etc/ocf/resource.d/heartbeat/CTDB
24
lib/ocf/resource.d/heartbeat/CTDB
25
etc/ocf/resource.d/heartbeat/ClusterMon
25
lib/ocf/resource.d/heartbeat/ClusterMon
26
etc/ocf/resource.d/heartbeat/Delay
26
lib/ocf/resource.d/heartbeat/Delay
27
etc/ocf/resource.d/heartbeat/Dummy
27
lib/ocf/resource.d/heartbeat/Dummy
28
etc/ocf/resource.d/heartbeat/EvmsSCC
28
lib/ocf/resource.d/heartbeat/EvmsSCC
29
etc/ocf/resource.d/heartbeat/Evmsd
29
lib/ocf/resource.d/heartbeat/Evmsd
30
etc/ocf/resource.d/heartbeat/Filesystem
30
lib/ocf/resource.d/heartbeat/Filesystem
31
etc/ocf/resource.d/heartbeat/ICP
31
lib/ocf/resource.d/heartbeat/ICP
32
etc/ocf/resource.d/heartbeat/IPaddr
32
lib/ocf/resource.d/heartbeat/IPaddr
33
etc/ocf/resource.d/heartbeat/IPaddr2
33
lib/ocf/resource.d/heartbeat/IPaddr2
34
etc/ocf/resource.d/heartbeat/IPsrcaddr
34
lib/ocf/resource.d/heartbeat/IPsrcaddr
35
etc/ocf/resource.d/heartbeat/LVM
35
lib/ocf/resource.d/heartbeat/LVM
36
etc/ocf/resource.d/heartbeat/LinuxSCSI
36
lib/ocf/resource.d/heartbeat/LinuxSCSI
37
etc/ocf/resource.d/heartbeat/MailTo
37
lib/ocf/resource.d/heartbeat/MailTo
38
etc/ocf/resource.d/heartbeat/ManageRAID
38
lib/ocf/resource.d/heartbeat/ManageRAID
39
etc/ocf/resource.d/heartbeat/ManageVE
39
lib/ocf/resource.d/heartbeat/ManageVE
40
etc/ocf/resource.d/heartbeat/Pure-FTPd
40
lib/ocf/resource.d/heartbeat/Pure-FTPd
41
etc/ocf/resource.d/heartbeat/Raid1
41
lib/ocf/resource.d/heartbeat/Raid1
42
etc/ocf/resource.d/heartbeat/Route
42
lib/ocf/resource.d/heartbeat/Route
43
etc/ocf/resource.d/heartbeat/SAPDatabase
43
lib/ocf/resource.d/heartbeat/SAPDatabase
44
etc/ocf/resource.d/heartbeat/SAPInstance
44
lib/ocf/resource.d/heartbeat/SAPInstance
45
etc/ocf/resource.d/heartbeat/SendArp
45
lib/ocf/resource.d/heartbeat/SendArp
46
etc/ocf/resource.d/heartbeat/ServeRAID
46
lib/ocf/resource.d/heartbeat/ServeRAID
47
etc/ocf/resource.d/heartbeat/SphinxSearchDaemon
47
lib/ocf/resource.d/heartbeat/SphinxSearchDaemon
48
etc/ocf/resource.d/heartbeat/Squid
48
lib/ocf/resource.d/heartbeat/Squid
49
etc/ocf/resource.d/heartbeat/Stateful
49
lib/ocf/resource.d/heartbeat/Stateful
50
etc/ocf/resource.d/heartbeat/SysInfo
50
lib/ocf/resource.d/heartbeat/SysInfo
51
etc/ocf/resource.d/heartbeat/VIPArip
51
lib/ocf/resource.d/heartbeat/VIPArip
52
etc/ocf/resource.d/heartbeat/VirtualDomain
52
lib/ocf/resource.d/heartbeat/VirtualDomain
53
etc/ocf/resource.d/heartbeat/WAS
53
lib/ocf/resource.d/heartbeat/WAS
54
etc/ocf/resource.d/heartbeat/WAS6
54
lib/ocf/resource.d/heartbeat/WAS6
55
etc/ocf/resource.d/heartbeat/WinPopup
55
lib/ocf/resource.d/heartbeat/WinPopup
56
etc/ocf/resource.d/heartbeat/Xen
56
lib/ocf/resource.d/heartbeat/Xen
57
etc/ocf/resource.d/heartbeat/Xinetd
57
lib/ocf/resource.d/heartbeat/Xinetd
58
etc/ocf/resource.d/heartbeat/anything
58
lib/ocf/resource.d/heartbeat/anything
59
etc/ocf/resource.d/heartbeat/apache
59
lib/ocf/resource.d/heartbeat/apache
60
etc/ocf/resource.d/heartbeat/asterisk
60
lib/ocf/resource.d/heartbeat/asterisk
61
etc/ocf/resource.d/heartbeat/clvm
61
lib/ocf/resource.d/heartbeat/awseip
62
etc/ocf/resource.d/heartbeat/conntrackd
62
lib/ocf/resource.d/heartbeat/awsvip
63
etc/ocf/resource.d/heartbeat/db2
63
lib/ocf/resource.d/heartbeat/clvm
64
etc/ocf/resource.d/heartbeat/dhcpd
64
lib/ocf/resource.d/heartbeat/conntrackd
65
etc/ocf/resource.d/heartbeat/dnsupdate
65
lib/ocf/resource.d/heartbeat/db2
66
etc/ocf/resource.d/heartbeat/docker
66
lib/ocf/resource.d/heartbeat/dhcpd
67
etc/ocf/resource.d/heartbeat/eDir88
67
lib/ocf/resource.d/heartbeat/dnsupdate
68
etc/ocf/resource.d/heartbeat/ethmonitor
68
lib/ocf/resource.d/heartbeat/docker
69
etc/ocf/resource.d/heartbeat/exportfs
69
lib/ocf/resource.d/heartbeat/eDir88
70
etc/ocf/resource.d/heartbeat/fio
70
lib/ocf/resource.d/heartbeat/ethmonitor
71
etc/ocf/resource.d/heartbeat/galera
71
lib/ocf/resource.d/heartbeat/exportfs
72
etc/ocf/resource.d/heartbeat/iSCSILogicalUnit
72
lib/ocf/resource.d/heartbeat/fio
73
etc/ocf/resource.d/heartbeat/iSCSITarget
73
lib/ocf/resource.d/heartbeat/galera
74
etc/ocf/resource.d/heartbeat/ids
74
lib/ocf/resource.d/heartbeat/garbd
75
etc/ocf/resource.d/heartbeat/iface-bridge
75
lib/ocf/resource.d/heartbeat/iSCSILogicalUnit
76
etc/ocf/resource.d/heartbeat/iface-vlan
76
lib/ocf/resource.d/heartbeat/iSCSITarget
77
etc/ocf/resource.d/heartbeat/iscsi
77
lib/ocf/resource.d/heartbeat/ids
78
etc/ocf/resource.d/heartbeat/jboss
78
lib/ocf/resource.d/heartbeat/iface-bridge
79
etc/ocf/resource.d/heartbeat/kamailio
79
lib/ocf/resource.d/heartbeat/iface-vlan
80
etc/ocf/resource.d/heartbeat/ldirectord
80
lib/ocf/resource.d/heartbeat/iscsi
81
etc/ocf/resource.d/heartbeat/lxc
81
lib/ocf/resource.d/heartbeat/jboss
82
etc/ocf/resource.d/heartbeat/mysql
82
lib/ocf/resource.d/heartbeat/kamailio
83
etc/ocf/resource.d/heartbeat/mysql-proxy
83
lib/ocf/resource.d/heartbeat/ldirectord
84
etc/ocf/resource.d/heartbeat/nagios
84
lib/ocf/resource.d/heartbeat/lxc
85
etc/ocf/resource.d/heartbeat/named
85
lib/ocf/resource.d/heartbeat/mysql
86
etc/ocf/resource.d/heartbeat/nfsnotify
86
lib/ocf/resource.d/heartbeat/mysql-proxy
87
etc/ocf/resource.d/heartbeat/nfsserver
87
lib/ocf/resource.d/heartbeat/nagios
88
etc/ocf/resource.d/heartbeat/nginx
88
lib/ocf/resource.d/heartbeat/named
89
etc/ocf/resource.d/heartbeat/oracle
89
lib/ocf/resource.d/heartbeat/nfsnotify
90
etc/ocf/resource.d/heartbeat/oralsnr
90
lib/ocf/resource.d/heartbeat/nfsserver
91
etc/ocf/resource.d/heartbeat/pgsql
91
lib/ocf/resource.d/heartbeat/nginx
92
etc/ocf/resource.d/heartbeat/pingd
92
lib/ocf/resource.d/heartbeat/oracle
93
etc/ocf/resource.d/heartbeat/portblock
93
lib/ocf/resource.d/heartbeat/oralsnr
94
etc/ocf/resource.d/heartbeat/postfix
94
lib/ocf/resource.d/heartbeat/pgagent
95
etc/ocf/resource.d/heartbeat/pound
95
lib/ocf/resource.d/heartbeat/pgsql
96
etc/ocf/resource.d/heartbeat/proftpd
96
lib/ocf/resource.d/heartbeat/pingd
97
etc/ocf/resource.d/heartbeat/rabbitmq-cluster
97
lib/ocf/resource.d/heartbeat/portblock
98
etc/ocf/resource.d/heartbeat/redis
98
lib/ocf/resource.d/heartbeat/postfix
99
etc/ocf/resource.d/heartbeat/rsyncd
99
lib/ocf/resource.d/heartbeat/pound
100
etc/ocf/resource.d/heartbeat/rsyslog
100
lib/ocf/resource.d/heartbeat/proftpd
101
etc/ocf/resource.d/heartbeat/scsi2reservation
101
lib/ocf/resource.d/heartbeat/rabbitmq-cluster
102
etc/ocf/resource.d/heartbeat/sfex
102
lib/ocf/resource.d/heartbeat/redis
103
etc/ocf/resource.d/heartbeat/sg_persist
103
lib/ocf/resource.d/heartbeat/rsyncd
104
etc/ocf/resource.d/heartbeat/slapd
104
lib/ocf/resource.d/heartbeat/rsyslog
105
etc/ocf/resource.d/heartbeat/symlink
105
lib/ocf/resource.d/heartbeat/scsi2reservation
106
etc/ocf/resource.d/heartbeat/syslog-ng
106
lib/ocf/resource.d/heartbeat/sfex
107
etc/ocf/resource.d/heartbeat/tomcat
107
lib/ocf/resource.d/heartbeat/sg_persist
108
etc/ocf/resource.d/heartbeat/varnish
108
lib/ocf/resource.d/heartbeat/slapd
109
etc/ocf/resource.d/heartbeat/vmware
109
lib/ocf/resource.d/heartbeat/symlink
110
etc/ocf/resource.d/heartbeat/zabbixserver
110
lib/ocf/resource.d/heartbeat/syslog-ng
111
etc/ocf/resource.d/redhat
111
lib/ocf/resource.d/heartbeat/tomcat
112
lib/ocf/resource.d/heartbeat/varnish
113
lib/ocf/resource.d/heartbeat/vmware
114
lib/ocf/resource.d/heartbeat/vsftpd
115
lib/ocf/resource.d/heartbeat/zabbixserver
116
lib/ocf/resource.d/redhat
112
include/heartbeat/agent_config.h
117
include/heartbeat/agent_config.h
113
libexec/heartbeat/findif
118
libexec/heartbeat/findif
114
%%MANPAGES%%man/man7/ocf_heartbeat_AoEtarget.7.gz
119
%%MANPAGES%%man/man7/ocf_heartbeat_AoEtarget.7.gz
Lines 161-166 Link Here
161
%%MANPAGES%%man/man7/ocf_heartbeat_exportfs.7.gz
166
%%MANPAGES%%man/man7/ocf_heartbeat_exportfs.7.gz
162
%%MANPAGES%%man/man7/ocf_heartbeat_fio.7.gz
167
%%MANPAGES%%man/man7/ocf_heartbeat_fio.7.gz
163
%%MANPAGES%%man/man7/ocf_heartbeat_galera.7.gz
168
%%MANPAGES%%man/man7/ocf_heartbeat_galera.7.gz
169
%%MANPAGES%%man/man7/ocf_heartbeat_garbd.7.gz
164
%%MANPAGES%%man/man7/ocf_heartbeat_iSCSILogicalUnit.7.gz
170
%%MANPAGES%%man/man7/ocf_heartbeat_iSCSILogicalUnit.7.gz
165
%%MANPAGES%%man/man7/ocf_heartbeat_iSCSITarget.7.gz
171
%%MANPAGES%%man/man7/ocf_heartbeat_iSCSITarget.7.gz
166
%%MANPAGES%%man/man7/ocf_heartbeat_ids.7.gz
172
%%MANPAGES%%man/man7/ocf_heartbeat_ids.7.gz
Lines 172-177 Link Here
172
%%MANPAGES%%man/man7/ocf_heartbeat_lxc.7.gz
178
%%MANPAGES%%man/man7/ocf_heartbeat_lxc.7.gz
173
%%MANPAGES%%man/man7/ocf_heartbeat_mysql-proxy.7.gz
179
%%MANPAGES%%man/man7/ocf_heartbeat_mysql-proxy.7.gz
174
%%MANPAGES%%man/man7/ocf_heartbeat_mysql.7.gz
180
%%MANPAGES%%man/man7/ocf_heartbeat_mysql.7.gz
181
%%MANPAGES%%man/man7/ocf_heartbeat_nagios.7.gz
175
%%MANPAGES%%man/man7/ocf_heartbeat_named.7.gz
182
%%MANPAGES%%man/man7/ocf_heartbeat_named.7.gz
176
%%MANPAGES%%man/man7/ocf_heartbeat_nfsnotify.7.gz
183
%%MANPAGES%%man/man7/ocf_heartbeat_nfsnotify.7.gz
177
%%MANPAGES%%man/man7/ocf_heartbeat_nfsserver.7.gz
184
%%MANPAGES%%man/man7/ocf_heartbeat_nfsserver.7.gz
Lines 267-272 Link Here
267
share/cluster/utils/tomcat-parse-config.pl
274
share/cluster/utils/tomcat-parse-config.pl
268
share/cluster/vm.sh
275
share/cluster/vm.sh
269
%%PORTDOCS%%%%DOCSDIR%%/README.webapps
276
%%PORTDOCS%%%%DOCSDIR%%/README.webapps
277
%%DATADIR%%/metadata.rng
270
%%DATADIR%%/ocft/README
278
%%DATADIR%%/ocft/README
271
%%DATADIR%%/ocft/README.zh_CN
279
%%DATADIR%%/ocft/README.zh_CN
272
%%DATADIR%%/ocft/caselib
280
%%DATADIR%%/ocft/caselib

Return to bug 219546