Attachment #182899 for bug #219544

Lines 2-9 Link Here

(-)Makefile (-11 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pacemaker	4	PORTNAME= pacemaker
5	PORTVERSION= 1.1.14	5	PORTVERSION= 1.1.16
6	PORTREVISION= 2
7	DISTVERSIONPREFIX= Pacemaker-	6	DISTVERSIONPREFIX= Pacemaker-
8	CATEGORIES= net	7	CATEGORIES= net
9		8
Lines 15-21 Link Here
15	BROKEN_powerpc64= Does not build	14	BROKEN_powerpc64= Does not build
16		15
17	BUILD_DEPENDS= bash:shells/bash \	16	BUILD_DEPENDS= bash:shells/bash \
18	corosync:net/corosync	17	corosync:net/corosync \
		18	getopt>=0:misc/getopt
19	LIB_DEPENDS= libgnutls.so:security/gnutls \	19	LIB_DEPENDS= libgnutls.so:security/gnutls \
20	libltdl.so:devel/libltdl \	20	libltdl.so:devel/libltdl \
21	libqb.so:devel/libqb \	21	libqb.so:devel/libqb \
Lines 23-29 Link Here
23	libxml2.so:textproc/libxml2 \	23	libxml2.so:textproc/libxml2 \
24	libxslt.so:textproc/libxslt	24	libxslt.so:textproc/libxslt
25	RUN_DEPENDS= bash:shells/bash \	25	RUN_DEPENDS= bash:shells/bash \
26	corosync:net/corosync	26	corosync:net/corosync \
		27	getopt>=0:misc/getopt \
		28	ocf-tester:net-mgmt/resource-agents
27		29
28	CONFLICTS= heartbeat-[0-9]*	30	CONFLICTS= heartbeat-[0-9]*
29		31
Lines 34-49 Link Here
34	GH_ACCOUNT= ClusterLabs	36	GH_ACCOUNT= ClusterLabs
35		37
36	USES= autoreconf gmake libtool pathfix pkgconfig python shebangfix	38	USES= autoreconf gmake libtool pathfix pkgconfig python shebangfix
37	USE_GCC= yes
38	USE_GNOME= glib20	39	USE_GNOME= glib20
39	USE_LDCONFIG= yes	40	USE_LDCONFIG= yes
40	USE_RC_SUBR= ${PORTNAME}	41	USE_RC_SUBR= ${PORTNAME}
41	GNU_CONFIGURE= yes	42	GNU_CONFIGURE= yes
42	CONFIGURE_ARGS= --disable-fatal-warnings \	43	CONFIGURE_ARGS= --disable-fatal-warnings \
		44	--disable-hardening \
43	--with-corosync \	45	--with-corosync \
44	--without-heartbeat	46	--without-heartbeat
45	INSTALL_TARGET= install-strip	47	INSTALL_TARGET= install-strip
46		48
		49	PATHFIX_MAKEFILEIN= Makefile.am
		50
47	SHEBANG_LANG= sh	51	SHEBANG_LANG= sh
48	sh_OLD_CMD= ${SH}	52	sh_OLD_CMD= ${SH}
49	sh_CMD= ${LOCALBASE}/bin/bash	53	sh_CMD= ${LOCALBASE}/bin/bash
Lines 54-60 Link Here
54	tools/* \	58	tools/* \
55	xml/*	59	xml/*
56		60
57	REPLACE_ARGS= -e 's,/usr/lib/ocf,${PREFIX}/etc/ocf,'	61	REPLACE_ARGS_OCF= -e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,'
		62	REPLACE_ARGS_GETOPT= -e 's,getopt,${LOCALBASE}/bin/getopt,'
58		63
59	OPTIONS_DEFINE= DBUS DOCS MANPAGES SNMP	64	OPTIONS_DEFINE= DBUS DOCS MANPAGES SNMP
60	OPTIONS_DEFAULT=MANPAGES	65	OPTIONS_DEFAULT=MANPAGES
Lines 73-82 Link Here
73	SNMP_CONFIGURE_WITH= snmp	78	SNMP_CONFIGURE_WITH= snmp
74		79
75	post-patch:	80	post-patch:
76	@${REINPLACE_CMD} ${REPLACE_ARGS} ${WRKSRC}/configure.ac	81	@${REINPLACE_CMD} ${REPLACE_ARGS_OCF} ${WRKSRC}/configure.ac
		82	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_failcount
		83	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_master
		84	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_report.in
		85	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_standby
77		86
78	post-install:
79	${RM} ${STAGEDIR}${PREFIX}/etc/rc.d/pacemaker
80	${RM} ${STAGEDIR}${PREFIX}/etc/rc.d/pacemaker_remote
81
82	.include <bsd.port.mk>	87	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1464782071	1	TIMESTAMP = 1495733591
2	SHA256 (ClusterLabs-pacemaker-Pacemaker-1.1.14_GH0.tar.gz) = 2f73043a5de5e66a47462d37cd68c4c6861f71a03c0ea02eb4ae2b1a550cd7b0	2	SHA256 (ClusterLabs-pacemaker-Pacemaker-1.1.16_GH0.tar.gz) = 6b4b5c3f8571f57e46246a09c59b2ecbf59591b610bb3c9515e9ca84c834c75a
3	SIZE (ClusterLabs-pacemaker-Pacemaker-1.1.14_GH0.tar.gz) = 4729808	3	SIZE (ClusterLabs-pacemaker-Pacemaker-1.1.16_GH0.tar.gz) = 4897770

Lines 1-11 Link Here

(-)files/patch-Makefile.common (-11 lines)
1	--- Makefile.common.orig 2016-01-14 21:43:08 UTC
2	+++ Makefile.common
3	@@ -38,8 +38,6 @@ endif
4
5	%.8: % $(MAN8DEPS)
6	chmod a+x $(abs_builddir)/$<
7	- $(PCMK_V) PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --help
8	- $(PCMK_V) PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --version
9	$(AM_V_MAN)PATH=$(abs_builddir):$$PATH $(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(abs_builddir)/$<
10
11	%.xml: %




sysctl which defaults to 2M.  This patch simply lowers the max message size
in pengine from 5M to 1M to work out of the box without requiring any tuning.

--- crmd/pengine.c.orig	2016-11-30 19:51:58 UTC
+++ crmd/pengine.c
@@ -165,7 +165,7 @@ do_pe_control(long long action,
 
             pe_subsystem->source =
                 mainloop_add_ipc_client(CRM_SYSTEM_PENGINE, G_PRIORITY_DEFAULT,
-                                        5 * 1024 * 1024 /* 5MB */ , NULL, &pe_callbacks);
+                                        1024 * 1024 /* 1MB */ , NULL, &pe_callbacks);
 
             if (pe_subsystem->source == NULL) {
                 crm_warn("Setup of client connection failed, not adding channel to mainloop");

Lines 1-11 Link Here

(-)files/patch-crmd_throttle.c (-11 lines)
1	--- crmd/throttle.c.orig 2016-01-14 21:43:08 UTC
2	+++ crmd/throttle.c
3	@@ -389,7 +389,7 @@ throttle_mode(void)
4	unsigned int blocked = 0;
5	enum throttle_state_e mode = throttle_none;
6
7	-#ifdef ON_SOLARIS
8	+#if defined(ON_BSD) \|\| defined(ON_SOLARIS)
9	return throttle_none;
10	#endif
11

Lines 1-10 Link Here

(-)files/patch-extra_resources_ping (-10 lines)
1	--- extra/resources/ping.orig 2016-03-21 16:27:02 UTC
2	+++ extra/resources/ping
3	@@ -262,6 +262,7 @@ ping_check() {
4	case `uname` in
5	Linux) p_args="-n -q -W $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts";;
6	Darwin) p_args="-n -q -t $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts -o";;
7	+ FreeBSD) p_args="-n -q -t $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts -o";;
8	*) ocf_log err "Unknown host type: `uname`"; exit $OCF_ERR_INSTALLED;;
9	esac
10




