net/pacemaker2: update 2.0.0-rc4 to 2.0.3

  * fixes CVE-2018-16878, CVE-2018-16877, CVE-2019-3885;
  * implements https://bugs.clusterlabs.org/show_bug.cgi?id=5397#c3

PR:		241460
Reviewed by:	flo
Approved by:	portmgr (maintainer timeout)

4 files changed, 192 insertions, 68 deletions

diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
index 8d0e98b16510..21c90fc3515d 100644
--- a/net/pacemaker2/Makefile
+++ b/net/pacemaker2/Makefile
@@ -1,13 +1,13 @@
 # Created by: David Shane Holden <dpejesh@yahoo.com>
 # $FreeBSD$
 
-PORTVERSION=		2.0.0
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-rc4
+PORTVERSION=		2.0.3
 PKGNAMESUFFIX=		2
 
 .include "${.CURDIR}/../pacemaker1/Makefile.common"
 
+CONFIGURE_ARGS+=	--with-noarch-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+
 CONFLICTS+=		pacemaker1-[0-9]*
 
 post-patch: post-patch-common
diff --git a/net/pacemaker2/distinfo b/net/pacemaker2/distinfo
index b5085f870160..a483a7a98aee 100644
--- a/net/pacemaker2/distinfo
+++ b/net/pacemaker2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528984067
-SHA256 (ClusterLabs-pacemaker-Pacemaker-2.0.0-rc4_GH0.tar.gz) = ed7382f725cc8e5c751831d080f4c219185944c58af505be61aef8350f92841e
-SIZE (ClusterLabs-pacemaker-Pacemaker-2.0.0-rc4_GH0.tar.gz) = 5260030
+TIMESTAMP = 1575901526
+SHA256 (ClusterLabs-pacemaker-Pacemaker-2.0.3_GH0.tar.gz) = ca228f7f9745c7bc1e31bebe30e51475e95a82d9010d281f1701f2e3310bd3fe
+SIZE (ClusterLabs-pacemaker-Pacemaker-2.0.3_GH0.tar.gz) = 5662096
diff --git a/net/pacemaker2/files/pacemaker.in b/net/pacemaker2/files/pacemaker.in
index 0292844dd418..60c1f45f2610 100644
--- a/net/pacemaker2/files/pacemaker.in
+++ b/net/pacemaker2/files/pacemaker.in
@@ -29,7 +29,10 @@ pacemaker_precmd()
 
 	export PATH="${PATH}:/usr/local/sbin:/usr/local/bin"
 	export PCMK_ipc_buffer=${pacemaker_ipc_buffer}
-	export PCMK_ipc_type=socket
+
+	# https://bugs.clusterlabs.org/show_bug.cgi?id=5397
+	#
+	#export PCMK_ipc_type=socket
 }
 
 run_rc_command "$1"
diff --git a/net/pacemaker2/pkg-plist b/net/pacemaker2/pkg-plist
index e028a23f9bf1..4ac5c6d19e17 100644
--- a/net/pacemaker2/pkg-plist
+++ b/net/pacemaker2/pkg-plist
@@ -1,12 +1,14 @@
 etc/logrotate.d/pacemaker
 include/pacemaker/crm/attrd.h
 include/pacemaker/crm/cib.h
+include/pacemaker/crm/cib/cib_types.h
 include/pacemaker/crm/cib/util.h
 include/pacemaker/crm/cluster.h
 include/pacemaker/crm/common/ipc.h
 include/pacemaker/crm/common/iso8601.h
 include/pacemaker/crm/common/logging.h
 include/pacemaker/crm/common/mainloop.h
+include/pacemaker/crm/common/nvpair.h
 include/pacemaker/crm/common/results.h
 include/pacemaker/crm/common/util.h
 include/pacemaker/crm/common/xml.h
@@ -16,56 +18,52 @@ include/pacemaker/crm/lrmd.h
 include/pacemaker/crm/msg_xml.h
 include/pacemaker/crm/pengine/common.h
 include/pacemaker/crm/pengine/complex.h
-include/pacemaker/crm/pengine/remote.h
+include/pacemaker/crm/pengine/pe_types.h
 include/pacemaker/crm/pengine/rules.h
 include/pacemaker/crm/pengine/status.h
 include/pacemaker/crm/services.h
 include/pacemaker/crm/stonith-ng.h
-include/pacemaker/crm/transition.h
 include/pacemaker/crm_config.h
 lib/libcib.a
 lib/libcib.so
-lib/libcib.so.7
-lib/libcib.so.7.0.1
+lib/libcib.so.27
+lib/libcib.so.27.1.0
 lib/libcrmcluster.a
 lib/libcrmcluster.so
-lib/libcrmcluster.so.9
-lib/libcrmcluster.so.9.0.1
+lib/libcrmcluster.so.29
+lib/libcrmcluster.so.29.0.3
 lib/libcrmcommon.a
 lib/libcrmcommon.so
-lib/libcrmcommon.so.13
-lib/libcrmcommon.so.13.1.0
+lib/libcrmcommon.so.34
+lib/libcrmcommon.so.34.3.0
 lib/libcrmservice.a
 lib/libcrmservice.so
-lib/libcrmservice.so.8
-lib/libcrmservice.so.8.0.1
+lib/libcrmservice.so.28
+lib/libcrmservice.so.28.2.0
 lib/liblrmd.a
 lib/liblrmd.so
-lib/liblrmd.so.8
-lib/liblrmd.so.8.0.1
+lib/liblrmd.so.28
+lib/liblrmd.so.28.0.3
+lib/libpacemaker.a
+lib/libpacemaker.so
+lib/libpacemaker.so.1
+lib/libpacemaker.so.1.1.0
 lib/libpe_rules.a
 lib/libpe_rules.so
-lib/libpe_rules.so.2
-lib/libpe_rules.so.2.4.1
+lib/libpe_rules.so.26
+lib/libpe_rules.so.26.1.0
 lib/libpe_status.a
 lib/libpe_status.so
-lib/libpe_status.so.17
-lib/libpe_status.so.17.0.0
-lib/libpengine.a
-lib/libpengine.so
-lib/libpengine.so.17
-lib/libpengine.so.17.0.0
+lib/libpe_status.so.28
+lib/libpe_status.so.28.1.0
 lib/libstonithd.a
 lib/libstonithd.so
-lib/libstonithd.so.6
-lib/libstonithd.so.6.0.1
-lib/libtransitioner.a
-lib/libtransitioner.so
-lib/libtransitioner.so.5
-lib/libtransitioner.so.5.0.0
+lib/libstonithd.so.26
+lib/libstonithd.so.26.3.0
 lib/ocf/resource.d/pacemaker/ClusterMon
 lib/ocf/resource.d/pacemaker/Dummy
 lib/ocf/resource.d/pacemaker/HealthCPU
+lib/ocf/resource.d/pacemaker/HealthIOWait
 lib/ocf/resource.d/pacemaker/HealthSMART
 lib/ocf/resource.d/pacemaker/Stateful
 lib/ocf/resource.d/pacemaker/SysInfo
@@ -78,55 +76,58 @@ lib/ocf/resource.d/pacemaker/ping
 lib/ocf/resource.d/pacemaker/pingd
 lib/ocf/resource.d/pacemaker/remote
 %%PYTHON_SITELIBDIR%%/cts/CIB.py
-%%PYTHON_SITELIBDIR%%/cts/CIB.pyc
-%%PYTHON_SITELIBDIR%%/cts/CIB.pyo
 %%PYTHON_SITELIBDIR%%/cts/CM_common.py
-%%PYTHON_SITELIBDIR%%/cts/CM_common.pyc
-%%PYTHON_SITELIBDIR%%/cts/CM_common.pyo
 %%PYTHON_SITELIBDIR%%/cts/CM_corosync.py
-%%PYTHON_SITELIBDIR%%/cts/CM_corosync.pyc
-%%PYTHON_SITELIBDIR%%/cts/CM_corosync.pyo
 %%PYTHON_SITELIBDIR%%/cts/CTS.py
-%%PYTHON_SITELIBDIR%%/cts/CTS.pyc
-%%PYTHON_SITELIBDIR%%/cts/CTS.pyo
 %%PYTHON_SITELIBDIR%%/cts/CTSaudits.py
-%%PYTHON_SITELIBDIR%%/cts/CTSaudits.pyc
-%%PYTHON_SITELIBDIR%%/cts/CTSaudits.pyo
 %%PYTHON_SITELIBDIR%%/cts/CTSscenarios.py
-%%PYTHON_SITELIBDIR%%/cts/CTSscenarios.pyc
-%%PYTHON_SITELIBDIR%%/cts/CTSscenarios.pyo
 %%PYTHON_SITELIBDIR%%/cts/CTStests.py
-%%PYTHON_SITELIBDIR%%/cts/CTStests.pyc
-%%PYTHON_SITELIBDIR%%/cts/CTStests.pyo
 %%PYTHON_SITELIBDIR%%/cts/CTSvars.py
-%%PYTHON_SITELIBDIR%%/cts/CTSvars.pyc
-%%PYTHON_SITELIBDIR%%/cts/CTSvars.pyo
 %%PYTHON_SITELIBDIR%%/cts/__init__.py
-%%PYTHON_SITELIBDIR%%/cts/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-36.pyc
 %%PYTHON_SITELIBDIR%%/cts/cib_xml.py
-%%PYTHON_SITELIBDIR%%/cts/cib_xml.pyc
-%%PYTHON_SITELIBDIR%%/cts/cib_xml.pyo
 %%PYTHON_SITELIBDIR%%/cts/environment.py
-%%PYTHON_SITELIBDIR%%/cts/environment.pyc
-%%PYTHON_SITELIBDIR%%/cts/environment.pyo
 %%PYTHON_SITELIBDIR%%/cts/logging.py
-%%PYTHON_SITELIBDIR%%/cts/logging.pyc
-%%PYTHON_SITELIBDIR%%/cts/logging.pyo
 %%PYTHON_SITELIBDIR%%/cts/patterns.py
-%%PYTHON_SITELIBDIR%%/cts/patterns.pyc
-%%PYTHON_SITELIBDIR%%/cts/patterns.pyo
 %%PYTHON_SITELIBDIR%%/cts/remote.py
-%%PYTHON_SITELIBDIR%%/cts/remote.pyc
-%%PYTHON_SITELIBDIR%%/cts/remote.pyo
 %%PYTHON_SITELIBDIR%%/cts/watcher.py
-%%PYTHON_SITELIBDIR%%/cts/watcher.pyc
-%%PYTHON_SITELIBDIR%%/cts/watcher.pyo
+libdata/pkgconfig/libpacemaker.pc
 libdata/pkgconfig/pacemaker-cib.pc
 libdata/pkgconfig/pacemaker-cluster.pc
 libdata/pkgconfig/pacemaker-fencing.pc
 libdata/pkgconfig/pacemaker-lrmd.pc
-libdata/pkgconfig/pacemaker-pengine.pc
+libdata/pkgconfig/pacemaker-pe_rules.pc
+libdata/pkgconfig/pacemaker-pe_status.pc
+libdata/pkgconfig/pacemaker-schemas.pc
 libdata/pkgconfig/pacemaker-service.pc
 libdata/pkgconfig/pacemaker.pc
 libexec/pacemaker/attrd
@@ -149,6 +150,7 @@ libexec/pacemaker/stonithd
 %%MANPAGES%%man/man7/ocf_pacemaker_ClusterMon.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_Dummy.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_HealthCPU.7.gz
+%%MANPAGES%%man/man7/ocf_pacemaker_HealthIOWait.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_HealthSMART.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_Stateful.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_SysInfo.7.gz
@@ -174,6 +176,7 @@ libexec/pacemaker/stonithd
 %%MANPAGES%%man/man8/crm_node.8.gz
 %%MANPAGES%%man/man8/crm_report.8.gz
 %%MANPAGES%%man/man8/crm_resource.8.gz
+%%MANPAGES%%man/man8/crm_rule.8.gz
 %%MANPAGES%%man/man8/crm_shadow.8.gz
 %%MANPAGES%%man/man8/crm_simulate.8.gz
 %%MANPAGES%%man/man8/crm_standby.8.gz
@@ -196,6 +199,7 @@ sbin/crm_mon
 sbin/crm_node
 sbin/crm_report
 sbin/crm_resource
+sbin/crm_rule
 sbin/crm_shadow
 sbin/crm_simulate
 sbin/crm_standby
@@ -226,9 +230,22 @@ sbin/stonith_admin
 %%DATADIR%%/alerts/alert_file.sh.sample
 %%DATADIR%%/alerts/alert_smtp.sh.sample
 %%DATADIR%%/alerts/alert_snmp.sh.sample
+%%DATADIR%%/api/api-result-1.0.rng
+%%DATADIR%%/api/api-result-1.1.rng
+%%DATADIR%%/api/api-result-2.0.rng
+%%DATADIR%%/api/api-result-next.rng
+%%DATADIR%%/api/api-result.rng
+%%DATADIR%%/api/command-output-1.0.rng
+%%DATADIR%%/api/crm_mon-2.0.rng
+%%DATADIR%%/api/fence-event-2.0.rng
+%%DATADIR%%/api/item-1.1.rng
+%%DATADIR%%/api/status-2.0.rng
+%%DATADIR%%/api/stonith_admin-1.0.rng
+%%DATADIR%%/api/stonith_admin-1.1.rng
+%%DATADIR%%/api/stonith_admin-2.0.rng
+%%DATADIR%%/api/version-2.0.rng
 %%DATADIR%%/cib-1.0.rng
 %%DATADIR%%/cib-1.2.rng
-%%DATADIR%%/cibtr-2.rng
 %%DATADIR%%/constraints-1.0.rng
 %%DATADIR%%/constraints-1.2.rng
 %%DATADIR%%/constraints-2.1.rng
@@ -267,6 +284,8 @@ sbin/stonith_admin
 %%DATADIR%%/pacemaker-2.8.rng
 %%DATADIR%%/pacemaker-2.9.rng
 %%DATADIR%%/pacemaker-3.0.rng
+%%DATADIR%%/pacemaker-3.1.rng
+%%DATADIR%%/pacemaker-3.2.rng
 %%DATADIR%%/pacemaker-next.rng
 %%DATADIR%%/pacemaker.rng
 %%DATADIR%%/report.collector
@@ -279,15 +298,21 @@ sbin/stonith_admin
 %%DATADIR%%/resources-2.8.rng
 %%DATADIR%%/resources-2.9.rng
 %%DATADIR%%/resources-3.0.rng
+%%DATADIR%%/resources-3.1.rng
+%%DATADIR%%/resources-3.2.rng
 %%DATADIR%%/rule-2.9.rng
 %%DATADIR%%/rule.rng
 %%DATADIR%%/score.rng
 %%DATADIR%%/status-1.0.rng
 %%DATADIR%%/tags-1.3.rng
 %%DATADIR%%/tests/README.md
+%%DATADIR%%/tests/cli/crm_diff_new.xml
+%%DATADIR%%/tests/cli/crm_diff_old.xml
 %%DATADIR%%/tests/cli/regression.acls.exp
 %%DATADIR%%/tests/cli/regression.dates.exp
+%%DATADIR%%/tests/cli/regression.rules.exp
 %%DATADIR%%/tests/cli/regression.tools.exp
+%%DATADIR%%/tests/cli/regression.upgrade.exp
 %%DATADIR%%/tests/cli/regression.validity.exp
 %%DATADIR%%/tests/cts-cli
 %%DATADIR%%/tests/cts-coverage
@@ -301,7 +326,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/cts/benchmark/clubench
 %%DATADIR%%/tests/cts/benchmark/control
 %%DATADIR%%/tests/cts/cts
-%%DATADIR%%/tests/cts/cts.supp
+%%DATADIR%%/tests/cts/cts.conf
 %%DATADIR%%/tests/cts/fence_dummy
 %%DATADIR%%/tests/cts/lxc_autogen.sh
 %%DATADIR%%/tests/cts/pacemaker-cts-dummyd
@@ -436,6 +461,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/a-promote-then-b-migrate.scores
 %%DATADIR%%/tests/scheduler/a-promote-then-b-migrate.summary
 %%DATADIR%%/tests/scheduler/a-promote-then-b-migrate.xml
+%%DATADIR%%/tests/scheduler/anon-instance-pending.dot
+%%DATADIR%%/tests/scheduler/anon-instance-pending.exp
+%%DATADIR%%/tests/scheduler/anon-instance-pending.scores
+%%DATADIR%%/tests/scheduler/anon-instance-pending.summary
+%%DATADIR%%/tests/scheduler/anon-instance-pending.xml
 %%DATADIR%%/tests/scheduler/anti-colocation-master.dot
 %%DATADIR%%/tests/scheduler/anti-colocation-master.exp
 %%DATADIR%%/tests/scheduler/anti-colocation-master.scores
@@ -461,6 +491,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/asymmetrical-order-move.scores
 %%DATADIR%%/tests/scheduler/asymmetrical-order-move.summary
 %%DATADIR%%/tests/scheduler/asymmetrical-order-move.xml
+%%DATADIR%%/tests/scheduler/asymmetrical-order-restart.dot
+%%DATADIR%%/tests/scheduler/asymmetrical-order-restart.exp
+%%DATADIR%%/tests/scheduler/asymmetrical-order-restart.scores
+%%DATADIR%%/tests/scheduler/asymmetrical-order-restart.summary
+%%DATADIR%%/tests/scheduler/asymmetrical-order-restart.xml
 %%DATADIR%%/tests/scheduler/attrs1.dot
 %%DATADIR%%/tests/scheduler/attrs1.exp
 %%DATADIR%%/tests/scheduler/attrs1.scores
@@ -1091,6 +1126,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/clone-require-all-no-interleave-3.scores
 %%DATADIR%%/tests/scheduler/clone-require-all-no-interleave-3.summary
 %%DATADIR%%/tests/scheduler/clone-require-all-no-interleave-3.xml
+%%DATADIR%%/tests/scheduler/clone-requires-quorum-recovery.dot
+%%DATADIR%%/tests/scheduler/clone-requires-quorum-recovery.exp
+%%DATADIR%%/tests/scheduler/clone-requires-quorum-recovery.scores
+%%DATADIR%%/tests/scheduler/clone-requires-quorum-recovery.summary
+%%DATADIR%%/tests/scheduler/clone-requires-quorum-recovery.xml
+%%DATADIR%%/tests/scheduler/clone-requires-quorum.dot
+%%DATADIR%%/tests/scheduler/clone-requires-quorum.exp
+%%DATADIR%%/tests/scheduler/clone-requires-quorum.scores
+%%DATADIR%%/tests/scheduler/clone-requires-quorum.summary
+%%DATADIR%%/tests/scheduler/clone-requires-quorum.xml
 %%DATADIR%%/tests/scheduler/clone_min_interleave_start_one.dot
 %%DATADIR%%/tests/scheduler/clone_min_interleave_start_one.exp
 %%DATADIR%%/tests/scheduler/clone_min_interleave_start_one.scores
@@ -1341,6 +1386,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/date-3.scores
 %%DATADIR%%/tests/scheduler/date-3.summary
 %%DATADIR%%/tests/scheduler/date-3.xml
+%%DATADIR%%/tests/scheduler/dc-fence-ordering.dot
+%%DATADIR%%/tests/scheduler/dc-fence-ordering.exp
+%%DATADIR%%/tests/scheduler/dc-fence-ordering.scores
+%%DATADIR%%/tests/scheduler/dc-fence-ordering.summary
+%%DATADIR%%/tests/scheduler/dc-fence-ordering.xml
 %%DATADIR%%/tests/scheduler/enforce-colo1.dot
 %%DATADIR%%/tests/scheduler/enforce-colo1.exp
 %%DATADIR%%/tests/scheduler/enforce-colo1.scores
@@ -1371,6 +1421,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/failed-demote-recovery.scores
 %%DATADIR%%/tests/scheduler/failed-demote-recovery.summary
 %%DATADIR%%/tests/scheduler/failed-demote-recovery.xml
+%%DATADIR%%/tests/scheduler/force-anon-clone-max.dot
+%%DATADIR%%/tests/scheduler/force-anon-clone-max.exp
+%%DATADIR%%/tests/scheduler/force-anon-clone-max.scores
+%%DATADIR%%/tests/scheduler/force-anon-clone-max.summary
+%%DATADIR%%/tests/scheduler/force-anon-clone-max.xml
 %%DATADIR%%/tests/scheduler/group-dependents.dot
 %%DATADIR%%/tests/scheduler/group-dependents.exp
 %%DATADIR%%/tests/scheduler/group-dependents.scores
@@ -1381,6 +1436,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/group-fail.scores
 %%DATADIR%%/tests/scheduler/group-fail.summary
 %%DATADIR%%/tests/scheduler/group-fail.xml
+%%DATADIR%%/tests/scheduler/group-stop-ordering.dot
+%%DATADIR%%/tests/scheduler/group-stop-ordering.exp
+%%DATADIR%%/tests/scheduler/group-stop-ordering.scores
+%%DATADIR%%/tests/scheduler/group-stop-ordering.summary
+%%DATADIR%%/tests/scheduler/group-stop-ordering.xml
 %%DATADIR%%/tests/scheduler/group-unmanaged-stopped.dot
 %%DATADIR%%/tests/scheduler/group-unmanaged-stopped.exp
 %%DATADIR%%/tests/scheduler/group-unmanaged-stopped.scores
@@ -1461,6 +1521,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/group9.scores
 %%DATADIR%%/tests/scheduler/group9.summary
 %%DATADIR%%/tests/scheduler/group9.xml
+%%DATADIR%%/tests/scheduler/guest-host-not-fenceable.dot
+%%DATADIR%%/tests/scheduler/guest-host-not-fenceable.exp
+%%DATADIR%%/tests/scheduler/guest-host-not-fenceable.scores
+%%DATADIR%%/tests/scheduler/guest-host-not-fenceable.summary
+%%DATADIR%%/tests/scheduler/guest-host-not-fenceable.xml
+%%DATADIR%%/tests/scheduler/guest-node-cleanup.dot
+%%DATADIR%%/tests/scheduler/guest-node-cleanup.exp
+%%DATADIR%%/tests/scheduler/guest-node-cleanup.scores
+%%DATADIR%%/tests/scheduler/guest-node-cleanup.summary
+%%DATADIR%%/tests/scheduler/guest-node-cleanup.xml
 %%DATADIR%%/tests/scheduler/guest-node-host-dies.dot
 %%DATADIR%%/tests/scheduler/guest-node-host-dies.exp
 %%DATADIR%%/tests/scheduler/guest-node-host-dies.scores
@@ -1626,6 +1696,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/load-stopped-loop.scores
 %%DATADIR%%/tests/scheduler/load-stopped-loop.summary
 %%DATADIR%%/tests/scheduler/load-stopped-loop.xml
+%%DATADIR%%/tests/scheduler/location-date-rules-1.dot
+%%DATADIR%%/tests/scheduler/location-date-rules-1.exp
+%%DATADIR%%/tests/scheduler/location-date-rules-1.scores
+%%DATADIR%%/tests/scheduler/location-date-rules-1.summary
+%%DATADIR%%/tests/scheduler/location-date-rules-1.xml
+%%DATADIR%%/tests/scheduler/location-date-rules-2.dot
+%%DATADIR%%/tests/scheduler/location-date-rules-2.exp
+%%DATADIR%%/tests/scheduler/location-date-rules-2.scores
+%%DATADIR%%/tests/scheduler/location-date-rules-2.summary
+%%DATADIR%%/tests/scheduler/location-date-rules-2.xml
 %%DATADIR%%/tests/scheduler/location-sets-templates.dot
 %%DATADIR%%/tests/scheduler/location-sets-templates.exp
 %%DATADIR%%/tests/scheduler/location-sets-templates.scores
@@ -1986,6 +2066,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/migration-behind-migrating-remote.scores
 %%DATADIR%%/tests/scheduler/migration-behind-migrating-remote.summary
 %%DATADIR%%/tests/scheduler/migration-behind-migrating-remote.xml
+%%DATADIR%%/tests/scheduler/migration-ping-pong.dot
+%%DATADIR%%/tests/scheduler/migration-ping-pong.exp
+%%DATADIR%%/tests/scheduler/migration-ping-pong.scores
+%%DATADIR%%/tests/scheduler/migration-ping-pong.summary
+%%DATADIR%%/tests/scheduler/migration-ping-pong.xml
 %%DATADIR%%/tests/scheduler/minimal.dot
 %%DATADIR%%/tests/scheduler/minimal.exp
 %%DATADIR%%/tests/scheduler/minimal.scores
@@ -2041,6 +2126,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/multiple-monitor-one-failed.scores
 %%DATADIR%%/tests/scheduler/multiple-monitor-one-failed.summary
 %%DATADIR%%/tests/scheduler/multiple-monitor-one-failed.xml
+%%DATADIR%%/tests/scheduler/multiply-active-stonith.dot
+%%DATADIR%%/tests/scheduler/multiply-active-stonith.exp
+%%DATADIR%%/tests/scheduler/multiply-active-stonith.scores
+%%DATADIR%%/tests/scheduler/multiply-active-stonith.summary
+%%DATADIR%%/tests/scheduler/multiply-active-stonith.xml
+%%DATADIR%%/tests/scheduler/nested-remote-recovery.dot
+%%DATADIR%%/tests/scheduler/nested-remote-recovery.exp
+%%DATADIR%%/tests/scheduler/nested-remote-recovery.scores
+%%DATADIR%%/tests/scheduler/nested-remote-recovery.summary
+%%DATADIR%%/tests/scheduler/nested-remote-recovery.xml
 %%DATADIR%%/tests/scheduler/node-maintenance-1.dot
 %%DATADIR%%/tests/scheduler/node-maintenance-1.exp
 %%DATADIR%%/tests/scheduler/node-maintenance-1.scores
@@ -2091,6 +2186,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/notify-3.scores
 %%DATADIR%%/tests/scheduler/notify-3.summary
 %%DATADIR%%/tests/scheduler/notify-3.xml
+%%DATADIR%%/tests/scheduler/notify-behind-stopping-remote.dot
+%%DATADIR%%/tests/scheduler/notify-behind-stopping-remote.exp
+%%DATADIR%%/tests/scheduler/notify-behind-stopping-remote.scores
+%%DATADIR%%/tests/scheduler/notify-behind-stopping-remote.summary
+%%DATADIR%%/tests/scheduler/notify-behind-stopping-remote.xml
 %%DATADIR%%/tests/scheduler/novell-239079.dot
 %%DATADIR%%/tests/scheduler/novell-239079.exp
 %%DATADIR%%/tests/scheduler/novell-239079.scores
@@ -2126,6 +2226,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/novell-252693.scores
 %%DATADIR%%/tests/scheduler/novell-252693.summary
 %%DATADIR%%/tests/scheduler/novell-252693.xml
+%%DATADIR%%/tests/scheduler/nvpair-date-rules-1.dot
+%%DATADIR%%/tests/scheduler/nvpair-date-rules-1.exp
+%%DATADIR%%/tests/scheduler/nvpair-date-rules-1.scores
+%%DATADIR%%/tests/scheduler/nvpair-date-rules-1.summary
+%%DATADIR%%/tests/scheduler/nvpair-date-rules-1.xml
 %%DATADIR%%/tests/scheduler/nvpair-id-ref.dot
 %%DATADIR%%/tests/scheduler/nvpair-id-ref.exp
 %%DATADIR%%/tests/scheduler/nvpair-id-ref.scores
@@ -2196,6 +2301,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/order-expired-failure.scores
 %%DATADIR%%/tests/scheduler/order-expired-failure.summary
 %%DATADIR%%/tests/scheduler/order-expired-failure.xml
+%%DATADIR%%/tests/scheduler/order-first-probes.dot
+%%DATADIR%%/tests/scheduler/order-first-probes.exp
+%%DATADIR%%/tests/scheduler/order-first-probes.scores
+%%DATADIR%%/tests/scheduler/order-first-probes.summary
+%%DATADIR%%/tests/scheduler/order-first-probes.xml
 %%DATADIR%%/tests/scheduler/order-mandatory.dot
 %%DATADIR%%/tests/scheduler/order-mandatory.exp
 %%DATADIR%%/tests/scheduler/order-mandatory.scores
@@ -2712,6 +2822,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/restart-versioned.scores
 %%DATADIR%%/tests/scheduler/restart-versioned.summary
 %%DATADIR%%/tests/scheduler/restart-versioned.xml
+%%DATADIR%%/tests/scheduler/route-remote-notify.dot
+%%DATADIR%%/tests/scheduler/route-remote-notify.exp
+%%DATADIR%%/tests/scheduler/route-remote-notify.scores
+%%DATADIR%%/tests/scheduler/route-remote-notify.summary
+%%DATADIR%%/tests/scheduler/route-remote-notify.xml
 %%DATADIR%%/tests/scheduler/rsc-discovery-per-node.dot
 %%DATADIR%%/tests/scheduler/rsc-discovery-per-node.exp
 %%DATADIR%%/tests/scheduler/rsc-discovery-per-node.scores
@@ -3967,12 +4082,18 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/whitebox-unexpectedly-running.scores
 %%DATADIR%%/tests/scheduler/whitebox-unexpectedly-running.summary
 %%DATADIR%%/tests/scheduler/whitebox-unexpectedly-running.xml
+%%DATADIR%%/tests/scheduler/year-2038.dot
+%%DATADIR%%/tests/scheduler/year-2038.exp
+%%DATADIR%%/tests/scheduler/year-2038.scores
+%%DATADIR%%/tests/scheduler/year-2038.summary
+%%DATADIR%%/tests/scheduler/year-2038.xml
 %%DATADIR%%/tests/valgrind-pcmk.suppressions
 %%DATADIR%%/upgrade-1.3.xsl
+%%DATADIR%%/upgrade-2.10-enter.xsl
+%%DATADIR%%/upgrade-2.10-leave.xsl
 %%DATADIR%%/upgrade-2.10.xsl
-%%DATADIR%%/upgrade-detail.xsl
 %%DATADIR%%/versions.rng
-share/snmp/mibs/PCMK-MIB.txt
+%%SNMP%%share/snmp/mibs/PCMK-MIB.txt
 @dir %%ETCDIR%%
 @dir(,haclient,770) /var/lib/pacemaker/blackbox
 @dir(,haclient,770) /var/lib/pacemaker/cib