git: b100b3c09573 - main - net/pacemaker2: update 2.1.1 to 2.1.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vinícius Zavam <egypcio_at_FreeBSD.org>
Date: Wed, 19 Jan 2022 18:58:21 UTC
The branch main has been updated by egypcio:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b100b3c09573bea629e3c6dadc03a6aee3ad9787

commit b100b3c09573bea629e3c6dadc03a6aee3ad9787
Author:     Vinícius Zavam <egypcio@FreeBSD.org>
AuthorDate: 2022-01-19 18:45:25 +0000
Commit:     Vinícius Zavam <egypcio@FreeBSD.org>
CommitDate: 2022-01-19 18:45:25 +0000

    net/pacemaker2: update 2.1.1 to 2.1.2
    
      * https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.2
---
 net/pacemaker2/Makefile                            |  5 ++++-
 net/pacemaker2/distinfo                            |  6 +++---
 .../files/patch-daemons_execd_Makefile.am          | 13 ------------
 net/pacemaker2/pkg-plist                           | 23 +++++++++++++---------
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
index 9c57a01021eb..59811254cfd0 100644
--- a/net/pacemaker2/Makefile
+++ b/net/pacemaker2/Makefile
@@ -1,6 +1,6 @@
 # Created by: David Shane Holden <dpejesh@yahoo.com>
 
-PORTVERSION=		2.1.1
+PORTVERSION=		2.1.2
 PKGNAMESUFFIX=		2
 
 .include "${.CURDIR}/../pacemaker1/Makefile.common"
@@ -21,4 +21,7 @@ LIB_DEPENDS+=		libffi.so:devel/libffi \
 
 post-patch: post-patch-common
 
+post-install:
+	${RM} ${STAGEDIR}/${PREFIX}/etc/rc.d/pacemaker_remote
+
 .include <bsd.port.mk>
diff --git a/net/pacemaker2/distinfo b/net/pacemaker2/distinfo
index 0f87cac7c23d..2d8e5ac824ba 100644
--- a/net/pacemaker2/distinfo
+++ b/net/pacemaker2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634476324
-SHA256 (ClusterLabs-pacemaker-Pacemaker-2.1.1_GH0.tar.gz) = 312b7b342498de8cf97b03d7a27013cc1755ee5eeb5fcad02a4cff84931fbb92
-SIZE (ClusterLabs-pacemaker-Pacemaker-2.1.1_GH0.tar.gz) = 5057186
+TIMESTAMP = 1642612065
+SHA256 (ClusterLabs-pacemaker-Pacemaker-2.1.2_GH0.tar.gz) = 954bd25aeafb4556df711cab4e8fc648965c8ce013d4c2559aafa2036a7ad2c3
+SIZE (ClusterLabs-pacemaker-Pacemaker-2.1.2_GH0.tar.gz) = 5092063
diff --git a/net/pacemaker2/files/patch-daemons_execd_Makefile.am b/net/pacemaker2/files/patch-daemons_execd_Makefile.am
deleted file mode 100644
index 3b0f2a9988eb..000000000000
--- a/net/pacemaker2/files/patch-daemons_execd_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- daemons/execd/Makefile.am.orig	2021-08-14 12:30:33 UTC
-+++ daemons/execd/Makefile.am
-@@ -23,8 +23,8 @@ pacemaker_execd_SOURCES		= pacemaker-execd.c execd_com
- 				  execd_alerts.c
- 
- if BUILD_REMOTE
--initdir			= $(INITDIR)
--init_SCRIPTS		= pacemaker_remote
-+# initdir		= $(INITDIR)
-+# init_SCRIPTS		= pacemaker_remote
- sbin_PROGRAMS		= pacemaker-remoted
- if BUILD_SYSTEMD
- systemdsystemunit_DATA	= pacemaker_remote.service
diff --git a/net/pacemaker2/pkg-plist b/net/pacemaker2/pkg-plist
index b2418cf7293e..15c20625aef9 100644
--- a/net/pacemaker2/pkg-plist
+++ b/net/pacemaker2/pkg-plist
@@ -39,44 +39,45 @@ include/pacemaker/crm/pengine/rules.h
 include/pacemaker/crm/pengine/rules_compat.h
 include/pacemaker/crm/pengine/status.h
 include/pacemaker/crm/services.h
+include/pacemaker/crm/services_compat.h
 include/pacemaker/crm/stonith-ng.h
 include/pacemaker/crm_config.h
 lib/libcib.a
 lib/libcib.so
 lib/libcib.so.27
-lib/libcib.so.27.2.0
+lib/libcib.so.27.2.1
 lib/libcrmcluster.a
 lib/libcrmcluster.so
 lib/libcrmcluster.so.29
-lib/libcrmcluster.so.29.0.7
+lib/libcrmcluster.so.29.0.8
 lib/libcrmcommon.a
 lib/libcrmcommon.so
 lib/libcrmcommon.so.34
-lib/libcrmcommon.so.34.7.0
+lib/libcrmcommon.so.34.8.0
 lib/libcrmservice.a
 lib/libcrmservice.so
 lib/libcrmservice.so.28
-lib/libcrmservice.so.28.2.4
+lib/libcrmservice.so.28.2.5
 lib/liblrmd.a
 lib/liblrmd.so
 lib/liblrmd.so.28
-lib/liblrmd.so.28.1.2
+lib/liblrmd.so.28.1.3
 lib/libpacemaker.a
 lib/libpacemaker.so
 lib/libpacemaker.so.1
-lib/libpacemaker.so.1.2.1
+lib/libpacemaker.so.1.3.0
 lib/libpe_rules.a
 lib/libpe_rules.so
 lib/libpe_rules.so.26
-lib/libpe_rules.so.26.3.0
+lib/libpe_rules.so.26.3.1
 lib/libpe_status.a
 lib/libpe_status.so
 lib/libpe_status.so.28
-lib/libpe_status.so.28.4.1
+lib/libpe_status.so.28.4.2
 lib/libstonithd.a
 lib/libstonithd.so
 lib/libstonithd.so.26
-lib/libstonithd.so.26.5.1
+lib/libstonithd.so.26.7.0
 lib/ocf/resource.d/pacemaker/ClusterMon
 lib/ocf/resource.d/pacemaker/Dummy
 lib/ocf/resource.d/pacemaker/HealthCPU
@@ -192,6 +193,7 @@ libexec/pacemaker/pacemaker-schedulerd
 %%MANPAGES%%man/man8/crm_verify.8.gz
 %%MANPAGES%%man/man8/crmadmin.8.gz
 %%MANPAGES%%man/man8/fence_legacy.8.gz
+%%MANPAGES%%man/man8/fence_watchdog.8.gz
 %%MANPAGES%%man/man8/iso8601.8.gz
 %%MANPAGES%%man/man8/pacemaker-remoted.8.gz
 %%MANPAGES%%man/man8/pacemakerd.8.gz
@@ -215,6 +217,7 @@ sbin/crm_ticket
 sbin/crm_verify
 sbin/crmadmin
 sbin/fence_legacy
+sbin/fence_watchdog
 sbin/iso8601
 sbin/pacemaker-remoted
 sbin/pacemaker_remoted
@@ -252,6 +255,7 @@ sbin/stonith_admin
 %%DATADIR%%/api/api-result-2.11.rng
 %%DATADIR%%/api/api-result-2.12.rng
 %%DATADIR%%/api/api-result-2.13.rng
+%%DATADIR%%/api/api-result-2.14.rng
 %%DATADIR%%/api/api-result-next.rng
 %%DATADIR%%/api/api-result.rng
 %%DATADIR%%/api/command-output-1.0.rng
@@ -269,6 +273,7 @@ sbin/stonith_admin
 %%DATADIR%%/api/crm_resource-2.6.rng
 %%DATADIR%%/api/crm_resource-2.7.rng
 %%DATADIR%%/api/crm_resource-2.11.rng
+%%DATADIR%%/api/crm_resource-2.14.rng
 %%DATADIR%%/api/crm_simulate-2.8.rng
 %%DATADIR%%/api/crm_simulate-2.12.rng
 %%DATADIR%%/api/crmadmin-2.4.rng