* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/
@ 2017-02-10 22:34 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-02-10 22:34 UTC (permalink / raw
To: gentoo-commits
commit: f9289de293c88909af80c69f2ff6f602bc0b127f
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 15:56:52 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 22:33:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9289de2
sys-cluster/pacemaker: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3900
.../pacemaker/files/1.0.12-BUILD_VERSION.patch | 43 ----------------------
sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch | 13 -------
.../files/1.1.8-backwards_compatibility.patch | 36 ------------------
.../files/pacemaker-1.0.10-asneeded.patch | 22 -----------
.../files/pacemaker-1.0.10-installpaths.patch | 9 -----
5 files changed, 123 deletions(-)
diff --git a/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch b/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch
deleted file mode 100644
index 8e52664482..0000000000
--- a/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# HG changeset patch
-# Parent d90c3d4786da4cfa7944c9009a0071e3ea6f8581
-
-diff -r d90c3d4786da configure.ac
---- a/configure.ac Wed Jun 13 11:43:31 2012 +0900
-+++ b/configure.ac Wed Jun 13 11:44:38 2012 +0900
-@@ -464,20 +464,26 @@
- AC_DEFINE_UNQUOTED(STONITH_PLUGIN_DIR,"$STONITH_PLUGIN_DIR", Location for Stonith plugins)
- AC_SUBST(STONITH_PLUGIN_DIR)
-
--AC_PATH_PROGS(HG, hg false)
-+AC_PATH_PROGS(GIT, git false)
- AC_MSG_CHECKING(build version)
--BUILD_VERSION=unknown
--if test -f $srcdir/.hg_archival.txt; then
-- BUILD_VERSION=`cat $srcdir/.hg_archival.txt | awk '/node:/ { print $2 }'`
--elif test -x $HG -a -d .hg; then
-- BUILD_VERSION=`$HG id -itb`
-- if test $? != 0; then
-- BUILD_VERSION=unknown
-- fi
-+
-+BUILD_VERSION=$Format:%H$
-+if test $BUILD_VERSION != ":%H$"; then
-+ AC_MSG_RESULT(archive hash: $BUILD_VERSION)
-+
-+elif test -x $GIT -a -d .git; then
-+ BUILD_VERSION=`$GIT log --pretty="format:%h" -n 1`
-+ AC_MSG_RESULT(git hash: $BUILD_VERSION)
-+
-+else
-+ # The current directory name make a reasonable default
-+ # Most generated archives will include the hash or tag
-+ BASE=`basename $PWD`
-+ BUILD_VERSION=`echo $BASE | sed s:.*[[Pp]]acemaker-::`
-+ AC_MSG_RESULT(directory based hash: $BUILD_VERSION)
- fi
-
- AC_DEFINE_UNQUOTED(BUILD_VERSION, "$BUILD_VERSION", Build version)
--AC_MSG_RESULT($BUILD_VERSION)
- AC_SUBST(BUILD_VERSION)
-
- dnl ===============================================
diff --git a/sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch b/sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch
deleted file mode 100644
index 73ffd0614c..0000000000
--- a/sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix building with glibc-2.16
-
-https://bugs.gentoo.org/show_bug.cgi?id=432012
---- a/mcp/pacemaker.h
-+++ b/mcp/pacemaker.h
-@@ -21,6 +21,7 @@
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
-
- #include <stdint.h>
-
diff --git a/sys-cluster/pacemaker/files/1.1.8-backwards_compatibility.patch b/sys-cluster/pacemaker/files/1.1.8-backwards_compatibility.patch
deleted file mode 100644
index d4a5780c01..0000000000
--- a/sys-cluster/pacemaker/files/1.1.8-backwards_compatibility.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/lib/cluster/legacy.c 2012-11-08 11:55:09.297354491 +0100
-+++ b/lib/cluster/legacy.c 2012-11-08 11:54:57.507587115 +0100
-@@ -1362,17 +1362,27 @@
- /* If we can still talk to our peer process on that node,
- * then its also part of the corosync membership
- */
-- crm_trace("%s: processes=%.16x", node->uname, node->processes);
-+ crm_trace("%s: processes=%.8x", node->uname, node->processes);
- return TRUE;
-
-- } else if(is_classic_ais_cluster() && (node->processes & crm_proc_plugin) == 0) {
-- crm_trace("%s: processes=%.16x", node->uname, node->processes);
-- return FALSE;
-+ } else if(is_classic_ais_cluster()) {
-+ if(node->processes < crm_proc_none) {
-+ crm_debug("%s: unknown process list, assuming active for now", node->uname);
-+ return TRUE;
-+
-+ } else if(is_set(node->processes, crm_proc_none)) {
-+ crm_debug("%s: all processes are inactive", node->uname);
-+ return FALSE;
-+
-+ } else if(is_not_set(node->processes, crm_proc_plugin)) {
-+ crm_trace("%s: processes=%.8x", node->uname, node->processes);
-+ return FALSE;
-+ }
- }
-
- proc = text2proc(crm_system_name);
-- if(proc != crm_proc_none && (node->processes & proc) == 0) {
-- crm_trace("%s: proc %.16x not in %.16x", node->uname, proc, node->processes);
-+ if(proc > crm_proc_none && (node->processes & proc) == 0) {
-+ crm_trace("%s: proc %.8x not in %.8x", node->uname, proc, node->processes);
- return FALSE;
- }
-
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch
deleted file mode 100644
index ac26550493..0000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -23,7 +23,7 @@
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
- DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
-
--SUBDIRS = debian $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc
-+SUBDIRS = $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc
-
- doc_DATA = AUTHORS COPYING COPYING.LIB
-
---- lib/pengine/Makefile.am
-+++ lib/pengine/Makefile.am
-@@ -34,7 +34,7 @@
-
- libpe_status_la_LDFLAGS = -version-info 2:0:0
- libpe_status_la_SOURCES = $(rule_files) $(status_files)
--libpe_status_la_LIBADD = -llrm
-+libpe_status_la_LIBADD = -llrm @CURSESLIBS@
-
- clean-generic:
- rm -f *.log *.debug *~
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch
deleted file mode 100644
index 5187b7967e..0000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- extra/Makefile.am
-+++ extra/Makefile.am
-@@ -20,5 +20,5 @@
-
- SUBDIRS = resources
-
--mibdir = $(datadir)/snmp/mibs
-+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
- mib_DATA = PCMK-MIB.txt
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/
@ 2018-02-11 16:43 Alexys Jacob
0 siblings, 0 replies; 5+ messages in thread
From: Alexys Jacob @ 2018-02-11 16:43 UTC (permalink / raw
To: gentoo-commits
commit: a4b74a98d540fe57489b4995740b492196389b2a
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Feb 1 17:07:45 2018 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 16:43:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b74a98
sys-cluster/pacemaker: remove unused file
Closes: https://github.com/gentoo/gentoo/pull/7016
sys-cluster/pacemaker/files/ping | 380 ---------------------------------------
1 file changed, 380 deletions(-)
diff --git a/sys-cluster/pacemaker/files/ping b/sys-cluster/pacemaker/files/ping
deleted file mode 100644
index 52c4c3d4cad..00000000000
--- a/sys-cluster/pacemaker/files/ping
+++ /dev/null
@@ -1,380 +0,0 @@
-#!/bin/sh
-#
-#
-# Ping OCF RA that utilizes the system ping
-#
-# Copyright (c) 2009 Andrew Beekhof
-# All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like. Any license provided herein, whether implied or
-# otherwise, applies only to this software file. Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-
-#######################################################################
-# Initialization:
-
-: ${OCF_FUNCTIONS=${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs}
-. ${OCF_FUNCTIONS}
-: ${__OCF_ACTION=$1}
-
-#######################################################################
-
-meta_data() {
- cat <<END
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="ping">
-<version>1.0</version>
-
-<longdesc lang="en">
-Every time the monitor action is run, this resource agent records (in the CIB) the current number of ping nodes the host can connect to.
-It is essentially the same as pingd except that it uses the system ping tool to obtain the results.
-</longdesc>
-<shortdesc lang="en">node connectivity</shortdesc>
-
-<parameters>
-
-<parameter name="pidfile" unique="0">
-<longdesc lang="en">PID file</longdesc>
-<shortdesc lang="en">PID file</shortdesc>
-<content type="string" default="$HA_VARRUN/ping-${OCF_RESOURCE_INSTANCE}" />
-</parameter>
-
-<parameter name="dampen" unique="0">
-<longdesc lang="en">
-The time to wait (dampening) further changes occur
-</longdesc>
-<shortdesc lang="en">Dampening interval</shortdesc>
-<content type="integer" default="5s"/>
-</parameter>
-
-<parameter name="name" unique="0">
-<longdesc lang="en">
-The name of the attributes to set. This is the name to be used in the constraints.
-</longdesc>
-<shortdesc lang="en">Attribute name</shortdesc>
-<content type="string" default="pingd"/>
-</parameter>
-
-<parameter name="multiplier" unique="0">
-<longdesc lang="en">
-The number by which to multiply the number of connected ping nodes by
-</longdesc>
-<shortdesc lang="en">Value multiplier</shortdesc>
-<content type="integer" default=""/>
-</parameter>
-
-<parameter name="host_list" unique="0" required="1">
-<longdesc lang="en">
-The list of ping nodes to count.
-</longdesc>
-<shortdesc lang="en">Host list</shortdesc>
-<content type="string" default=""/>
-</parameter>
-
-<parameter name="attempts" unique="0">
-<longdesc lang="en">
-Number of ping attempts, per host, before declaring it dead
-</longdesc>
-<shortdesc lang="en">no. of ping attempts</shortdesc>
-<content type="integer" default="2"/>
-</parameter>
-
-<parameter name="timeout" unique="0">
-<longdesc lang="en">
-How long, in seconds, to wait before declaring a ping lost
-</longdesc>
-<shortdesc lang="en">ping timeout in seconds</shortdesc>
-<content type="integer" default="2"/>
-</parameter>
-
-<parameter name="options" unique="0">
-<longdesc lang="en">
-A catch all for any other options that need to be passed to ping.
-</longdesc>
-<shortdesc lang="en">Extra Options</shortdesc>
-<content type="string" default=""/>
-</parameter>
-
-<parameter name="failure_score" unique="0">
-<longdesc lang="en">
-Resource is failed if the score is less than failure_score.
-Default never fails.
-</longdesc>
-<shortdesc lang="en">failure_score</shortdesc>
-<content type="integer" default=""/>
-</parameter>
-
-<parameter name="debug" unique="0">
-<longdesc lang="en">
-Enables to use default attrd_updater verbose logging on every call.
-</longdesc>
-<shortdesc lang="en">Verbose logging</shortdesc>
-<content type="string" default="false"/>
-</parameter>
-
-</parameters>
-
-<actions>
-<action name="start" timeout="60" />
-<action name="stop" timeout="20" />
-<action name="reload" timeout="100" />
-<action name="monitor" depth="0" timeout="60" interval="10"/>
-<action name="meta-data" timeout="5" />
-<action name="validate-all" timeout="30" />
-</actions>
-</resource-agent>
-END
-}
-
-#######################################################################
-
-ping_conditional_log() {
- level=$1; shift
- if [ ${OCF_RESKEY_debug} = "true" ]; then
- ocf_log $level "$*"
- fi
-}
-
-ping_usage() {
- cat <<END
-usage: $0 {start|stop|monitor|migrate_to|migrate_from|validate-all|meta-data}
-
-Expects to have a fully populated OCF RA-compliant environment set.
-END
-}
-
-ping_start() {
- ping_monitor
- if [ $? = $OCF_SUCCESS ]; then
- return $OCF_SUCCESS
- fi
- touch ${OCF_RESKEY_pidfile}
- ping_update
-}
-
-ping_stop() {
-
- rm -f ${OCF_RESKEY_pidfile}
-
- attrd_updater -D -n $OCF_RESKEY_name -d $OCF_RESKEY_dampen $attrd_options
-
- return $OCF_SUCCESS
-}
-
-ping_monitor() {
- if [ -f ${OCF_RESKEY_pidfile} ]; then
- ping_update
- if [ $? -eq 0 ]; then
- return $OCF_SUCCESS
- fi
- return $OCF_ERR_GENERIC
- fi
- return $OCF_NOT_RUNNING
-}
-
-ping_validate() {
- # Is the state directory writable?
- state_dir=`dirname "$OCF_RESKEY_pidfile"`
- touch "$state_dir/$$"
- if [ $? != 0 ]; then
- ocf_log err "Invalid location for 'state': $state_dir is not writable"
- return $OCF_ERR_ARGS
- fi
- rm "$state_dir/$$"
-
-# Pidfile better be an absolute path
- case $OCF_RESKEY_pidfile in
- /*) ;;
- *) ocf_log warn "You should use an absolute path for pidfile not: $OCF_RESKEY_pidfile" ;;
- esac
-
-# Check the host list
- if [ "x" = "x$OCF_RESKEY_host_list" ]; then
- ocf_log err "Empty host_list. Please specify some nodes to ping"
- exit $OCF_ERR_CONFIGURED
- fi
-
- check_binary ping
-
- return $OCF_SUCCESS
-}
-
-
-fping_check() {
- active=0
- f_out=`mktemp`
- f_err=`mktemp`
-
- n=$OCF_RESKEY_attempts
- timeout=`expr $OCF_RESKEY_timeout \* 1000 / $OCF_RESKEY_attempts`
-
- cmd="fping -r $OCF_RESKEY_attempts -t $timeout -B 1.0 $OCF_RESKEY_host_list"
- $cmd>$f_out 2>$f_err; rc=$?
- active=`grep alive $f_out|wc -l`
-
- case $rc in
- 0)
- ;;
- 1)
- for h in `grep unreachable $f_out | awk '{print $1}'`; do
- ping_conditional_log warn "$h is inactive"
- done
- ;;
- *)
- ocf_log err "Unexpected result for '$cmd' $rc: `tr '\n' ';' < $f_err`"
- ;;
- esac
- rm -f $f_out $f_err
-
- return $active
-}
-
-ping_check() {
- active=0
- for host in $OCF_RESKEY_host_list; do
- p_exe=ping
-
- case `uname` in
- Linux) p_args="-n -q -W $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts";;
- Darwin) p_args="-n -q -t $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts -o";;
- *) ocf_log err "Unknown host type: `uname`"; exit $OCF_ERR_INSTALLED;;
- esac
-
- case $host in
- *:*) p_exe=ping6
- esac
-
- p_out=`$p_exe $p_args $OCF_RESKEY_options $host 2>&1`; rc=$?
-
- case $rc in
- 0) active=`expr $active + 1`;;
- 1) ping_conditional_log warn "$host is inactive: $p_out";;
- *) ocf_log err "Unexpected result for '$p_exe $p_args $OCF_RESKEY_options $host' $rc: $p_out";;
- esac
- done
- return $active
-}
-
-ping_update() {
-
- if have_binary fping; then
- fping_check
- active=$?
- else
- ping_check
- active=$?
- fi
-
- score=`expr $active \* $OCF_RESKEY_multiplier`
- attrd_updater -n $OCF_RESKEY_name -v $score -d $OCF_RESKEY_dampen $attrd_options
- rc=$?
- case $rc in
- 0) ping_conditional_log debug "Updated $OCF_RESKEY_name = $score" ;;
- *) ocf_log warn "Could not update $OCF_RESKEY_name = $score: rc=$rc";;
- esac
- if [ $rc -ne 0 ]; then
- return $rc
- fi
-
- if [ -n "$OCF_RESKEY_failure_score" -a "$score" -lt "$OCF_RESKEY_failure_score" ]; then
- ocf_log warn "$OCF_RESKEY_name is less than failure_score($OCF_RESKEY_failure_score)"
- return 1
- fi
- return 0
-}
-
-: ${OCF_RESKEY_name:="pingd"}
-: ${OCF_RESKEY_dampen:="5s"}
-: ${OCF_RESKEY_attempts:="3"}
-: ${OCF_RESKEY_multiplier:="1"}
-: ${OCF_RESKEY_debug:="false"}
-: ${OCF_RESKEY_failure_score:="0"}
-
-: ${OCF_RESKEY_CRM_meta_timeout:="20000"}
-: ${OCF_RESKEY_CRM_meta_globally_unique:="true"}
-
-integer=`echo ${OCF_RESKEY_timeout} | egrep -o '[0-9]*'`
-case ${OCF_RESKEY_timeout} in
- *[0-9]ms|*[0-9]msec) OCF_RESKEY_timeout=`expr $integer / 1000`;;
- *[0-9]m|*[0-9]min) OCF_RESKEY_timeout=`expr $integer \* 60`;;
- *[0-9]h|*[0-9]hr) OCF_RESKEY_timeout=`expr $integer \* 60 \* 60`;;
- *) OCF_RESKEY_timeout=$integer;;
-esac
-
-if [ -z ${OCF_RESKEY_timeout} ]; then
- if [ x"$OCF_RESKEY_host_list" != x ]; then
- host_count=`echo $OCF_RESKEY_host_list | awk '{print NF}'`
- OCF_RESKEY_timeout=`expr $OCF_RESKEY_CRM_meta_timeout / $host_count / $OCF_RESKEY_attempts`
- OCF_RESKEY_timeout=`expr $OCF_RESKEY_timeout / 1100` # Convert to seconds and finish 10% early
- else
- OCF_RESKEY_timeout=5
- fi
-fi
-
-if [ ${OCF_RESKEY_timeout} -lt 1 ]; then
- OCF_RESKEY_timeout=5
-elif [ ${OCF_RESKEY_timeout} -gt 1000 ]; then
- # ping actually complains if this value is too high, 5 minutes is plenty
- OCF_RESKEY_timeout=300
-fi
-
-if [ ${OCF_RESKEY_CRM_meta_globally_unique} = "false" ]; then
- : ${OCF_RESKEY_pidfile:="$HA_VARRUN/ping-${OCF_RESKEY_name}"}
-else
- : ${OCF_RESKEY_pidfile:="$HA_VARRUN/ping-${OCF_RESOURCE_INSTANCE}"}
-fi
-
-case $__OCF_ACTION in
- meta-data)
- meta_data
- exit $OCF_SUCCESS
- ;;
- usage|help)
- ping_usage
- exit $OCF_SUCCESS
- ;;
-esac
-
-attrd_options='-q'
-if ocf_is_true ${OCF_RESKEY_debug} ; then
- attrd_options=''
-fi
-
-# Check the debug option
- case "${OCF_RESKEY_debug}" in
- true|True|TRUE|1) OCF_RESKEY_debug=true;;
- false|False|FALSE|0) OCF_RESKEY_debug=false;;
- *)
- ocf_log warn "Value for 'debug' is incorrect. Please specify 'true' or 'false' not: ${OCF_RESKEY_debug}"
- OCF_RESKEY_debug=false
- ;;
- esac
-
-case $__OCF_ACTION in
-start) ping_start;;
-stop) ping_stop;;
-monitor) ping_monitor;;
-reload) ping_start;;
-validate-all) ping_validate;;
-*) ping_usage
- exit $OCF_ERR_UNIMPLEMENTED
- ;;
-esac
-exit $?
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/
@ 2021-02-08 9:18 Alexys Jacob
0 siblings, 0 replies; 5+ messages in thread
From: Alexys Jacob @ 2021-02-08 9:18 UTC (permalink / raw
To: gentoo-commits
commit: f012a007388b52df96e6121d4336d7b4e4a42697
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 8 09:15:30 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Feb 8 09:18:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f012a007
sys-cluster/pacemaker: drop useless files
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.../files/pacemaker-1.1.24-python-fixes.patch | 26 ----------------------
.../files/pacemaker-1.1.24-qa-warnings.patch | 12 ----------
2 files changed, 38 deletions(-)
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch
deleted file mode 100644
index 2428a399d5f..00000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py
---- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py 2020-10-30 18:35:13.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py 2020-11-10 22:47:21.600435423 +0100
-@@ -125,7 +125,7 @@
- '''
-
- def __init__(self, rsh, silent=False):
-- self.async = []
-+ self.hasync = []
- self.rsh = rsh
- self.silent = silent
- self.logger = LogFactory()
-diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py
---- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py 2020-10-30 18:35:13.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py 2020-11-10 22:46:08.287258247 +0100
-@@ -140,8 +140,8 @@
- self.logger.debug(message)
-
- def harvest(self, delegate=None):
-- async = self.harvest_async(delegate)
-- async.join()
-+ hasync = self.harvest_async(delegate)
-+ hasync.join()
-
- def harvest_async(self, delegate=None):
- self.log("Not implemented")
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch
deleted file mode 100644
index 37346d6a396..00000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac pacemaker-Pacemaker-1.1.24-rc1/configure.ac
---- pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac 2020-10-30 18:35:13.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.24-rc1/configure.ac 2020-11-10 23:21:04.728714112 +0100
-@@ -2198,7 +2198,7 @@
-
- dnl Put the above variables to use
- LIBTOOL="${LIBTOOL} --tag=CC \$(QUIET_LIBTOOL_OPTS)"
--MAKE="${MAKE} \$(QUIET_MAKE_OPTS)"
-+MAKE="${MAKE} ${QUIET_MAKE_OPTS}"
-
- AC_SUBST(CC)
- AC_SUBST(MAKE)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/
@ 2021-02-22 17:58 Alexys Jacob
0 siblings, 0 replies; 5+ messages in thread
From: Alexys Jacob @ 2021-02-22 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 98d919718d74130b74c3a8149fe3b565b04907dd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Feb 22 16:34:27 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 17:57:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d91971
sys-cluster/pacemaker: remove unused file
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19600
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
sys-cluster/pacemaker/files/pacemaker.service | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys-cluster/pacemaker/files/pacemaker.service b/sys-cluster/pacemaker/files/pacemaker.service
deleted file mode 100644
index 6383499ba92..00000000000
--- a/sys-cluster/pacemaker/files/pacemaker.service
+++ /dev/null
@@ -1,5 +0,0 @@
-service {
- # Load the Pacemaker Cluster Resource Manager
- name: pacemaker
- ver: 1
-}
\ No newline at end of file
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/
@ 2022-01-01 10:48 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2022-01-01 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 2ffc0c8f4b8d51222b1ed5638b41ef48cd1de703
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Wed Dec 15 20:04:27 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 10:48:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffc0c8f
sys-cluster/pacemaker: update the pacemaker.initd's copyright
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sys-cluster/pacemaker/files/pacemaker.initd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/pacemaker/files/pacemaker.initd b/sys-cluster/pacemaker/files/pacemaker.initd
index 8dbcea6ce37d..0264d34c25d3 100644
--- a/sys-cluster/pacemaker/files/pacemaker.initd
+++ b/sys-cluster/pacemaker/files/pacemaker.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
PIDFILE=/var/run/pacemaker.pid
@@ -21,7 +21,7 @@ start() {
nc=$(expr $nc + 1)
if [ $nc -gt 30 ]; then
echo
- eend 1 "Failed to detect Corosync startup, is it really running ?"
+ eend 1 "Failed to detect Corosync startup, is it really running?"
exit 1
fi
sleep 1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-01 10:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-01 10:48 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2021-02-22 17:58 Alexys Jacob
2021-02-08 9:18 Alexys Jacob
2018-02-11 16:43 Alexys Jacob
2017-02-10 22:34 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox