net/pacemaker2: update 2.0.4 to 2.1.0
* github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.0
This commit is contained in:
parent
eeb55bec37
commit
5748cb590d
6 changed files with 4080 additions and 3857 deletions
|
@ -1,6 +1,6 @@
|
|||
# Created by: David Shane Holden <dpejesh@yahoo.com>
|
||||
|
||||
PORTVERSION= 2.0.4
|
||||
PORTVERSION= 2.1.0
|
||||
PKGNAMESUFFIX= 2
|
||||
|
||||
.include "${.CURDIR}/../pacemaker1/Makefile.common"
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1592858530
|
||||
SHA256 (ClusterLabs-pacemaker-Pacemaker-2.0.4_GH0.tar.gz) = dccc37190230e1ee645966d279f90ea989f44f4c619274684bef4ccb6de6f371
|
||||
SIZE (ClusterLabs-pacemaker-Pacemaker-2.0.4_GH0.tar.gz) = 5134516
|
||||
TIMESTAMP = 1628943006
|
||||
SHA256 (ClusterLabs-pacemaker-Pacemaker-2.1.0_GH0.tar.gz) = 9ebf5925a6720cca49c90ce9f0dd6e7cbcf41739e9915f33a00e0a12e63bb494
|
||||
SIZE (ClusterLabs-pacemaker-Pacemaker-2.1.0_GH0.tar.gz) = 5032674
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
--- daemons/execd/Makefile.am.orig 2018-05-01 12:13:29 UTC
|
||||
--- daemons/execd/Makefile.am.orig 2021-08-14 12:30:33 UTC
|
||||
+++ daemons/execd/Makefile.am
|
||||
@@ -11,8 +11,6 @@ halibdir = $(CRM_DAEMON_DIR)
|
||||
|
||||
halib_PROGRAMS = pacemaker-execd cts-exec-helper
|
||||
@@ -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
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- daemons/pacemakerd/Makefile.am.orig 2018-05-01 12:13:51 UTC
|
||||
+++ daemons/pacemakerd/Makefile.am
|
||||
@@ -9,8 +9,6 @@ include $(top_srcdir)/Makefile.common
|
||||
|
||||
if BUILD_CS_SUPPORT
|
||||
|
||||
-initdir = $(INITDIR)
|
||||
-init_SCRIPTS = pacemaker
|
||||
sbin_PROGRAMS = pacemakerd
|
||||
|
||||
if BUILD_SYSTEMD
|
|
@ -1,29 +1,33 @@
|
|||
--- tools/cibsecret.in.orig 2020-06-22 21:03:03 UTC
|
||||
--- tools/cibsecret.in.orig 2021-08-14 12:21:28 UTC
|
||||
+++ tools/cibsecret.in
|
||||
@@ -138,7 +138,7 @@ info() {
|
||||
@@ -152,8 +152,8 @@ info() {
|
||||
}
|
||||
|
||||
check_env() {
|
||||
- which md5sum >/dev/null 2>&1 ||
|
||||
- fatal $CRM_EX_NOT_INSTALLED "please install md5sum to run $PROG"
|
||||
+ which md5 >/dev/null 2>&1 ||
|
||||
fatal "please install md5sum to run $PROG"
|
||||
+ fatal $CRM_EX_NOT_INSTALLED "please install md5 to run $PROG"
|
||||
if which pssh >/dev/null 2>&1; then
|
||||
rsh=pssh_fun
|
||||
@@ -300,7 +300,7 @@ localfiles() {
|
||||
rcp_to_from=pscp_fun
|
||||
@@ -328,8 +328,8 @@ localfiles() {
|
||||
;;
|
||||
|
||||
set)
|
||||
- LF_SUM="$(printf %s "$LF_VALUE" | md5sum)" ||
|
||||
- fatal $CRM_EX_ERROR "md5sum failed to produce hash for resource $LF_RSC parameter $LF_PARAM"
|
||||
+ LF_SUM="$(printf %s "$LF_VALUE" | md5)" ||
|
||||
fatal "md5sum failed to produce hash for resource $LF_RSC parameter $LF_PARAM"
|
||||
+ fatal $CRM_EX_ERROR "md5 failed to produce hash for resource $LF_RSC parameter $LF_PARAM"
|
||||
LF_SUM="$(echo "$LF_SUM" | awk '{print $1}')"
|
||||
mkdir -p "$(dirname "$LF_FILE")" &&
|
||||
@@ -338,7 +338,7 @@ cibsecret_check() {
|
||||
echo "$LF_VALUE" > "$LF_FILE" &&
|
||||
@@ -370,7 +370,7 @@ cibsecret_check() {
|
||||
[ "$CSC_LOCAL_SUM" ] ||
|
||||
fatal "no MD5 hash for resource $rsc parameter $param"
|
||||
fatal $CRM_EX_OSFILE "no MD5 hash for resource $rsc parameter $param"
|
||||
CSC_LOCAL_VALUE="$(localfiles get "$rsc" "$param")"
|
||||
- CSC_CALC_SUM="$(printf "%s" "$CSC_LOCAL_VALUE" | md5sum | awk '{print $1}')"
|
||||
+ CSC_CALC_SUM="$(printf "%s" "$CSC_LOCAL_VALUE" | md5 | awk '{print $1}')"
|
||||
[ "$CSC_CALC_SUM" = "$CSC_LOCAL_SUM" ] ||
|
||||
fatal "MD5 hash mismatch for resource $rsc parameter $param"
|
||||
fatal $CRM_EX_DIGEST "MD5 hash mismatch for resource $rsc parameter $param"
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue