svn commit: r470799 - in head: . Mk/Uses net net/corosync net/corosync2 net/corosync2/files net/corosync3 net/corosync3/files net/pacemaker net/pacemaker1 net/pacemaker1/files net/pacemaker2 net/pa...

Florian Smeets flo at FreeBSD.org
Thu May 24 18:24:55 UTC 2018 

Author: flo
Date: Thu May 24 18:24:50 2018
New Revision: 470799
URL: https://svnweb.freebsd.org/changeset/ports/470799

Log:
  - add net/corosync3 (2.99.2)
  - add net/pacemaker2 (2.0.0-rc4)
  - net/corosync -> net/corosync2 (update to 2.4.4)
  - net/pacemaker -> net/pacemaker1 (update to 1.1.18)
  - add USES=corosync to deal with multiple versions
  
  PR:		228164, 228165
  Submitted by:	David Shane Holden <dpejesh at yahoo.com>

Added:
  head/Mk/Uses/corosync.mk   (contents, props changed)
  head/net/corosync2/
     - copied from r469706, head/net/corosync/
  head/net/corosync2/Makefile.common   (contents, props changed)
  head/net/corosync2/pkg-message   (contents, props changed)
  head/net/corosync3/
     - copied from r469706, head/net/corosync/
  head/net/corosync3/pkg-message   (contents, props changed)
  head/net/pacemaker1/
     - copied from r470797, head/net/pacemaker/
  head/net/pacemaker1/Makefile.common   (contents, props changed)
  head/net/pacemaker1/pkg-message   (contents, props changed)
  head/net/pacemaker2/
     - copied from r469892, head/net/pacemaker/
  head/net/pacemaker2/files/patch-daemons_execd_Makefile.am   (contents, props changed)
  head/net/pacemaker2/files/patch-daemons_pacemakerd_Makefile.am   (contents, props changed)
  head/net/pacemaker2/pkg-message   (contents, props changed)
Deleted:
  head/net/corosync/
  head/net/pacemaker/
  head/net/pacemaker2/files/patch-crmd_pengine.c
  head/net/pacemaker2/files/patch-lrmd_Makefile.am
  head/net/pacemaker2/files/patch-mcp_Makefile.am
Modified:
  head/MOVED
  head/net/Makefile
  head/net/corosync2/Makefile
  head/net/corosync2/distinfo
  head/net/corosync2/files/corosync.in
  head/net/corosync3/Makefile
  head/net/corosync3/distinfo
  head/net/corosync3/files/corosync.in
  head/net/corosync3/pkg-plist
  head/net/pacemaker1/Makefile
  head/net/pacemaker1/distinfo
  head/net/pacemaker1/files/pacemaker.in
  head/net/pacemaker1/pkg-plist
  head/net/pacemaker2/Makefile
  head/net/pacemaker2/distinfo
  head/net/pacemaker2/files/pacemaker.in
  head/net/pacemaker2/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu May 24 17:59:42 2018	(r470798)
+++ head/MOVED	Thu May 24 18:24:50 2018	(r470799)
@@ -10193,3 +10193,5 @@ www/p5-CGI_Lite|www/p5-CGI-Lite|2018-05-20|Rename to m
 www/mod_proxy_uwsgi|www/apache24|2018-05-22|Module has been merged into Apache 2.4
 devel/p5-reaper|devel/p5-Reaper|2018-05-22|Rename to match upstream naming
 textproc/py-pyelasticsearch||2018-05-22|Has expired: Not depended upon anymore
+net/corosync|net/corosync2|2018-05-24|There are now multiple versions of corosync
+net/pacemaker|net/pacemaker1|2018-05-24|There are now multiple versions of pacemaker

Added: head/Mk/Uses/corosync.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/corosync.mk	Thu May 24 18:24:50 2018	(r470799)
@@ -0,0 +1,42 @@
+# $FreeBSD$
+#
+# Provide support for corosync ports
+#
+# Feature:		corosync
+# Usage:		USES=coroync
+#
+# MAINTAINER: dpejesh at yahoo.com
+
+.if !defined(_INCLUDE_USES_COROSYNC_MK)
+_INCLUDE_USES_COROSYNC_MK=	yes
+
+# When adding a version, please keep the comment in
+# Mk/bsd.default-versions.mk in sync.
+_VALID_COROSYNC_VER=	2 3
+
+.if ! ${_VALID_COROSYNC_VER:M${COROSYNC_DEFAULT}}
+IGNORE=	Invalid corosync default version ${COROSYNC_DEFAULT}; valid versions are ${_VALID_COROSYNC_VER}
+.endif
+
+.if exists(${LOCALBASE}/sbin/corosync)
+_COROSYNC_INSTALLED_VER!=  ${LOCALBASE}/sbin/corosync -v 2>/dev/null
+_COROSYNC_INSTALLED_VER:=  ${_COROSYNC_INSTALLED_VER:M'*':C/'//g}
+_COROSYNC_INSTALLED_VER_MAJOR=	${_COROSYNC_INSTALLED_VER:C/([0-9]*).[0-9]*.*/\1/g}
+_COROSYNC_INSTALLED_VER_MINOR=	${_COROSYNC_INSTALLED_VER:C/[0-9]*.([0-9]*).*/\1/g}
+
+# Currently corosync 3 is tagged 2.99.x so this is a temporary
+# work around until the final version is released.
+.  if ${_COROSYNC_INSTALLED_VER_MAJOR} == 2 && ${_COROSYNC_INSTALLED_VER_MINOR} == 99
+_COROSYNC_INSTALLED_VER_MAJOR=	3
+_COROSYNC_INSTALLED_VER_MINOR=	0
+.  endif
+
+.  if ${COROSYNC_DEFAULT} != ${_COROSYNC_INSTALLED_VER_MAJOR}
+IGNORE=	DEFAULT_VERSIONS=corosync=${COROSYNC_DEFAULT} but ${_COROSYNC_INSTALLED_VER} is installed
+.  endif
+.endif
+
+BUILD_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
+RUN_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
+
+.endif

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Thu May 24 17:59:42 2018	(r470798)
+++ head/net/Makefile	Thu May 24 18:24:50 2018	(r470799)
@@ -88,7 +88,8 @@
     SUBDIR += coda6_server
     SUBDIR += concourse-fly
     SUBDIR += corkscrew
-    SUBDIR += corosync
+    SUBDIR += corosync2
+    SUBDIR += corosync3
     SUBDIR += courier-authlib-ldap
     SUBDIR += cppzmq
     SUBDIR += crtmpserver
@@ -904,7 +905,8 @@
     SUBDIR += p5-ldap2pw
     SUBDIR += p5-perl-ldap
     SUBDIR += p5-srv2pf
-    SUBDIR += pacemaker
+    SUBDIR += pacemaker1
+    SUBDIR += pacemaker2
     SUBDIR += packetdrill
     SUBDIR += packter-agent
     SUBDIR += panoptis

Modified: head/net/corosync2/Makefile
==============================================================================
--- head/net/corosync/Makefile	Sat May 12 03:50:19 2018	(r469706)
+++ head/net/corosync2/Makefile	Thu May 24 18:24:50 2018	(r470799)
@@ -1,42 +1,11 @@
-# Created by: dpejesh at yahoo.com
+# Created by: David Shane Holden <dpejesh at yahoo.com>
 # $FreeBSD$
 
-PORTNAME=	corosync
-PORTVERSION=	2.4.2
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://build.clusterlabs.org/corosync/releases/
+PORTVERSION=		2.4.4
+PKGNAMESUFFIX=		2
 
-MAINTAINER=	dpejesh at yahoo.com
-COMMENT=	Corosync Cluster Engine
+.include "${.CURDIR}/Makefile.common"
 
-LICENSE=	BSD3CLAUSE
-
-LIB_DEPENDS=	libnspr4.so:devel/nspr \
-		libnss3.so:security/nss \
-		libqb.so.0:devel/libqb
-
-USES=		gmake groff libtool pathfix pkgconfig
-USE_BINUTILS=	yes
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	${PORTNAME} ${PORTNAME}-notifyd
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-secure-build
-LDFLAGS+=	-B${LOCALBASE}/bin
-INSTALL_TARGET=	install-strip
-
-OPTIONS_DEFINE=	DBUS SNMP
-OPTIONS_SUB=	yes
-
-DBUS_LIB_DEPENDS+=	libdbus-1.so:devel/dbus
-DBUS_CONFIGURE_ENABLE=	dbus
-
-SNMP_LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
-SNMP_CONFIGURE_ENABLE=	snmp
-
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/etc/init.d/corosync
-	${RM} ${STAGEDIR}${PREFIX}/etc/init.d/corosync-notifyd
-	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
+CONFLICTS=		corosync3-[0-9]*
 
 .include <bsd.port.mk>

Added: head/net/corosync2/Makefile.common
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/corosync2/Makefile.common	Thu May 24 18:24:50 2018	(r470799)
@@ -0,0 +1,41 @@
+# Created by: David Shane Holden <dpejesh at yahoo.com>
+# $FreeBSD$
+
+PORTNAME=		corosync
+CATEGORIES=		net
+MASTER_SITES=		http://build.clusterlabs.org/corosync/releases/
+
+MAINTAINER=		dpejesh at yahoo.com
+COMMENT=		Corosync Cluster Engine
+
+LICENSE=		BSD3CLAUSE
+
+LIB_DEPENDS=		libnspr4.so:devel/nspr \
+			libnss3.so:security/nss \
+			libqb.so.0:devel/libqb
+
+TEST_DEPENDS=		augparse:textproc/augeas
+
+USES=			gmake groff libtool pathfix pkgconfig
+USE_BINUTILS=		yes
+USE_LDCONFIG=		yes
+USE_RC_SUBR=		${PORTNAME} ${PORTNAME}-notifyd
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--disable-secure-build
+LDFLAGS+=		-B${LOCALBASE}/bin
+INSTALL_TARGET=		install-strip
+TEST_TARGET=		check
+
+OPTIONS_DEFINE=		DBUS SNMP
+OPTIONS_SUB=		yes
+
+DBUS_LIB_DEPENDS+=	libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_ENABLE=	dbus
+
+SNMP_LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
+SNMP_CONFIGURE_ENABLE=	snmp
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/etc/init.d/corosync
+	${RM} ${STAGEDIR}${PREFIX}/etc/init.d/corosync-notifyd
+	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d

Modified: head/net/corosync2/distinfo
==============================================================================
--- head/net/corosync/distinfo	Sat May 12 03:50:19 2018	(r469706)
+++ head/net/corosync2/distinfo	Thu May 24 18:24:50 2018	(r470799)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479205097
-SHA256 (corosync-2.4.2.tar.gz) = f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9
-SIZE (corosync-2.4.2.tar.gz) = 1152240
+TIMESTAMP = 1523569567
+SHA256 (corosync-2.4.4.tar.gz) = 9bd4707bb271df16f8d543ec782eb4c35ec0330b7be696b797da4bd8f058a25d
+SIZE (corosync-2.4.4.tar.gz) = 1204051

Modified: head/net/corosync2/files/corosync.in
==============================================================================
--- head/net/corosync/files/corosync.in	Sat May 12 03:50:19 2018	(r469706)
+++ head/net/corosync2/files/corosync.in	Thu May 24 18:24:50 2018	(r470799)
@@ -9,6 +9,14 @@
 
 name="corosync"
 rcvar="corosync_enable"
+start_precmd="corosync_precmd"
+
+corosync_precmd()
+{
+	if [ `${SYSCTL_N} kern.ipc.maxsockbuf` -lt 18874368 ]; then
+		err 3 "sysctl:kern.ipc.maxsockbuf must be at least 18874368"
+	fi
+}
 
 load_rc_config $name
 

Added: head/net/corosync2/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/corosync2/pkg-message	Thu May 24 18:24:50 2018	(r470799)
@@ -0,0 +1,9 @@
+For correct operation, maximum socket buffer size must be tuned
+by performing the following command as root :
+
+# sysctl kern.ipc.maxsockbuf=18874368
+
+To preserve this setting across reboots, append the following
+to /etc/sysctl.conf :
+
+kern.ipc.maxsockbuf=18874368

Modified: head/net/corosync3/Makefile
==============================================================================
--- head/net/corosync/Makefile	Sat May 12 03:50:19 2018	(r469706)
+++ head/net/corosync3/Makefile	Thu May 24 18:24:50 2018	(r470799)
@@ -1,42 +1,13 @@
-# Created by: dpejesh at yahoo.com
+# Created by: David Shane Holden <dpejesh at yahoo.com>
 # $FreeBSD$
 
-PORTNAME=	corosync
-PORTVERSION=	2.4.2
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://build.clusterlabs.org/corosync/releases/
+PORTVERSION=		2.99.2
+PKGNAMESUFFIX=		3
 
-MAINTAINER=	dpejesh at yahoo.com
-COMMENT=	Corosync Cluster Engine
+.include "${.CURDIR}/../corosync2/Makefile.common"
 
-LICENSE=	BSD3CLAUSE
+LIB_DEPENDS+=		libknet.so:devel/kronosnet
 
-LIB_DEPENDS=	libnspr4.so:devel/nspr \
-		libnss3.so:security/nss \
-		libqb.so.0:devel/libqb
-
-USES=		gmake groff libtool pathfix pkgconfig
-USE_BINUTILS=	yes
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	${PORTNAME} ${PORTNAME}-notifyd
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-secure-build
-LDFLAGS+=	-B${LOCALBASE}/bin
-INSTALL_TARGET=	install-strip
-
-OPTIONS_DEFINE=	DBUS SNMP
-OPTIONS_SUB=	yes
-
-DBUS_LIB_DEPENDS+=	libdbus-1.so:devel/dbus
-DBUS_CONFIGURE_ENABLE=	dbus
-
-SNMP_LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
-SNMP_CONFIGURE_ENABLE=	snmp
-
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/etc/init.d/corosync
-	${RM} ${STAGEDIR}${PREFIX}/etc/init.d/corosync-notifyd
-	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
+CONFLICTS=		corosync2-[0-9]*
 
 .include <bsd.port.mk>

Modified: head/net/corosync3/distinfo
==============================================================================
--- head/net/corosync/distinfo	Sat May 12 03:50:19 2018	(r469706)
+++ head/net/corosync3/distinfo	Thu May 24 18:24:50 2018	(r470799)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479205097
-SHA256 (corosync-2.4.2.tar.gz) = f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9
-SIZE (corosync-2.4.2.tar.gz) = 1152240
+TIMESTAMP = 1525106725
+SHA256 (corosync-2.99.2.tar.gz) = 4a15415d607362b74d969e191308afde7fcee2f9686eee385f9f2469c6c0ba56
+SIZE (corosync-2.99.2.tar.gz) = 1066270

Modified: head/net/corosync3/files/corosync.in
==============================================================================
--- head/net/corosync/files/corosync.in	Sat May 12 03:50:19 2018	(r469706)
+++ head/net/corosync3/files/corosync.in	Thu May 24 18:24:50 2018	(r470799)
@@ -9,6 +9,14 @@
 
 name="corosync"
 rcvar="corosync_enable"
+start_precmd="corosync_precmd"
+
+corosync_precmd()
+{
+	if [ `${SYSCTL_N} kern.ipc.maxsockbuf` -lt 18874368 ]; then
+		err 3 "sysctl:kern.ipc.maxsockbuf must be at least 18874368"
+	fi
+}
 
 load_rc_config $name
 

Added: head/net/corosync3/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/corosync3/pkg-message	Thu May 24 18:24:50 2018	(r470799)
@@ -0,0 +1,9 @@
+For correct operation, maximum socket buffer size must be tuned
+by performing the following command as root :
+
+# sysctl kern.ipc.maxsockbuf=18874368
+
+To preserve this setting across reboots, append the following
+to /etc/sysctl.conf :
+
+kern.ipc.maxsockbuf=18874368

Modified: head/net/corosync3/pkg-plist
==============================================================================
--- head/net/corosync/pkg-plist	Sat May 12 03:50:19 2018	(r469706)
+++ head/net/corosync3/pkg-plist	Thu May 24 18:24:50 2018	(r470799)
@@ -13,11 +13,12 @@ include/corosync/sam.h
 include/corosync/totem/totem.h
 include/corosync/totem/totemip.h
 include/corosync/totem/totempg.h
+include/corosync/totem/totemstats.h
 include/corosync/votequorum.h
 lib/libcfg.a
 lib/libcfg.so
-lib/libcfg.so.6
-lib/libcfg.so.6.0.0
+lib/libcfg.so.7
+lib/libcfg.so.7.0.0
 lib/libcmap.a
 lib/libcmap.so
 lib/libcmap.so.4
@@ -65,9 +66,11 @@ man/man3/cmap_finalize.3.gz
 man/man3/cmap_get.3.gz
 man/man3/cmap_inc.3.gz
 man/man3/cmap_initialize.3.gz
+man/man3/cmap_initialize_map.3.gz
 man/man3/cmap_iter_finalize.3.gz
 man/man3/cmap_iter_init.3.gz
 man/man3/cmap_iter_next.3.gz
+man/man3/cmap_overview.3.gz
 man/man3/cmap_set.3.gz
 man/man3/cmap_track_add.3.gz
 man/man3/cmap_track_delete.3.gz
@@ -83,6 +86,7 @@ man/man3/cpg_iteration_next.3.gz
 man/man3/cpg_join.3.gz
 man/man3/cpg_leave.3.gz
 man/man3/cpg_local_get.3.gz
+man/man3/cpg_overview.3.gz
 man/man3/cpg_mcast_joined.3.gz
 man/man3/cpg_membership_get.3.gz
 man/man3/cpg_model_initialize.3.gz
@@ -96,6 +100,7 @@ man/man3/quorum_fd_get.3.gz
 man/man3/quorum_finalize.3.gz
 man/man3/quorum_getquorate.3.gz
 man/man3/quorum_initialize.3.gz
+man/man3/quorum_overview.3.gz
 man/man3/quorum_trackstart.3.gz
 man/man3/quorum_trackstop.3.gz
 man/man3/sam_data_getsize.3.gz
@@ -106,6 +111,7 @@ man/man3/sam_hc_callback_register.3.gz
 man/man3/sam_hc_send.3.gz
 man/man3/sam_initialize.3.gz
 man/man3/sam_mark_failed.3.gz
+man/man3/sam_overview.3.gz
 man/man3/sam_register.3.gz
 man/man3/sam_start.3.gz
 man/man3/sam_stop.3.gz
@@ -117,6 +123,7 @@ man/man3/votequorum_fd_get.3.gz
 man/man3/votequorum_finalize.3.gz
 man/man3/votequorum_getinfo.3.gz
 man/man3/votequorum_initialize.3.gz
+man/man3/votequorum_overview.3.gz
 man/man3/votequorum_qdevice_master_wins.3.gz
 man/man3/votequorum_qdevice_poll.3.gz
 man/man3/votequorum_qdevice_register.3.gz
@@ -128,8 +135,8 @@ man/man3/votequorum_trackstart.3.gz
 man/man3/votequorum_trackstop.3.gz
 man/man5/corosync.conf.5.gz
 man/man5/votequorum.5.gz
+man/man7/corosync_overview.7.gz
 man/man8/cmap_keys.8.gz
-man/man8/cmap_overview.8.gz
 man/man8/corosync-blackbox.8.gz
 man/man8/corosync-cfgtool.8.gz
 man/man8/corosync-cmapctl.8.gz
@@ -138,11 +145,6 @@ man/man8/corosync-keygen.8.gz
 man/man8/corosync-notifyd.8.gz
 man/man8/corosync-quorumtool.8.gz
 man/man8/corosync.8.gz
-man/man8/corosync_overview.8.gz
-man/man8/cpg_overview.8.gz
-man/man8/quorum_overview.8.gz
-man/man8/sam_overview.8.gz
-man/man8/votequorum_overview.8.gz
 sbin/corosync
 sbin/corosync-cfgtool
 sbin/corosync-cmapctl
@@ -155,7 +157,6 @@ sbin/corosync-quorumtool
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README.recovery
-%%PORTDOCS%%%%DOCSDIR%%/SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_context_get.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_context_set.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_dec.3.html
@@ -166,11 +167,12 @@ sbin/corosync-quorumtool
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_get.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_inc.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_initialize.3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cmap_initialize_map.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_iter_finalize.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_iter_init.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_iter_next.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_keys.8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cmap_overview.8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cmap_overview.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_set.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_track_add.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmap_track_delete.3.html
@@ -183,7 +185,7 @@ sbin/corosync-quorumtool
 %%PORTDOCS%%%%DOCSDIR%%/html/corosync-quorumtool.8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/corosync.8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/corosync.conf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/corosync_overview.8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/corosync_overview.7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_context_get.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_context_set.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_dispatch.3.html
@@ -199,7 +201,7 @@ sbin/corosync-quorumtool
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_mcast_joined.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_membership_get.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_model_initialize.3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cpg_overview.8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cpg_overview.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_zcb_alloc.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_zcb_free.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpg_zcb_mcast_joined.3.html
@@ -211,7 +213,7 @@ sbin/corosync-quorumtool
 %%PORTDOCS%%%%DOCSDIR%%/html/quorum_finalize.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/quorum_getquorate.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/quorum_initialize.3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/quorum_overview.8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quorum_overview.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/quorum_trackstart.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/quorum_trackstop.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sam_data_getsize.3.html
@@ -222,7 +224,7 @@ sbin/corosync-quorumtool
 %%PORTDOCS%%%%DOCSDIR%%/html/sam_hc_send.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sam_initialize.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sam_mark_failed.3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/sam_overview.8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sam_overview.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sam_register.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sam_start.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sam_stop.3.html
@@ -235,7 +237,7 @@ sbin/corosync-quorumtool
 %%PORTDOCS%%%%DOCSDIR%%/html/votequorum_finalize.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/votequorum_getinfo.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/votequorum_initialize.3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/votequorum_overview.8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/votequorum_overview.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/votequorum_qdevice_master_wins.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/votequorum_qdevice_poll.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/votequorum_qdevice_register.3.html

Modified: head/net/pacemaker1/Makefile
==============================================================================
--- head/net/pacemaker/Makefile	Thu May 24 17:31:07 2018	(r470797)
+++ head/net/pacemaker1/Makefile	Thu May 24 18:24:50 2018	(r470799)
@@ -1,94 +1,29 @@
-# Created by: dpejesh at yahoo.com
+
+# Created by: David Shane Holden <dpejesh at yahoo.com>
 # $FreeBSD$
 
-PORTNAME=	pacemaker
-PORTVERSION=	1.1.16
-PORTREVISION=	2
-DISTVERSIONPREFIX=	Pacemaker-
-CATEGORIES=	net
+PORTVERSION=		1.1.18
+PKGNAMESUFFIX=		1
 
-MAINTAINER=	dpejesh at yahoo.com
-COMMENT=	Scalable High-Availability cluster resource manager
+.include "${.CURDIR}/Makefile.common"
 
-LICENSE=	GPLv2
+CONFLICTS+=		pacemaker2-[0-9]*
 
-BROKEN_armv6=		fails to install: help2man: can't get '--help' info from pacemakerd
+SHEBANG_FILES+=		cts/cts \
+			cts/lxc_autogen.sh.in \
+			fencing/* \
+			lrmd/* \
+			mcp/* \
+			tools/* \
+			xml/* \
+			BasicSanity.sh \
+			coverage.sh.in \
+			cts/CTSlab.py \
+			pengine/regression.sh
 
-BUILD_DEPENDS=	bash:shells/bash \
-		corosync:net/corosync \
-		getopt>=0:misc/getopt
-LIB_DEPENDS=	libgnutls.so:security/gnutls \
-		libltdl.so:devel/libltdl \
-		libqb.so.0:devel/libqb \
-		libuuid.so:misc/e2fsprogs-libuuid \
-		libxml2.so:textproc/libxml2 \
-		libxslt.so:textproc/libxslt
-RUN_DEPENDS=	bash:shells/bash \
-		corosync:net/corosync \
-		getopt>=0:misc/getopt \
-		ocf-tester:net-mgmt/resource-agents
-
-CONFLICTS=	heartbeat-[0-9]*
-
-USERS=		hacluster
-GROUPS=		haclient
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	ClusterLabs
-
-USES=		autoreconf gmake libtool pathfix pkgconfig python shebangfix
-USE_BINUTILS=	yes
-USE_GNOME=	glib20
-USE_LDCONFIG=	yes
-USE_PYTHON=	py3kplist
-USE_RC_SUBR=	${PORTNAME}
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-fatal-warnings \
-		--disable-hardening \
-		--with-corosync \
-		--without-heartbeat
-LDFLAGS+=	-B${LOCALBASE}/bin
-INSTALL_TARGET=	install-strip
-
-PATHFIX_MAKEFILEIN=	Makefile.am
-
-SHEBANG_LANG=	sh
-sh_OLD_CMD=	${SH}
-sh_CMD=		${LOCALBASE}/bin/bash
-SHEBANG_FILES=	BasicSanity.sh \
-		coverage.sh.in \
-		cts/CTSlab.py \
-		cts/cts \
-		cts/lxc_autogen.sh.in \
-		extra/resources/* \
-		fencing/* \
-		lrmd/* \
-		mcp/* \
-		pengine/regression.sh \
-		tools/* \
-		xml/*
-
-REPLACE_ARGS_OCF=	-e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,'
 REPLACE_ARGS_GETOPT=	-e 's,getopt,${LOCALBASE}/bin/getopt,'
 
-OPTIONS_DEFINE=	DBUS DOCS MANPAGES SNMP
-OPTIONS_DEFAULT=MANPAGES
-OPTIONS_SUB=	yes
-
-DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
-DBUS_VARS_OFF=		REPLACE_ARGS+="-e 's/HAVE_dbus=1/HAVE_dbus=0/'"
-
-DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
-
-MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
-			help2man:misc/help2man \
-			xsltproc:textproc/libxslt
-
-SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
-SNMP_CONFIGURE_WITH=	snmp
-
-post-patch:
-	@${REINPLACE_CMD} ${REPLACE_ARGS_OCF} ${WRKSRC}/configure.ac
+post-patch: post-patch-common
 	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_failcount
 	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_master
 	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_report.in

Added: head/net/pacemaker1/Makefile.common
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/pacemaker1/Makefile.common	Thu May 24 18:24:50 2018	(r470799)
@@ -0,0 +1,92 @@
+# Created by: David Shane Holden <dpejesh at yahoo.com>
+# $FreeBSD$
+
+PORTNAME=		pacemaker
+CATEGORIES=		net
+
+MAINTAINER=		dpejesh at yahoo.com
+COMMENT=		Scalable High-Availability cluster resource manager
+
+LICENSE=		GPLv2
+
+BUILD_DEPENDS=		bash:shells/bash \
+			getopt>=0:misc/getopt
+LIB_DEPENDS=		libgnutls.so:security/gnutls \
+			libltdl.so:devel/libltdl \
+			libqb.so.0:devel/libqb \
+			libuuid.so:misc/e2fsprogs-libuuid \
+			libxml2.so:textproc/libxml2 \
+			libxslt.so:textproc/libxslt
+RUN_DEPENDS=		bash:shells/bash \
+			getopt>=0:misc/getopt \
+			ocf-tester:net-mgmt/resource-agents
+
+CONFLICTS=		heartbeat-[0-9]*
+
+USERS=			hacluster
+GROUPS=			haclient
+
+USE_GITHUB=		yes
+GH_ACCOUNT=		ClusterLabs
+GH_PROJECT=		pacemaker
+GH_TAGNAME=		Pacemaker-${PORTVERSION}${DISTVERSIONSUFFIX}
+
+USES=			autoreconf corosync gmake libtool ncurses:port pathfix pkgconfig python shebangfix
+USE_BINUTILS=		yes
+USE_GNOME=		glib20
+USE_LDCONFIG=		yes
+USE_PYTHON=		py3kplist
+USE_RC_SUBR=		${PORTNAME}
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--disable-fatal-warnings \
+			--disable-hardening \
+			--with-corosync \
+			--without-heartbeat
+CONFIGURE_ENV=		BASH_PATH=${LOCALBASE}/bin/bash
+LDFLAGS+=		-B${LOCALBASE}/bin
+
+INSTALL_TARGET=		install-strip
+TEST_TARGET=		check
+
+PATHFIX_MAKEFILEIN=	Makefile.am
+
+SHEBANG_LANG=		sh
+sh_OLD_CMD=		${SH}
+sh_CMD=			${LOCALBASE}/bin/bash
+SHEBANG_FILES=		extra/resources/*
+
+REPLACE_ARGS_OCF=	-e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,'
+
+OPTIONS_DEFINE=		DBUS DOCS MANPAGES SNMP
+
+OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_SUB=		yes
+
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
+DBUS_VARS_OFF=		REPLACE_ARGS+="-e 's/HAVE_dbus=1/HAVE_dbus=0/'"
+
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
+
+MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
+			help2man:misc/help2man \
+			xsltproc:textproc/libxslt
+
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+SNMP_CONFIGURE_WITH=	snmp
+SNMP_USES=		ssl
+
+# python default version must be set to 2.7 to generate a
+# correct pkg-plist
+maintainer-plist: stage
+	@${MAKE} makeplist \
+	| ${SED} -e '/^\/you/d' \
+		-e '/^etc\/rc.d\/pacemaker/d' \
+		-e 's,^man,%%MANPAGES%%man,g' \
+		-e 's,%%PYTHON_PYOEXTENSION%%,pyo,g' \
+		-e 's,%%PYTHON_VER%%,2.7,g' \
+		-e 's,^@dir \/var\/lib\/pacemaker\/\(.*\), at dir(\,haclient\,770) \/var\/lib\/pacemaker\/\1,g' \
+		-e 's,^@dir \/var\/log\/pacemaker\(.*\), at dir(\,haclient\,770) \/var\/log\/pacemaker\1,g' \
+	> pkg-plist
+
+post-patch-common:
+	@${REINPLACE_CMD} ${REPLACE_ARGS_OCF} ${WRKSRC}/configure.ac

Modified: head/net/pacemaker1/distinfo
==============================================================================
--- head/net/pacemaker/distinfo	Thu May 24 17:31:07 2018	(r470797)
+++ head/net/pacemaker1/distinfo	Thu May 24 18:24:50 2018	(r470799)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495733591
-SHA256 (ClusterLabs-pacemaker-Pacemaker-1.1.16_GH0.tar.gz) = 6b4b5c3f8571f57e46246a09c59b2ecbf59591b610bb3c9515e9ca84c834c75a
-SIZE (ClusterLabs-pacemaker-Pacemaker-1.1.16_GH0.tar.gz) = 4897770
+TIMESTAMP = 1526195102
+SHA256 (ClusterLabs-pacemaker-1.1.18-Pacemaker-1.1.18_GH0.tar.gz) = a71921c1e2a93c5bed6199fb41464a1cff887be515f4a0ffbc2c92bc98d233af
+SIZE (ClusterLabs-pacemaker-1.1.18-Pacemaker-1.1.18_GH0.tar.gz) = 5321212

Modified: head/net/pacemaker1/files/pacemaker.in
==============================================================================
--- head/net/pacemaker/files/pacemaker.in	Thu May 24 17:31:07 2018	(r470797)
+++ head/net/pacemaker1/files/pacemaker.in	Thu May 24 18:24:50 2018	(r470799)
@@ -23,6 +23,10 @@ command_args="-f -p ${pidfile} ${procname}"
 
 pacemaker_precmd()
 {
+	if [ `${SYSCTL_N} kern.ipc.maxsockbuf` -lt 18874368 ]; then
+		err 3 "sysctl:kern.ipc.maxsockbuf must be at least 18874368"
+	fi
+
 	export PATH="${PATH}:/usr/local/sbin:/usr/local/bin"
 	export PCMK_ipc_buffer=${pacemaker_ipc_buffer}
 	export PCMK_ipc_type=socket

Added: head/net/pacemaker1/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/pacemaker1/pkg-message	Thu May 24 18:24:50 2018	(r470799)
@@ -0,0 +1,10 @@
+For correct operation, maximum socket buffer size must be tuned
+by performing the following command as root :
+
+# sysctl kern.ipc.maxsockbuf=18874368
+
+To preserve this setting across reboots, append the following
+to /etc/sysctl.conf :
+
+kern.ipc.maxsockbuf=18874368
+

Modified: head/net/pacemaker1/pkg-plist
==============================================================================
--- head/net/pacemaker/pkg-plist	Thu May 24 17:31:07 2018	(r470797)
+++ head/net/pacemaker1/pkg-plist	Thu May 24 18:24:50 2018	(r470799)
@@ -1,18 +1,4 @@
 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
@@ -40,43 +26,58 @@ include/pacemaker/crm_config.h
 lib/libcib.a
 lib/libcib.so
 lib/libcib.so.4
-lib/libcib.so.4.1.2
+lib/libcib.so.4.1.4
 lib/libcrmcluster.a
 lib/libcrmcluster.so
 lib/libcrmcluster.so.4
-lib/libcrmcluster.so.4.2.1
+lib/libcrmcluster.so.4.3.1
 lib/libcrmcommon.a
 lib/libcrmcommon.so
 lib/libcrmcommon.so.3
-lib/libcrmcommon.so.3.6.1
+lib/libcrmcommon.so.3.8.0
 lib/libcrmservice.a
 lib/libcrmservice.so
 lib/libcrmservice.so.3
-lib/libcrmservice.so.3.1.2
+lib/libcrmservice.so.3.3.0
 lib/liblrmd.a
 lib/liblrmd.so
 lib/liblrmd.so.1
-lib/liblrmd.so.1.3.1
+lib/liblrmd.so.1.5.0
 lib/libpe_rules.a
 lib/libpe_rules.so
 lib/libpe_rules.so.2
-lib/libpe_rules.so.2.1.0
+lib/libpe_rules.so.2.3.0
 lib/libpe_status.a
 lib/libpe_status.so
 lib/libpe_status.so.10
-lib/libpe_status.so.10.2.0
+lib/libpe_status.so.10.4.0
 lib/libpengine.a
 lib/libpengine.so
 lib/libpengine.so.10
-lib/libpengine.so.10.2.0
+lib/libpengine.so.10.4.0
 lib/libstonithd.a
 lib/libstonithd.so
 lib/libstonithd.so.2
-lib/libstonithd.so.2.2.2
+lib/libstonithd.so.2.2.4
 lib/libtransitioner.a
 lib/libtransitioner.so
 lib/libtransitioner.so.2
-lib/libtransitioner.so.2.0.6
+lib/libtransitioner.so.2.1.0
+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/ifspeed
+lib/ocf/resource.d/pacemaker/o2cb
+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
@@ -149,6 +150,7 @@ libexec/pacemaker/stonithd
 %%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_ifspeed.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_o2cb.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_ping.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_pingd.7.gz
@@ -213,7 +215,9 @@ sbin/stonith_admin
 %%PORTDOCS%%%%DOCSDIR%%/licenses/RevisedBSD
 %%DATADIR%%/acls-1.2.rng
 %%DATADIR%%/acls-2.0.rng
+%%DATADIR%%/alerts-2.10.rng
 %%DATADIR%%/alerts-2.5.rng
+%%DATADIR%%/alerts-2.9.rng
 %%DATADIR%%/alerts/alert_file.sh.sample
 %%DATADIR%%/alerts/alert_smtp.sh.sample
 %%DATADIR%%/alerts/alert_snmp.sh.sample
@@ -225,6 +229,7 @@ sbin/stonith_admin
 %%DATADIR%%/constraints-2.2.rng
 %%DATADIR%%/constraints-2.3.rng
 %%DATADIR%%/constraints-2.6.rng
+%%DATADIR%%/constraints-2.9.rng
 %%DATADIR%%/constraints-next.rng
 %%DATADIR%%/crm-transitional.dtd
 %%DATADIR%%/crm.dtd
@@ -234,7 +239,9 @@ sbin/stonith_admin
 %%DATADIR%%/nodes-1.0.rng
 %%DATADIR%%/nodes-1.2.rng
 %%DATADIR%%/nodes-1.3.rng
+%%DATADIR%%/nodes-2.9.rng
 %%DATADIR%%/nvset-1.3.rng
+%%DATADIR%%/nvset-2.9.rng
 %%DATADIR%%/nvset.rng
 %%DATADIR%%/options-1.0.rng
 %%DATADIR%%/pacemaker-1.0.rng
@@ -242,11 +249,15 @@ sbin/stonith_admin
 %%DATADIR%%/pacemaker-1.3.rng
 %%DATADIR%%/pacemaker-2.0.rng
 %%DATADIR%%/pacemaker-2.1.rng
+%%DATADIR%%/pacemaker-2.10.rng
 %%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-2.7.rng
+%%DATADIR%%/pacemaker-2.8.rng
+%%DATADIR%%/pacemaker-2.9.rng
 %%DATADIR%%/pacemaker-next.rng
 %%DATADIR%%/pacemaker.rng
 %%DATADIR%%/report.collector
@@ -254,6 +265,11 @@ sbin/stonith_admin
 %%DATADIR%%/resources-1.0.rng
 %%DATADIR%%/resources-1.2.rng
 %%DATADIR%%/resources-1.3.rng
+%%DATADIR%%/resources-2.10.rng
+%%DATADIR%%/resources-2.7.rng
+%%DATADIR%%/resources-2.8.rng
+%%DATADIR%%/resources-2.9.rng
+%%DATADIR%%/rule-2.9.rng
 %%DATADIR%%/rule.rng
 %%DATADIR%%/score.rng
 %%DATADIR%%/status-1.0.rng
@@ -855,6 +871,81 @@ sbin/stonith_admin
 %%DATADIR%%/tests/pengine/test10/bug-suse-707150.scores
 %%DATADIR%%/tests/pengine/test10/bug-suse-707150.summary
 %%DATADIR%%/tests/pengine/test10/bug-suse-707150.xml
+%%DATADIR%%/tests/pengine/test10/bundle-nested-colocation.dot
+%%DATADIR%%/tests/pengine/test10/bundle-nested-colocation.exp
+%%DATADIR%%/tests/pengine/test10/bundle-nested-colocation.scores
+%%DATADIR%%/tests/pengine/test10/bundle-nested-colocation.summary
+%%DATADIR%%/tests/pengine/test10/bundle-nested-colocation.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-fencing.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-fencing.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-fencing.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-fencing.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-fencing.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start-2.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start-2.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start-2.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start-2.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start-2.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-start.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-stop.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-stop.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-stop.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-stop.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial-stop.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-partial.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone-2.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone-2.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone-2.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone-2.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone-2.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup-clone.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-startup.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop-clone.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop-clone.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop-clone.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop-clone.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop-clone.xml
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop.dot
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop.exp
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop.scores
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop.summary
+%%DATADIR%%/tests/pengine/test10/bundle-order-stop.xml
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-1.dot
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-1.exp
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-1.scores
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-1.summary
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-1.xml
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-2.dot
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-2.exp
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-2.scores
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-2.summary
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-2.xml
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-3.dot
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-3.exp
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-3.scores
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-3.summary
+%%DATADIR%%/tests/pengine/test10/bundle-probe-order-3.xml
+%%DATADIR%%/tests/pengine/test10/bundle-probe-remotes.dot
+%%DATADIR%%/tests/pengine/test10/bundle-probe-remotes.exp
+%%DATADIR%%/tests/pengine/test10/bundle-probe-remotes.scores
+%%DATADIR%%/tests/pengine/test10/bundle-probe-remotes.summary
+%%DATADIR%%/tests/pengine/test10/bundle-probe-remotes.xml
 %%DATADIR%%/tests/pengine/test10/clone-anon-dup.dot
 %%DATADIR%%/tests/pengine/test10/clone-anon-dup.exp
 %%DATADIR%%/tests/pengine/test10/clone-anon-dup.scores
@@ -1340,6 +1431,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/pengine/test10/group9.scores
 %%DATADIR%%/tests/pengine/test10/group9.summary
 %%DATADIR%%/tests/pengine/test10/group9.xml
+%%DATADIR%%/tests/pengine/test10/guest-node-host-dies.dot
+%%DATADIR%%/tests/pengine/test10/guest-node-host-dies.exp
+%%DATADIR%%/tests/pengine/test10/guest-node-host-dies.scores
+%%DATADIR%%/tests/pengine/test10/guest-node-host-dies.summary
+%%DATADIR%%/tests/pengine/test10/guest-node-host-dies.xml
 %%DATADIR%%/tests/pengine/test10/history-1.dot
 %%DATADIR%%/tests/pengine/test10/history-1.exp
 %%DATADIR%%/tests/pengine/test10/history-1.scores
@@ -1700,6 +1796,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/pengine/test10/master-role.scores
 %%DATADIR%%/tests/pengine/test10/master-role.summary
 %%DATADIR%%/tests/pengine/test10/master-role.xml
+%%DATADIR%%/tests/pengine/test10/master-score-startup.dot
+%%DATADIR%%/tests/pengine/test10/master-score-startup.exp
+%%DATADIR%%/tests/pengine/test10/master-score-startup.scores
+%%DATADIR%%/tests/pengine/test10/master-score-startup.summary
+%%DATADIR%%/tests/pengine/test10/master-score-startup.xml
 %%DATADIR%%/tests/pengine/test10/master-stop.dot
 %%DATADIR%%/tests/pengine/test10/master-stop.exp
 %%DATADIR%%/tests/pengine/test10/master-stop.scores
@@ -1855,6 +1956,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/pengine/test10/migrate-success.scores
 %%DATADIR%%/tests/pengine/test10/migrate-success.summary
 %%DATADIR%%/tests/pengine/test10/migrate-success.xml
+%%DATADIR%%/tests/pengine/test10/migrate-versioned.dot
+%%DATADIR%%/tests/pengine/test10/migrate-versioned.exp
+%%DATADIR%%/tests/pengine/test10/migrate-versioned.scores
+%%DATADIR%%/tests/pengine/test10/migrate-versioned.summary
+%%DATADIR%%/tests/pengine/test10/migrate-versioned.xml
+%%DATADIR%%/tests/pengine/test10/migration-behind-migrating-remote.dot
+%%DATADIR%%/tests/pengine/test10/migration-behind-migrating-remote.exp
+%%DATADIR%%/tests/pengine/test10/migration-behind-migrating-remote.scores
+%%DATADIR%%/tests/pengine/test10/migration-behind-migrating-remote.summary
+%%DATADIR%%/tests/pengine/test10/migration-behind-migrating-remote.xml
 %%DATADIR%%/tests/pengine/test10/minimal.dot
 %%DATADIR%%/tests/pengine/test10/minimal.exp
 %%DATADIR%%/tests/pengine/test10/minimal.scores
@@ -2000,6 +2111,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/pengine/test10/obsolete-lrm-resource.scores
 %%DATADIR%%/tests/pengine/test10/obsolete-lrm-resource.summary
 %%DATADIR%%/tests/pengine/test10/obsolete-lrm-resource.xml
+%%DATADIR%%/tests/pengine/test10/on-fail-ignore.dot
+%%DATADIR%%/tests/pengine/test10/on-fail-ignore.exp
+%%DATADIR%%/tests/pengine/test10/on-fail-ignore.scores
+%%DATADIR%%/tests/pengine/test10/on-fail-ignore.summary
+%%DATADIR%%/tests/pengine/test10/on-fail-ignore.xml
 %%DATADIR%%/tests/pengine/test10/one-or-more-0.dot
 %%DATADIR%%/tests/pengine/test10/one-or-more-0.exp
 %%DATADIR%%/tests/pengine/test10/one-or-more-0.scores
@@ -2040,11 +2156,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/pengine/test10/one-or-more-7.scores
 %%DATADIR%%/tests/pengine/test10/one-or-more-7.summary
 %%DATADIR%%/tests/pengine/test10/one-or-more-7.xml
-%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnnable-instances.dot
-%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnnable-instances.exp
-%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnnable-instances.scores
-%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnnable-instances.summary
-%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnnable-instances.xml
+%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnable-instances.dot
+%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnable-instances.exp
+%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnable-instances.scores
+%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnable-instances.summary
+%%DATADIR%%/tests/pengine/test10/one-or-more-unrunnable-instances.xml
 %%DATADIR%%/tests/pengine/test10/order-clone.dot
 %%DATADIR%%/tests/pengine/test10/order-clone.exp
 %%DATADIR%%/tests/pengine/test10/order-clone.scores
@@ -2201,6 +2317,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/pengine/test10/per-node-attrs.scores
 %%DATADIR%%/tests/pengine/test10/per-node-attrs.summary

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list