--- lib/common/utils.c.orig	2016-01-14 21:43:08 UTC
+++ lib/common/utils.c
@@ -2270,7 +2270,8 @@ find_library_function(void **handle, con
     }
 
     a_function = dlsym(*handle, fn);
-    if ((error = dlerror()) != NULL) {
+    if (a_function == NULL) {
+        error = dlerror();
         crm_err("%sCould not find %s in %s: %s", fatal ? "Fatal: " : "", fn, lib, error);
         if (fatal) {
             crm_exit(DAEMON_RESPAWN_STOP);




--- lib/services/services_linux.c.orig	2016-01-14 21:43:08 UTC
+++ lib/services/services_linux.c
@@ -457,13 +457,19 @@ action_launch_child(svc_action_t *op)
     _exit(op->rc);
 }
 
+#ifndef HAVE_SYS_SIGNALFD_H
+static int sigchld_pipe[2];
+
 static void
-action_synced_wait(svc_action_t * op, sigset_t mask)
+sigchld_handler()
 {
+    write(sigchld_pipe[1], "", 1);
+}
+#endif
 
-#ifndef HAVE_SYS_SIGNALFD_H
-    CRM_ASSERT(FALSE);
-#else
+static void
+action_synced_wait(svc_action_t * op, sigset_t *mask)
+{
     int status = 0;
     int timeout = op->timeout;
     int sfd = -1;
@@ -471,10 +477,14 @@ action_synced_wait(svc_action_t * op, si
     struct pollfd fds[3];
     int wait_rc = 0;
 
-    sfd = signalfd(-1, &mask, SFD_NONBLOCK);
+#ifdef HAVE_SYS_SIGNALFD_H
+    sfd = signalfd(-1, mask, SFD_NONBLOCK);
     if (sfd < 0) {
         crm_perror(LOG_ERR, "signalfd() failed");
     }
+#else
+    sfd = sigchld_pipe[0];
+#endif
 
     fds[0].fd = op->opaque->stdout_fd;
     fds[0].events = POLLIN;
@@ -503,6 +513,7 @@ action_synced_wait(svc_action_t * op, si
             }
 
             if (fds[2].revents & POLLIN) {
+#ifdef HAVE_SYS_SIGNALFD_H
                 struct signalfd_siginfo fdsi;
                 ssize_t s;
 
@@ -511,6 +522,12 @@ action_synced_wait(svc_action_t * op, si
                     crm_perror(LOG_ERR, "Read from signal fd %d failed", sfd);
 
                 } else if (fdsi.ssi_signo == SIGCHLD) {
+#else
+                if (1) {
+                    /* Clear out the sigchld pipe. */
+                    char ch;
+                    while (read(sfd, &ch, 1) == 1);
+#endif
                     wait_rc = waitpid(op->pid, &status, WNOHANG);
 
                     if (wait_rc < 0){
@@ -583,10 +600,10 @@ action_synced_wait(svc_action_t * op, si
 
     close(op->opaque->stdout_fd);
     close(op->opaque->stderr_fd);
-    close(sfd);
 
+#ifdef HAVE_SYS_SIGNALFD_H
+    close(sfd);
 #endif
-
 }
 
 /* For an asynchronous 'op', returns FALSE if 'op' should be free'd by the caller */
@@ -596,9 +613,30 @@ services_os_action_execute(svc_action_t 
 {
     int stdout_fd[2];
     int stderr_fd[2];
+    struct stat st;
+    sigset_t *pmask;
+
+#ifdef HAVE_SYS_SIGNALFD_H
     sigset_t mask;
     sigset_t old_mask;
-    struct stat st;
+#define sigchld_cleanup() {                                                   \
+    if (sigismember(&old_mask, SIGCHLD) == 0) {                               \
+        if (sigprocmask(SIG_UNBLOCK, &mask, NULL) < 0) {                      \
+            crm_perror(LOG_ERR, "sigprocmask() failed to unblock sigchld");   \
+        }                                                                     \
+    }                                                                         \
+}
+#else
+    struct sigaction sa;
+    struct sigaction old_sa;
+#define sigchld_cleanup() {                                                   \
+    if (sigaction(SIGCHLD, &old_sa, NULL) < 0) {                              \
+        crm_perror(LOG_ERR, "sigaction() failed to remove sigchld handler");  \
+    }                                                                         \
+    close(sigchld_pipe[0]);                                                   \
+    close(sigchld_pipe[1]);                                                   \
+}
+#endif
 
     if (pipe(stdout_fd) < 0) {
         crm_err("pipe() failed");
@@ -620,13 +658,33 @@ services_os_action_execute(svc_action_t 
     }
 
     if (synchronous) {
+#ifdef HAVE_SYS_SIGNALFD_H
         sigemptyset(&mask);
         sigaddset(&mask, SIGCHLD);
         sigemptyset(&old_mask);
 
         if (sigprocmask(SIG_BLOCK, &mask, &old_mask) < 0) {
-            crm_perror(LOG_ERR, "sigprocmask() failed");
+            crm_perror(LOG_ERR, "sigprocmask() failed to block sigchld");
+        }
+
+        pmask = &mask;
+#else
+        if(pipe(sigchld_pipe) == -1) {
+            crm_perror(LOG_ERR, "pipe() failed");
+        }
+
+        set_fd_opts(sigchld_pipe[0], O_NONBLOCK);
+        set_fd_opts(sigchld_pipe[1], O_NONBLOCK);
+
+        sa.sa_handler = sigchld_handler;
+        sa.sa_flags = 0;
+        sigemptyset(&sa.sa_mask);
+        if (sigaction(SIGCHLD, &sa, &old_sa) < 0) {
+            crm_perror(LOG_ERR, "sigaction() failed to set sigchld handler");
         }
+
+        pmask = NULL;
+#endif
     }
 
     op->pid = fork();
@@ -645,6 +703,8 @@ services_os_action_execute(svc_action_t 
                 if (!synchronous) {
                     return operation_finalize(op);
                 }
+
+                sigchld_cleanup();
                 return FALSE;
             }
         case 0:                /* Child */
@@ -663,6 +723,10 @@ services_os_action_execute(svc_action_t 
                 close(stderr_fd[1]);
             }
 
+            if (synchronous) {
+                sigchld_cleanup();
+            }
+
             action_launch_child(op);
     }
 
@@ -677,14 +741,8 @@ services_os_action_execute(svc_action_t 
     set_fd_opts(op->opaque->stderr_fd, O_NONBLOCK);
 
     if (synchronous) {
-        action_synced_wait(op, mask);
-
-        if (sigismember(&old_mask, SIGCHLD) == 0) {
-            if (sigprocmask(SIG_UNBLOCK, &mask, NULL) < 0) {
-                crm_perror(LOG_ERR, "sigprocmask() to unblocked failed");
-            }
-        }
-
+        action_synced_wait(op, pmask);
+        sigchld_cleanup();
     } else {
 
         crm_trace("Async waiting for %d - %s", op->pid, op->opaque->exec);

Line 0 Link Here

(-)files/patch-lrmd_Makefile.am (+11 lines)
	1	--- lrmd/Makefile.am.orig 2016-12-05 00:29:14 UTC
	2	+++ lrmd/Makefile.am
	3	@@ -25,8 +25,6 @@ lrmdlib_PROGRAMS += lrmd_test
	4	testdir = $(datadir)/$(PACKAGE)/tests/lrmd
	5	test_SCRIPTS = regression.py
	6
	7	-initdir = $(INITDIR)
	8	-init_SCRIPTS = pacemaker_remote
	9	sbin_PROGRAMS = pacemaker_remoted
	10
	11	if BUILD_SYSTEMD

Line 0 Link Here

(-)files/patch-mcp_Makefile.am (+11 lines)
	1	--- mcp/Makefile.am.orig 2016-04-18 16:07:35 UTC
	2	+++ mcp/Makefile.am
	3	@@ -19,8 +19,6 @@ include $(top_srcdir)/Makefile.common
	4
	5	if BUILD_CS_SUPPORT
	6
	7	-initdir = $(INITDIR)
	8	-init_SCRIPTS = pacemaker
	9	sbin_PROGRAMS = pacemakerd
	10
	11	if BUILD_SYSTEMD




etc/logrotate.d/pacemaker
lib/ocf/resource.d/.isolation/docker-wrapper
lib/ocf/resource.d/pacemaker/ClusterMon
lib/ocf/resource.d/pacemaker/Dummy
lib/ocf/resource.d/pacemaker/HealthCPU
lib/ocf/resource.d/pacemaker/HealthSMART
lib/ocf/resource.d/pacemaker/Stateful
lib/ocf/resource.d/pacemaker/SysInfo
lib/ocf/resource.d/pacemaker/SystemHealth
lib/ocf/resource.d/pacemaker/attribute
lib/ocf/resource.d/pacemaker/controld
lib/ocf/resource.d/pacemaker/o2cb
lib/ocf/resource.d/pacemaker/ping
lib/ocf/resource.d/pacemaker/pingd
lib/ocf/resource.d/pacemaker/remote
include/pacemaker/crm/attrd.h
include/pacemaker/crm/cib.h
include/pacemaker/crm/cib/util.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/rules.h
include/pacemaker/crm/pengine/status.h
include/pacemaker/crm/services.h

lib/libcib.a
lib/libcib.so
lib/libcib.so.4
lib/libcib.so.4.1.2
lib/libcrmcluster.a
lib/libcrmcluster.so
lib/libcrmcluster.so.4
lib/libcrmcluster.so.4.2.1
lib/libcrmcommon.a
lib/libcrmcommon.so
lib/libcrmcommon.so.3
lib/libcrmcommon.so.3.6.1
lib/libcrmservice.a
lib/libcrmservice.so
lib/libcrmservice.so.3
lib/libcrmservice.so.3.1.2
lib/liblrmd.a
lib/liblrmd.so
lib/liblrmd.so.1
lib/liblrmd.so.1.3.1
lib/libpe_rules.a
lib/libpe_rules.so
lib/libpe_rules.so.2
lib/libpe_rules.so.2.1.0
lib/libpe_status.a
lib/libpe_status.so
lib/libpe_status.so.10
lib/libpe_status.so.10.2.0
lib/libpengine.a
lib/libpengine.so
lib/libpengine.so.10
lib/libpengine.so.10.2.0
lib/libstonithd.a
lib/libstonithd.so
lib/libstonithd.so.2
lib/libstonithd.so.2.2.2
lib/libtransitioner.a
lib/libtransitioner.so
lib/libtransitioner.so.2
lib/libtransitioner.so.2.0.6
%%PYTHON_SITELIBDIR%%/cts/CIB.py
%%PYTHON_SITELIBDIR%%/cts/CIB.pyc
%%PYTHON_SITELIBDIR%%/cts/CIB.pyo

%%MANPAGES%%man/man7/ocf_pacemaker_Stateful.7.gz
%%MANPAGES%%man/man7/ocf_pacemaker_SysInfo.7.gz
%%MANPAGES%%man/man7/ocf_pacemaker_SystemHealth.7.gz
%%MANPAGES%%man/man7/ocf_pacemaker_attribute.7.gz
%%MANPAGES%%man/man7/ocf_pacemaker_controld.7.gz
%%MANPAGES%%man/man7/ocf_pacemaker_o2cb.7.gz
%%MANPAGES%%man/man7/ocf_pacemaker_ping.7.gz

sbin/pacemaker_remoted
sbin/pacemakerd
sbin/stonith_admin
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README.markdown
%%PORTDOCS%%%%DOCSDIR%%/acls.html
%%PORTDOCS%%%%DOCSDIR%%/acls.txt
%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.html
%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.txt
%%PORTDOCS%%%%DOCSDIR%%/licenses/CC-BY-SA-4.0
%%PORTDOCS%%%%DOCSDIR%%/licenses/GPLv2
%%PORTDOCS%%%%DOCSDIR%%/licenses/LGPLv2.1
%%PORTDOCS%%%%DOCSDIR%%/licenses/RevisedBSD
%%DATADIR%%/acls-1.2.rng
%%DATADIR%%/acls-2.0.rng
%%DATADIR%%/alerts-2.5.rng
%%DATADIR%%/alerts/alert_file.sh.sample
%%DATADIR%%/alerts/alert_smtp.sh.sample
%%DATADIR%%/alerts/alert_snmp.sh.sample
%%DATADIR%%/cib-1.0.rng
%%DATADIR%%/cib-1.2.rng
%%DATADIR%%/constraints-1.0.rng

%%DATADIR%%/constraints-2.1.rng
%%DATADIR%%/constraints-2.2.rng
%%DATADIR%%/constraints-2.3.rng
%%DATADIR%%/constraints-2.6.rng
%%DATADIR%%/constraints-next.rng
%%DATADIR%%/crm-transitional.dtd
%%DATADIR%%/crm.dtd

%%DATADIR%%/pacemaker-2.2.rng
%%DATADIR%%/pacemaker-2.3.rng
%%DATADIR%%/pacemaker-2.4.rng
%%DATADIR%%/pacemaker-2.5.rng
%%DATADIR%%/pacemaker-2.6.rng
%%DATADIR%%/pacemaker-next.rng
%%DATADIR%%/pacemaker.rng
%%DATADIR%%/report.collector

%%DATADIR%%/tests/cli/regression.dates.exp
%%DATADIR%%/tests/cli/regression.sh
%%DATADIR%%/tests/cli/regression.tools.exp
%%DATADIR%%/tests/cli/regression.validity.exp
%%DATADIR%%/tests/coverage.sh
%%DATADIR%%/tests/cts/CTSlab.py
%%DATADIR%%/tests/cts/HBDummy

%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.scores
%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.summary
%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.xml
%%DATADIR%%/tests/pengine/test10/anti-colocation-master.dot
%%DATADIR%%/tests/pengine/test10/anti-colocation-master.exp
%%DATADIR%%/tests/pengine/test10/anti-colocation-master.scores
%%DATADIR%%/tests/pengine/test10/anti-colocation-master.summary
%%DATADIR%%/tests/pengine/test10/anti-colocation-master.xml
%%DATADIR%%/tests/pengine/test10/anti-colocation-order.dot
%%DATADIR%%/tests/pengine/test10/anti-colocation-order.exp
%%DATADIR%%/tests/pengine/test10/anti-colocation-order.scores
%%DATADIR%%/tests/pengine/test10/anti-colocation-order.summary
%%DATADIR%%/tests/pengine/test10/anti-colocation-order.xml
%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.dot
%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.exp
%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.scores
%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.summary
%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.xml
%%DATADIR%%/tests/pengine/test10/asymmetric.dot
%%DATADIR%%/tests/pengine/test10/asymmetric.exp
%%DATADIR%%/tests/pengine/test10/asymmetric.scores
%%DATADIR%%/tests/pengine/test10/asymmetric.summary
%%DATADIR%%/tests/pengine/test10/asymmetric.xml
%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.dot
%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.exp
%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.scores
%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.summary
%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.xml
%%DATADIR%%/tests/pengine/test10/attrs1.dot
%%DATADIR%%/tests/pengine/test10/attrs1.exp
%%DATADIR%%/tests/pengine/test10/attrs1.scores

%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.scores
%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.summary
%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.xml
%%DATADIR%%/tests/pengine/test10/concurrent-fencing.dot
%%DATADIR%%/tests/pengine/test10/concurrent-fencing.exp
%%DATADIR%%/tests/pengine/test10/concurrent-fencing.scores
%%DATADIR%%/tests/pengine/test10/concurrent-fencing.summary
%%DATADIR%%/tests/pengine/test10/concurrent-fencing.xml
%%DATADIR%%/tests/pengine/test10/container-1.dot
%%DATADIR%%/tests/pengine/test10/container-1.exp
%%DATADIR%%/tests/pengine/test10/container-1.scores

%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.scores
%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.summary
%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.xml
%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.dot
%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.exp
%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.scores
%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.summary
%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.xml
%%DATADIR%%/tests/pengine/test10/node-maintenance-1.dot
%%DATADIR%%/tests/pengine/test10/node-maintenance-1.exp
%%DATADIR%%/tests/pengine/test10/node-maintenance-1.scores

%%DATADIR%%/tests/pengine/test10/rsc_dep8.scores
%%DATADIR%%/tests/pengine/test10/rsc_dep8.summary
%%DATADIR%%/tests/pengine/test10/rsc_dep8.xml
%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.dot
%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.exp
%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.scores
%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.summary
%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.xml
%%DATADIR%%/tests/pengine/test10/simple1.dot
%%DATADIR%%/tests/pengine/test10/simple1.exp
%%DATADIR%%/tests/pengine/test10/simple1.scores

%%DATADIR%%/tests/pengine/test10/standby.scores
%%DATADIR%%/tests/pengine/test10/standby.summary
%%DATADIR%%/tests/pengine/test10/standby.xml
%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.dot
%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.exp
%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.scores
%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.summary
%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.xml
%%DATADIR%%/tests/pengine/test10/stonith-0.dot
%%DATADIR%%/tests/pengine/test10/stonith-0.exp
%%DATADIR%%/tests/pengine/test10/stonith-0.scores

%%DATADIR%%/tests/pengine/test10/unrunnable-1.scores
%%DATADIR%%/tests/pengine/test10/unrunnable-1.summary
%%DATADIR%%/tests/pengine/test10/unrunnable-1.xml
%%DATADIR%%/tests/pengine/test10/unrunnable-2.dot
%%DATADIR%%/tests/pengine/test10/unrunnable-2.exp
%%DATADIR%%/tests/pengine/test10/unrunnable-2.scores
%%DATADIR%%/tests/pengine/test10/unrunnable-2.summary
%%DATADIR%%/tests/pengine/test10/unrunnable-2.xml
%%DATADIR%%/tests/pengine/test10/use-after-free-merge.dot
%%DATADIR%%/tests/pengine/test10/use-after-free-merge.exp
%%DATADIR%%/tests/pengine/test10/use-after-free-merge.scores

%%DATADIR%%/tests/pengine/test10/whitebox-move.scores
%%DATADIR%%/tests/pengine/test10/whitebox-move.summary
%%DATADIR%%/tests/pengine/test10/whitebox-move.xml
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.dot
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.exp
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.scores
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.summary
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.xml
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.dot
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.exp
%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.scores

%%DATADIR%%/upgrade06.xsl
%%DATADIR%%/versions.rng
share/snmp/mibs/PCMK-MIB.txt
@dir /usr/local/etc/rc.d
@dir /usr/local/etc
@dir /var/lib/pacemaker/blackbox
@dir /var/lib/pacemaker/cib
@dir /var/lib/pacemaker/cores
@dir /var/lib/pacemaker/pengine
@dir /var/lib/pacemaker
@dir /var/lib

Return to bug 219544

Lines 2-15 Link Here

(-)files/patch-crmd_pengine.c (-4 / +4 lines)
2	sysctl which defaults to 2M. This patch simply lowers the max message size	2	sysctl which defaults to 2M. This patch simply lowers the max message size
3	in pengine from 5M to 1M to work out of the box without requiring any tuning.	3	in pengine from 5M to 1M to work out of the box without requiring any tuning.
4		4
5	--- crmd/pengine.c.orig 2016-01-14 21:43:08 UTC	5	--- crmd/pengine.c.orig 2016-11-30 19:51:58 UTC
6	+++ crmd/pengine.c	6	+++ crmd/pengine.c
7	@@ -163,7 +163,7 @@ do_pe_control(long long action,	7	@@ -165,7 +165,7 @@ do_pe_control(long long action,
8		8
9	pe_subsystem->source =	9	pe_subsystem->source =
10	mainloop_add_ipc_client(CRM_SYSTEM_PENGINE, G_PRIORITY_DEFAULT,	10	mainloop_add_ipc_client(CRM_SYSTEM_PENGINE, G_PRIORITY_DEFAULT,
11	- 5 * 1024 * 1024 /* 5Mb */ , NULL, &pe_callbacks);	11	- 5 * 1024 * 1024 /* 5MB */ , NULL, &pe_callbacks);
12	+ 1024 * 1024 /* 1Mb */ , NULL, &pe_callbacks);	12	+ 1024 * 1024 /* 1MB */ , NULL, &pe_callbacks);
13		13
14	if (pe_subsystem->source == NULL) {	14	if (pe_subsystem->source == NULL) {
15	crm_warn("Setup of client connection failed, not adding channel to mainloop");	15	crm_warn("Setup of client connection failed, not adding channel to mainloop");

Lines 1-12 Link Here

(-)files/patch-lib-common-utils.c (-12 lines)
1	--- lib/common/utils.c.orig 2016-01-14 21:43:08 UTC
2	+++ lib/common/utils.c
3	@@ -2270,7 +2270,8 @@ find_library_function(void **handle, con
4	}
5
6	a_function = dlsym(*handle, fn);
7	- if ((error = dlerror()) != NULL) {
8	+ if (a_function == NULL) {
9	+ error = dlerror();
10	crm_err("%sCould not find %s in %s: %s", fatal ? "Fatal: " : "", fn, lib, error);
11	if (fatal) {
12	crm_exit(DAEMON_RESPAWN_STOP);

Lines 1-180 Link Here

(-)files/patch-lib-services-services_linux.c (-180 lines)
1	--- lib/services/services_linux.c.orig 2016-01-14 21:43:08 UTC
2	+++ lib/services/services_linux.c
3	@@ -457,13 +457,19 @@ action_launch_child(svc_action_t *op)
4	_exit(op->rc);
5	}
6
7	+#ifndef HAVE_SYS_SIGNALFD_H
8	+static int sigchld_pipe[2];
9	+
10	static void
11	-action_synced_wait(svc_action_t * op, sigset_t mask)
12	+sigchld_handler()
13	{
14	+ write(sigchld_pipe[1], "", 1);
15	+}
16	+#endif
17
18	-#ifndef HAVE_SYS_SIGNALFD_H
19	- CRM_ASSERT(FALSE);
20	-#else
21	+static void
22	+action_synced_wait(svc_action_t * op, sigset_t *mask)
23	+{
24	int status = 0;
25	int timeout = op->timeout;
26	int sfd = -1;
27	@@ -471,10 +477,14 @@ action_synced_wait(svc_action_t * op, si
28	struct pollfd fds[3];
29	int wait_rc = 0;
30
31	- sfd = signalfd(-1, &mask, SFD_NONBLOCK);
32	+#ifdef HAVE_SYS_SIGNALFD_H
33	+ sfd = signalfd(-1, mask, SFD_NONBLOCK);
34	if (sfd < 0) {
35	crm_perror(LOG_ERR, "signalfd() failed");
36	}
37	+#else
38	+ sfd = sigchld_pipe[0];
39	+#endif
40
41	fds[0].fd = op->opaque->stdout_fd;
42	fds[0].events = POLLIN;
43	@@ -503,6 +513,7 @@ action_synced_wait(svc_action_t * op, si
44	}
45
46	if (fds[2].revents & POLLIN) {
47	+#ifdef HAVE_SYS_SIGNALFD_H
48	struct signalfd_siginfo fdsi;
49	ssize_t s;
50
51	@@ -511,6 +522,12 @@ action_synced_wait(svc_action_t * op, si
52	crm_perror(LOG_ERR, "Read from signal fd %d failed", sfd);
53
54	} else if (fdsi.ssi_signo == SIGCHLD) {
55	+#else
56	+ if (1) {
57	+ /* Clear out the sigchld pipe. */
58	+ char ch;
59	+ while (read(sfd, &ch, 1) == 1);
60	+#endif
61	wait_rc = waitpid(op->pid, &status, WNOHANG);
62
63	if (wait_rc < 0){
64	@@ -583,10 +600,10 @@ action_synced_wait(svc_action_t * op, si
65
66	close(op->opaque->stdout_fd);
67	close(op->opaque->stderr_fd);
68	- close(sfd);
69
70	+#ifdef HAVE_SYS_SIGNALFD_H
71	+ close(sfd);
72	#endif
73	-
74	}
75
76	/* For an asynchronous 'op', returns FALSE if 'op' should be free'd by the caller */
77	@@ -596,9 +613,30 @@ services_os_action_execute(svc_action_t
78	{
79	int stdout_fd[2];
80	int stderr_fd[2];
81	+ struct stat st;
82	+ sigset_t *pmask;
83	+
84	+#ifdef HAVE_SYS_SIGNALFD_H
85	sigset_t mask;
86	sigset_t old_mask;
87	- struct stat st;
88	+#define sigchld_cleanup() { \
89	+ if (sigismember(&old_mask, SIGCHLD) == 0) { \
90	+ if (sigprocmask(SIG_UNBLOCK, &mask, NULL) < 0) { \
91	+ crm_perror(LOG_ERR, "sigprocmask() failed to unblock sigchld"); \
92	+ } \
93	+ } \
94	+}
95	+#else
96	+ struct sigaction sa;
97	+ struct sigaction old_sa;
98	+#define sigchld_cleanup() { \
99	+ if (sigaction(SIGCHLD, &old_sa, NULL) < 0) { \
100	+ crm_perror(LOG_ERR, "sigaction() failed to remove sigchld handler"); \
101	+ } \
102	+ close(sigchld_pipe[0]); \
103	+ close(sigchld_pipe[1]); \
104	+}
105	+#endif
106
107	if (pipe(stdout_fd) < 0) {
108	crm_err("pipe() failed");
109	@@ -620,13 +658,33 @@ services_os_action_execute(svc_action_t
110	}
111
112	if (synchronous) {
113	+#ifdef HAVE_SYS_SIGNALFD_H
114	sigemptyset(&mask);
115	sigaddset(&mask, SIGCHLD);
116	sigemptyset(&old_mask);
117
118	if (sigprocmask(SIG_BLOCK, &mask, &old_mask) < 0) {
119	- crm_perror(LOG_ERR, "sigprocmask() failed");
120	+ crm_perror(LOG_ERR, "sigprocmask() failed to block sigchld");
121	+ }
122	+
123	+ pmask = &mask;
124	+#else
125	+ if(pipe(sigchld_pipe) == -1) {
126	+ crm_perror(LOG_ERR, "pipe() failed");
127	+ }
128	+
129	+ set_fd_opts(sigchld_pipe[0], O_NONBLOCK);
130	+ set_fd_opts(sigchld_pipe[1], O_NONBLOCK);
131	+
132	+ sa.sa_handler = sigchld_handler;
133	+ sa.sa_flags = 0;
134	+ sigemptyset(&sa.sa_mask);
135	+ if (sigaction(SIGCHLD, &sa, &old_sa) < 0) {
136	+ crm_perror(LOG_ERR, "sigaction() failed to set sigchld handler");
137	}
138	+
139	+ pmask = NULL;
140	+#endif
141	}
142
143	op->pid = fork();
144	@@ -645,6 +703,8 @@ services_os_action_execute(svc_action_t
145	if (!synchronous) {
146	return operation_finalize(op);
147	}
148	+
149	+ sigchld_cleanup();
150	return FALSE;
151	}
152	case 0: /* Child */
153	@@ -663,6 +723,10 @@ services_os_action_execute(svc_action_t
154	close(stderr_fd[1]);
155	}
156
157	+ if (synchronous) {
158	+ sigchld_cleanup();
159	+ }
160	+
161	action_launch_child(op);
162	}
163
164	@@ -677,14 +741,8 @@ services_os_action_execute(svc_action_t
165	set_fd_opts(op->opaque->stderr_fd, O_NONBLOCK);
166
167	if (synchronous) {
168	- action_synced_wait(op, mask);
169	-
170	- if (sigismember(&old_mask, SIGCHLD) == 0) {
171	- if (sigprocmask(SIG_UNBLOCK, &mask, NULL) < 0) {
172	- crm_perror(LOG_ERR, "sigprocmask() to unblocked failed");
173	- }
174	- }
175	-
176	+ action_synced_wait(op, pmask);
177	+ sigchld_cleanup();
178	} else {
179
180	crm_trace("Async waiting for %d - %s", op->pid, op->opaque->exec);

Lines 1-17 Link Here

(-)pkg-plist (-27 / +85 lines)
1	etc/logrotate.d/pacemaker	1	etc/logrotate.d/pacemaker
2	etc/ocf/resource.d/.isolation/docker-wrapper	2	lib/ocf/resource.d/.isolation/docker-wrapper
3	etc/ocf/resource.d/pacemaker/ClusterMon	3	lib/ocf/resource.d/pacemaker/ClusterMon
4	etc/ocf/resource.d/pacemaker/Dummy	4	lib/ocf/resource.d/pacemaker/Dummy
5	etc/ocf/resource.d/pacemaker/HealthCPU	5	lib/ocf/resource.d/pacemaker/HealthCPU
6	etc/ocf/resource.d/pacemaker/HealthSMART	6	lib/ocf/resource.d/pacemaker/HealthSMART
7	etc/ocf/resource.d/pacemaker/Stateful	7	lib/ocf/resource.d/pacemaker/Stateful
8	etc/ocf/resource.d/pacemaker/SysInfo	8	lib/ocf/resource.d/pacemaker/SysInfo
9	etc/ocf/resource.d/pacemaker/SystemHealth	9	lib/ocf/resource.d/pacemaker/SystemHealth
10	etc/ocf/resource.d/pacemaker/controld	10	lib/ocf/resource.d/pacemaker/attribute
11	etc/ocf/resource.d/pacemaker/o2cb	11	lib/ocf/resource.d/pacemaker/controld
12	etc/ocf/resource.d/pacemaker/ping	12	lib/ocf/resource.d/pacemaker/o2cb
13	etc/ocf/resource.d/pacemaker/pingd	13	lib/ocf/resource.d/pacemaker/ping
14	etc/ocf/resource.d/pacemaker/remote	14	lib/ocf/resource.d/pacemaker/pingd
		15	lib/ocf/resource.d/pacemaker/remote
15	include/pacemaker/crm/attrd.h	16	include/pacemaker/crm/attrd.h
16	include/pacemaker/crm/cib.h	17	include/pacemaker/crm/cib.h
17	include/pacemaker/crm/cib/util.h	18	include/pacemaker/crm/cib/util.h
Lines 29-34 Link Here
29	include/pacemaker/crm/msg_xml.h	30	include/pacemaker/crm/msg_xml.h
30	include/pacemaker/crm/pengine/common.h	31	include/pacemaker/crm/pengine/common.h
31	include/pacemaker/crm/pengine/complex.h	32	include/pacemaker/crm/pengine/complex.h
		33	include/pacemaker/crm/pengine/remote.h
32	include/pacemaker/crm/pengine/rules.h	34	include/pacemaker/crm/pengine/rules.h
33	include/pacemaker/crm/pengine/status.h	35	include/pacemaker/crm/pengine/status.h
34	include/pacemaker/crm/services.h	36	include/pacemaker/crm/services.h
Lines 38-80 Link Here
38	lib/libcib.a	40	lib/libcib.a
39	lib/libcib.so	41	lib/libcib.so
40	lib/libcib.so.4	42	lib/libcib.so.4
41	lib/libcib.so.4.1.0	43	lib/libcib.so.4.1.2
42	lib/libcrmcluster.a	44	lib/libcrmcluster.a
43	lib/libcrmcluster.so	45	lib/libcrmcluster.so
44	lib/libcrmcluster.so.4	46	lib/libcrmcluster.so.4
45	lib/libcrmcluster.so.4.1.0	47	lib/libcrmcluster.so.4.2.1
46	lib/libcrmcommon.a	48	lib/libcrmcommon.a
47	lib/libcrmcommon.so	49	lib/libcrmcommon.so
48	lib/libcrmcommon.so.3	50	lib/libcrmcommon.so.3
49	lib/libcrmcommon.so.3.5.0	51	lib/libcrmcommon.so.3.6.1
50	lib/libcrmservice.a	52	lib/libcrmservice.a
51	lib/libcrmservice.so	53	lib/libcrmservice.so
52	lib/libcrmservice.so.3	54	lib/libcrmservice.so.3
53	lib/libcrmservice.so.3.1.0	55	lib/libcrmservice.so.3.1.2
54	lib/liblrmd.a	56	lib/liblrmd.a
55	lib/liblrmd.so	57	lib/liblrmd.so
56	lib/liblrmd.so.1	58	lib/liblrmd.so.1
57	lib/liblrmd.so.1.2.1	59	lib/liblrmd.so.1.3.1
58	lib/libpe_rules.a	60	lib/libpe_rules.a
59	lib/libpe_rules.so	61	lib/libpe_rules.so
60	lib/libpe_rules.so.2	62	lib/libpe_rules.so.2
61	lib/libpe_rules.so.2.0.5	63	lib/libpe_rules.so.2.1.0
62	lib/libpe_status.a	64	lib/libpe_status.a
63	lib/libpe_status.so	65	lib/libpe_status.so
64	lib/libpe_status.so.10	66	lib/libpe_status.so.10
65	lib/libpe_status.so.10.0.0	67	lib/libpe_status.so.10.2.0
66	lib/libpengine.a	68	lib/libpengine.a
67	lib/libpengine.so	69	lib/libpengine.so
68	lib/libpengine.so.10	70	lib/libpengine.so.10
69	lib/libpengine.so.10.0.0	71	lib/libpengine.so.10.2.0
70	lib/libstonithd.a	72	lib/libstonithd.a
71	lib/libstonithd.so	73	lib/libstonithd.so
72	lib/libstonithd.so.2	74	lib/libstonithd.so.2
73	lib/libstonithd.so.2.2.0	75	lib/libstonithd.so.2.2.2
74	lib/libtransitioner.a	76	lib/libtransitioner.a
75	lib/libtransitioner.so	77	lib/libtransitioner.so
76	lib/libtransitioner.so.2	78	lib/libtransitioner.so.2
77	lib/libtransitioner.so.2.0.4	79	lib/libtransitioner.so.2.0.6
78	%%PYTHON_SITELIBDIR%%/cts/CIB.py	80	%%PYTHON_SITELIBDIR%%/cts/CIB.py
79	%%PYTHON_SITELIBDIR%%/cts/CIB.pyc	81	%%PYTHON_SITELIBDIR%%/cts/CIB.pyc
80	%%PYTHON_SITELIBDIR%%/cts/CIB.pyo	82	%%PYTHON_SITELIBDIR%%/cts/CIB.pyo
Lines 145-150 Link Here
145	%%MANPAGES%%man/man7/ocf_pacemaker_Stateful.7.gz	147	%%MANPAGES%%man/man7/ocf_pacemaker_Stateful.7.gz
146	%%MANPAGES%%man/man7/ocf_pacemaker_SysInfo.7.gz	148	%%MANPAGES%%man/man7/ocf_pacemaker_SysInfo.7.gz
147	%%MANPAGES%%man/man7/ocf_pacemaker_SystemHealth.7.gz	149	%%MANPAGES%%man/man7/ocf_pacemaker_SystemHealth.7.gz
		150	%%MANPAGES%%man/man7/ocf_pacemaker_attribute.7.gz
148	%%MANPAGES%%man/man7/ocf_pacemaker_controld.7.gz	151	%%MANPAGES%%man/man7/ocf_pacemaker_controld.7.gz
149	%%MANPAGES%%man/man7/ocf_pacemaker_o2cb.7.gz	152	%%MANPAGES%%man/man7/ocf_pacemaker_o2cb.7.gz
150	%%MANPAGES%%man/man7/ocf_pacemaker_ping.7.gz	153	%%MANPAGES%%man/man7/ocf_pacemaker_ping.7.gz
Lines 198-212 Link Here
198	sbin/pacemaker_remoted	201	sbin/pacemaker_remoted
199	sbin/pacemakerd	202	sbin/pacemakerd
200	sbin/stonith_admin	203	sbin/stonith_admin
201	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
202	%%PORTDOCS%%%%DOCSDIR%%/COPYING	204	%%PORTDOCS%%%%DOCSDIR%%/COPYING
203	%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB	205	%%PORTDOCS%%%%DOCSDIR%%/README.markdown
204	%%PORTDOCS%%%%DOCSDIR%%/acls.html	206	%%PORTDOCS%%%%DOCSDIR%%/acls.html
205	%%PORTDOCS%%%%DOCSDIR%%/acls.txt	207	%%PORTDOCS%%%%DOCSDIR%%/acls.txt
206	%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.html	208	%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.html
207	%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.txt	209	%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.txt
		210	%%PORTDOCS%%%%DOCSDIR%%/licenses/CC-BY-SA-4.0
		211	%%PORTDOCS%%%%DOCSDIR%%/licenses/GPLv2
		212	%%PORTDOCS%%%%DOCSDIR%%/licenses/LGPLv2.1
		213	%%PORTDOCS%%%%DOCSDIR%%/licenses/RevisedBSD
208	%%DATADIR%%/acls-1.2.rng	214	%%DATADIR%%/acls-1.2.rng
209	%%DATADIR%%/acls-2.0.rng	215	%%DATADIR%%/acls-2.0.rng
		216	%%DATADIR%%/alerts-2.5.rng
		217	%%DATADIR%%/alerts/alert_file.sh.sample
		218	%%DATADIR%%/alerts/alert_smtp.sh.sample
		219	%%DATADIR%%/alerts/alert_snmp.sh.sample
210	%%DATADIR%%/cib-1.0.rng	220	%%DATADIR%%/cib-1.0.rng
211	%%DATADIR%%/cib-1.2.rng	221	%%DATADIR%%/cib-1.2.rng
212	%%DATADIR%%/constraints-1.0.rng	222	%%DATADIR%%/constraints-1.0.rng
Lines 214-219 Link Here
214	%%DATADIR%%/constraints-2.1.rng	224	%%DATADIR%%/constraints-2.1.rng
215	%%DATADIR%%/constraints-2.2.rng	225	%%DATADIR%%/constraints-2.2.rng
216	%%DATADIR%%/constraints-2.3.rng	226	%%DATADIR%%/constraints-2.3.rng
		227	%%DATADIR%%/constraints-2.6.rng
217	%%DATADIR%%/constraints-next.rng	228	%%DATADIR%%/constraints-next.rng
218	%%DATADIR%%/crm-transitional.dtd	229	%%DATADIR%%/crm-transitional.dtd
219	%%DATADIR%%/crm.dtd	230	%%DATADIR%%/crm.dtd
Lines 234-239 Link Here
234	%%DATADIR%%/pacemaker-2.2.rng	245	%%DATADIR%%/pacemaker-2.2.rng
235	%%DATADIR%%/pacemaker-2.3.rng	246	%%DATADIR%%/pacemaker-2.3.rng
236	%%DATADIR%%/pacemaker-2.4.rng	247	%%DATADIR%%/pacemaker-2.4.rng
		248	%%DATADIR%%/pacemaker-2.5.rng
		249	%%DATADIR%%/pacemaker-2.6.rng
237	%%DATADIR%%/pacemaker-next.rng	250	%%DATADIR%%/pacemaker-next.rng
238	%%DATADIR%%/pacemaker.rng	251	%%DATADIR%%/pacemaker.rng
239	%%DATADIR%%/report.collector	252	%%DATADIR%%/report.collector
Lines 250-255 Link Here
250	%%DATADIR%%/tests/cli/regression.dates.exp	263	%%DATADIR%%/tests/cli/regression.dates.exp
251	%%DATADIR%%/tests/cli/regression.sh	264	%%DATADIR%%/tests/cli/regression.sh
252	%%DATADIR%%/tests/cli/regression.tools.exp	265	%%DATADIR%%/tests/cli/regression.tools.exp
		266	%%DATADIR%%/tests/cli/regression.validity.exp
253	%%DATADIR%%/tests/coverage.sh	267	%%DATADIR%%/tests/coverage.sh
254	%%DATADIR%%/tests/cts/CTSlab.py	268	%%DATADIR%%/tests/cts/CTSlab.py
255	%%DATADIR%%/tests/cts/HBDummy	269	%%DATADIR%%/tests/cts/HBDummy
Lines 396-411 Link Here
396	%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.scores	410	%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.scores
397	%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.summary	411	%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.summary
398	%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.xml	412	%%DATADIR%%/tests/pengine/test10/a-promote-then-b-migrate.xml
		413	%%DATADIR%%/tests/pengine/test10/anti-colocation-master.dot
		414	%%DATADIR%%/tests/pengine/test10/anti-colocation-master.exp
		415	%%DATADIR%%/tests/pengine/test10/anti-colocation-master.scores
		416	%%DATADIR%%/tests/pengine/test10/anti-colocation-master.summary
		417	%%DATADIR%%/tests/pengine/test10/anti-colocation-master.xml
399	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.dot	418	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.dot
400	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.exp	419	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.exp
401	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.scores	420	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.scores
402	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.summary	421	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.summary
403	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.xml	422	%%DATADIR%%/tests/pengine/test10/anti-colocation-order.xml
		423	%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.dot
		424	%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.exp
		425	%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.scores
		426	%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.summary
		427	%%DATADIR%%/tests/pengine/test10/anti-colocation-slave.xml
404	%%DATADIR%%/tests/pengine/test10/asymmetric.dot	428	%%DATADIR%%/tests/pengine/test10/asymmetric.dot
405	%%DATADIR%%/tests/pengine/test10/asymmetric.exp	429	%%DATADIR%%/tests/pengine/test10/asymmetric.exp
406	%%DATADIR%%/tests/pengine/test10/asymmetric.scores	430	%%DATADIR%%/tests/pengine/test10/asymmetric.scores
407	%%DATADIR%%/tests/pengine/test10/asymmetric.summary	431	%%DATADIR%%/tests/pengine/test10/asymmetric.summary
408	%%DATADIR%%/tests/pengine/test10/asymmetric.xml	432	%%DATADIR%%/tests/pengine/test10/asymmetric.xml
		433	%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.dot
		434	%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.exp
		435	%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.scores
		436	%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.summary
		437	%%DATADIR%%/tests/pengine/test10/asymmetrical-order-move.xml
409	%%DATADIR%%/tests/pengine/test10/attrs1.dot	438	%%DATADIR%%/tests/pengine/test10/attrs1.dot
410	%%DATADIR%%/tests/pengine/test10/attrs1.exp	439	%%DATADIR%%/tests/pengine/test10/attrs1.exp
411	%%DATADIR%%/tests/pengine/test10/attrs1.scores	440	%%DATADIR%%/tests/pengine/test10/attrs1.scores
Lines 1136-1141 Link Here
1136	%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.scores	1165	%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.scores
1137	%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.summary	1166	%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.summary
1138	%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.xml	1167	%%DATADIR%%/tests/pengine/test10/complex_enforce_colo.xml
		1168	%%DATADIR%%/tests/pengine/test10/concurrent-fencing.dot
		1169	%%DATADIR%%/tests/pengine/test10/concurrent-fencing.exp
		1170	%%DATADIR%%/tests/pengine/test10/concurrent-fencing.scores
		1171	%%DATADIR%%/tests/pengine/test10/concurrent-fencing.summary
		1172	%%DATADIR%%/tests/pengine/test10/concurrent-fencing.xml
1139	%%DATADIR%%/tests/pengine/test10/container-1.dot	1173	%%DATADIR%%/tests/pengine/test10/container-1.dot
1140	%%DATADIR%%/tests/pengine/test10/container-1.exp	1174	%%DATADIR%%/tests/pengine/test10/container-1.exp
1141	%%DATADIR%%/tests/pengine/test10/container-1.scores	1175	%%DATADIR%%/tests/pengine/test10/container-1.scores
Lines 1871-1876 Link Here
1871	%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.scores	1905	%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.scores
1872	%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.summary	1906	%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.summary
1873	%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.xml	1907	%%DATADIR%%/tests/pengine/test10/multiple-active-block-group.xml
		1908	%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.dot
		1909	%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.exp
		1910	%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.scores
		1911	%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.summary
		1912	%%DATADIR%%/tests/pengine/test10/multiple-monitor-one-failed.xml
1874	%%DATADIR%%/tests/pengine/test10/node-maintenance-1.dot	1913	%%DATADIR%%/tests/pengine/test10/node-maintenance-1.dot
1875	%%DATADIR%%/tests/pengine/test10/node-maintenance-1.exp	1914	%%DATADIR%%/tests/pengine/test10/node-maintenance-1.exp
1876	%%DATADIR%%/tests/pengine/test10/node-maintenance-1.scores	1915	%%DATADIR%%/tests/pengine/test10/node-maintenance-1.scores
Lines 2532-2537 Link Here
2532	%%DATADIR%%/tests/pengine/test10/rsc_dep8.scores	2571	%%DATADIR%%/tests/pengine/test10/rsc_dep8.scores
2533	%%DATADIR%%/tests/pengine/test10/rsc_dep8.summary	2572	%%DATADIR%%/tests/pengine/test10/rsc_dep8.summary
2534	%%DATADIR%%/tests/pengine/test10/rsc_dep8.xml	2573	%%DATADIR%%/tests/pengine/test10/rsc_dep8.xml
		2574	%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.dot
		2575	%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.exp
		2576	%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.scores
		2577	%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.summary
		2578	%%DATADIR%%/tests/pengine/test10/shutdown-maintenance-node.xml
2535	%%DATADIR%%/tests/pengine/test10/simple1.dot	2579	%%DATADIR%%/tests/pengine/test10/simple1.dot
2536	%%DATADIR%%/tests/pengine/test10/simple1.exp	2580	%%DATADIR%%/tests/pengine/test10/simple1.exp
2537	%%DATADIR%%/tests/pengine/test10/simple1.scores	2581	%%DATADIR%%/tests/pengine/test10/simple1.scores
Lines 2587-2592 Link Here
2587	%%DATADIR%%/tests/pengine/test10/standby.scores	2631	%%DATADIR%%/tests/pengine/test10/standby.scores
2588	%%DATADIR%%/tests/pengine/test10/standby.summary	2632	%%DATADIR%%/tests/pengine/test10/standby.summary
2589	%%DATADIR%%/tests/pengine/test10/standby.xml	2633	%%DATADIR%%/tests/pengine/test10/standby.xml
		2634	%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.dot
		2635	%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.exp
		2636	%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.scores
		2637	%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.summary
		2638	%%DATADIR%%/tests/pengine/test10/start-then-stop-with-unfence.xml
2590	%%DATADIR%%/tests/pengine/test10/stonith-0.dot	2639	%%DATADIR%%/tests/pengine/test10/stonith-0.dot
2591	%%DATADIR%%/tests/pengine/test10/stonith-0.exp	2640	%%DATADIR%%/tests/pengine/test10/stonith-0.exp
2592	%%DATADIR%%/tests/pengine/test10/stonith-0.scores	2641	%%DATADIR%%/tests/pengine/test10/stonith-0.scores
Lines 3532-3537 Link Here
3532	%%DATADIR%%/tests/pengine/test10/unrunnable-1.scores	3581	%%DATADIR%%/tests/pengine/test10/unrunnable-1.scores
3533	%%DATADIR%%/tests/pengine/test10/unrunnable-1.summary	3582	%%DATADIR%%/tests/pengine/test10/unrunnable-1.summary
3534	%%DATADIR%%/tests/pengine/test10/unrunnable-1.xml	3583	%%DATADIR%%/tests/pengine/test10/unrunnable-1.xml
		3584	%%DATADIR%%/tests/pengine/test10/unrunnable-2.dot
		3585	%%DATADIR%%/tests/pengine/test10/unrunnable-2.exp
		3586	%%DATADIR%%/tests/pengine/test10/unrunnable-2.scores
		3587	%%DATADIR%%/tests/pengine/test10/unrunnable-2.summary
		3588	%%DATADIR%%/tests/pengine/test10/unrunnable-2.xml
3535	%%DATADIR%%/tests/pengine/test10/use-after-free-merge.dot	3589	%%DATADIR%%/tests/pengine/test10/use-after-free-merge.dot
3536	%%DATADIR%%/tests/pengine/test10/use-after-free-merge.exp	3590	%%DATADIR%%/tests/pengine/test10/use-after-free-merge.exp
3537	%%DATADIR%%/tests/pengine/test10/use-after-free-merge.scores	3591	%%DATADIR%%/tests/pengine/test10/use-after-free-merge.scores
Lines 3607-3612 Link Here
3607	%%DATADIR%%/tests/pengine/test10/whitebox-move.scores	3661	%%DATADIR%%/tests/pengine/test10/whitebox-move.scores
3608	%%DATADIR%%/tests/pengine/test10/whitebox-move.summary	3662	%%DATADIR%%/tests/pengine/test10/whitebox-move.summary
3609	%%DATADIR%%/tests/pengine/test10/whitebox-move.xml	3663	%%DATADIR%%/tests/pengine/test10/whitebox-move.xml
		3664	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.dot
		3665	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.exp
		3666	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.scores
		3667	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.summary
		3668	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering-move.xml
3610	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.dot	3669	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.dot
3611	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.exp	3670	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.exp
3612	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.scores	3671	%%DATADIR%%/tests/pengine/test10/whitebox-ms-ordering.scores
Lines 3647-3656 Link Here
3647	%%DATADIR%%/upgrade06.xsl	3706	%%DATADIR%%/upgrade06.xsl
3648	%%DATADIR%%/versions.rng	3707	%%DATADIR%%/versions.rng
3649	share/snmp/mibs/PCMK-MIB.txt	3708	share/snmp/mibs/PCMK-MIB.txt
3650	@dir /usr/local/etc/rc.d
3651	@dir /usr/local/etc
3652	@dir /var/lib/pacemaker/blackbox	3709	@dir /var/lib/pacemaker/blackbox
3653	@dir /var/lib/pacemaker/cib	3710	@dir /var/lib/pacemaker/cib
		3711	@dir /var/lib/pacemaker/cores
3654	@dir /var/lib/pacemaker/pengine	3712	@dir /var/lib/pacemaker/pengine
3655	@dir /var/lib/pacemaker	3713	@dir /var/lib/pacemaker
3656	@dir /var/lib	3714	@dir /var/lib