[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, sys-cluster/pacemaker/files/

2023-05-01 Thread Sam James
commit: 8ccf91cfa8f86ee26dbdec9f88f9fead27f97437
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 12:47:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 12:49:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccf91cf

sys-cluster/pacemaker: drop 2.0.5

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/pacemaker/Manifest |  1 -
 .../files/pacemaker-2.0.4-qa-warnings.patch| 16 -
 sys-cluster/pacemaker/pacemaker-2.0.5.ebuild   | 78 --
 3 files changed, 95 deletions(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index f102e5a0dd85..1151c2b7c809 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,2 +1 @@
-DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 
4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc
 SHA512 
5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba
 DIST Pacemaker-2.1.2.tar.gz 5092063 BLAKE2B 
04689762cd3767fec35fc577b79007e7004411d4bb8676a0410c75619c35d1f158811555ea7d156accbb3e75a427128ab735ca21ad177934634b27fe2837175f
 SHA512 
5c30ac5c371bb1f37215a9cf3e2eec701f7e4133252401dd2793b0908f2192de1d0b625cc37d84dfc9fd0885039c4d88e617110135c5e1a16c40cd3218603c26

diff --git a/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch 
b/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch
deleted file mode 100644
index 33cf74d73260..
--- a/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur pacemaker-Pacemaker-2.0.4.orig/extra/resources/pingd 
pacemaker-Pacemaker-2.0.4/extra/resources/pingd
 pacemaker-Pacemaker-2.0.4.orig/extra/resources/pingd   2020-07-13 
22:30:01.503255159 +0200
-+++ pacemaker-Pacemaker-2.0.4/extra/resources/pingd2020-07-13 
22:33:27.434714056 +0200
-@@ -25,8 +25,10 @@
- : ${OCF_RESKEY_interval:="1"}
- : ${OCF_RESKEY_CRM_meta_interval:=0}
- 
--ocf_log err "This agent (ocf:pacemaker:pingd) is deprecated, does not work, 
and"
--ocf_log err "will be removed in a future release (use ocf:pacemaker:ping 
instead)"
-+if [ "$__OCF_ACTION" != "meta-data" ]; then
-+ocf_log err "This agent (ocf:pacemaker:pingd) is deprecated, does not 
work, and"
-+ocf_log err "will be removed in a future release (use ocf:pacemaker:ping 
instead)"
-+fi
- 
- case "$__OCF_ACTION" in
- start|monitor)

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
deleted file mode 100644
index e6b03f87389b..
--- a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_9 )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="acl smtp snmp"
-
-DEPEND="${PYTHON_DEPS}
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt
-   >=sys-cluster/cluster-glue-1.0.12-r1
-   >=sys-cluster/libqb-2.0.0:=
-   sys-cluster/resource-agents
-   sys-cluster/corosync
-   smtp? ( net-libs/libesmtp )
-   snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-   default
-   sed -i -e "s/ -ggdb//g" configure.ac || die
-   eautoreconf
-}
-
-src_configure() {
-   # appends lib to localstatedir automatically
-   local myconf=(
-   --with-ocfdir=/usr/$(get_libdir)/ocf
-   --localstatedir=/var
-   --disable-fatal-warnings
-   --disable-static
-   --without-cs-quorum
-   --without-cman
-   --without-heartbeat
-   --with-corosync
-   --with-ais
-   $(use_with acl)
-   $(use_with smtp esmtp)
-   $(use_with snmp)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-   python_optimize
-   rm -rf "${D}/var/run" "${D}/etc/init.d"
-
-   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-   keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
-   keepdir /var/log/pacemaker/bundles
-
-   find "${D}" -name '*.la' -delete || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2022-06-06 Thread Sam James
commit: 7f62958e2a13f08c2329d69e3dfe51bdd96aafc9
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 05:21:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 05:21:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f62958e

sys-cluster/pacemaker: Stabilize 2.1.2 x86, #850196

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/pacemaker/pacemaker-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
index 3988bfdc232d..270ade6cbff5 100644
--- a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2+ LGPL-2.1+ BSD CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="acl smtp snmp"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2022-06-06 Thread Sam James
commit: ba31a149e846e6bca868afc337803df97c9c546b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 05:21:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 05:21:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba31a149

sys-cluster/pacemaker: Stabilize 2.1.2 amd64, #850196

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/pacemaker/pacemaker-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
index 7b55439ffbdc..3988bfdc232d 100644
--- a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2+ LGPL-2.1+ BSD CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="acl smtp snmp"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2022-06-06 Thread Sam James
commit: bb466055356038a9b86eefcd12411e7bb2b8d43b
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Apr  7 14:53:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 02:30:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb466055

sys-cluster/pacemaker: force remove /etc/init.d

Closes: https://bugs.gentoo.org/830406
Signed-off-by: Alessandro Barbieri  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24944
Signed-off-by: Sam James  gentoo.org>

 sys-cluster/pacemaker/pacemaker-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
index 7afdf78f7d25..7b55439ffbdc 100644
--- a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
@@ -65,7 +65,7 @@ src_install() {
python_optimize
 
# remove provided initd file as we need support for OpenRC
-   rm -r "${ED}/etc/init.d" || die "Failed to remove old initd"
+   rm -rf "${ED}/etc/init.d" || die "Failed to remove old initd"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 
keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2022-01-01 Thread Ulrich Müller
commit: f57a5bbc8877fe7ee6a6e92b511caac16b64001c
Author: Marco Scardovi  scardovi  com>
AuthorDate: Sat Jan  1 13:26:57 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  1 13:38:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57a5bbc

sys-cluster/pacemaker: fix build

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://bugs.gentoo.org/830399
Signed-off-by: Marco Scardovi  scardovi.com>
Signed-off-by: Ulrich Müller  gentoo.org>

 sys-cluster/pacemaker/pacemaker-2.1.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
index cce5b69b1d0a..7afdf78f7d25 100644
--- a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ DESCRIPTION="Pacemaker CRM"
 HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
 SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+ BSD CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="acl smtp snmp"
@@ -65,7 +65,7 @@ src_install() {
python_optimize
 
# remove provided initd file as we need support for OpenRC
-   rm -r "${ED}/var/run" "${ED}/etc/init.d" || die "Failed to remove old 
initd"
+   rm -r "${ED}/etc/init.d" || die "Failed to remove old initd"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 
keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/

2022-01-01 Thread Ulrich Müller
commit: 2ffc0c8f4b8d51222b1ed5638b41ef48cd1de703
Author: Marco Scardovi  scardovi  com>
AuthorDate: Wed Dec 15 20:04:27 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  1 10:48:03 2022 +
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  scardovi.com>
Signed-off-by: Ulrich Müller  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



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2022-01-01 Thread Ulrich Müller
commit: bb74aef6ad00a1e26ccc5d8d10328dd5bf1ae3f7
Author: Marco Scardovi  scardovi  com>
AuthorDate: Sun Dec 12 06:45:14 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  1 10:48:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb74aef6

sys-cluster/pacemaker: bump to 2.1.2 and EAPI 8

Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Marco Scardovi  scardovi.com>
Signed-off-by: Ulrich Müller  gentoo.org>

 sys-cluster/pacemaker/Manifest   |  1 +
 sys-cluster/pacemaker/pacemaker-2.1.2.ebuild | 75 
 2 files changed, 76 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index f786c4c0da80..f102e5a0dd85 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1 +1,2 @@
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 
4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc
 SHA512 
5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba
+DIST Pacemaker-2.1.2.tar.gz 5092063 BLAKE2B 
04689762cd3767fec35fc577b79007e7004411d4bb8676a0410c75619c35d1f158811555ea7d156accbb3e75a427128ab735ca21ad177934634b27fe2837175f
 SHA512 
5c30ac5c371bb1f37215a9cf3e2eec701f7e4133252401dd2793b0908f2192de1d0b625cc37d84dfc9fd0885039c4d88e617110135c5e1a16c40cd3218603c26

diff --git a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
new file mode 100644
index ..cce5b69b1d0a
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-single-r1
+
+MY_P="${PN^}-${PV/_/-}"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl smtp snmp"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   >=sys-cluster/cluster-glue-1.0.12-r1
+   >=sys-cluster/libqb-2.0.0:=
+   sys-cluster/resource-agents
+   sys-cluster/corosync
+   smtp? ( net-libs/libesmtp )
+   snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   # appends lib to localstatedir automatically
+   local myconf=(
+   --with-ocfdir=/usr/$(get_libdir)/ocf
+   --localstatedir=/var
+   --disable-fatal-warnings
+   --disable-static
+   --without-cs-quorum
+   --without-cman
+   --without-heartbeat
+   --with-corosync
+   --with-ais
+   $(use_with acl)
+   $(use_with smtp esmtp)
+   $(use_with snmp)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+   python_optimize
+
+   # remove provided initd file as we need support for OpenRC
+   rm -r "${ED}/var/run" "${ED}/etc/init.d" || die "Failed to remove old 
initd"
+   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+   keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+   keepdir /var/log/pacemaker/bundles
+
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/

2021-02-22 Thread Alexys Jacob
commit: 98d919718d74130b74c3a8149fe3b565b04907dd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Feb 22 16:34:27 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Mon Feb 22 17:57:37 2021 +
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  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19600
Signed-off-by: Alexys Jacob  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..000
--- 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



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/

2021-02-08 Thread Alexys Jacob
commit: f012a007388b52df96e6121d4336d7b4e4a42697
Author: Alexys Jacob  gentoo  org>
AuthorDate: Mon Feb  8 09:15:30 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Mon Feb  8 09:18:21 2021 +
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  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..000
--- 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.0 +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.0 +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..000
--- 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.0 +0100
-+++ pacemaker-Pacemaker-1.1.24-rc1/configure.ac2020-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)



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2021-02-08 Thread Alexys Jacob
commit: 63c170e5d231fa90279bb8cc967a19970cc495bf
Author: Alexys Jacob  gentoo  org>
AuthorDate: Mon Feb  8 09:14:27 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Mon Feb  8 09:17:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c170e5

sys-cluster/pacemaker: drop old wrt #711674 #751430

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alexys Jacob  gentoo.org>

 sys-cluster/pacemaker/Manifest|  1 -
 sys-cluster/pacemaker/pacemaker-1.1.24.ebuild | 80 ---
 2 files changed, 81 deletions(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 70e7d979222..f786c4c0da8 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,2 +1 @@
-DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B 
cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316
 SHA512 
6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 
4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc
 SHA512 
5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
deleted file mode 100644
index 994c508fc65..000
--- a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="acl smtp snmp"
-
-DEPEND="${PYTHON_DEPS}
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt
-   sys-cluster/cluster-glue
-   sys-cluster/corosync
-   >=sys-cluster/libqb-0.14.0
-   sys-cluster/resource-agents
-
-   smtp?   ( net-libs/libesmtp )
-   snmp?   ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.1.24-python-fixes.patch
-   "${FILESDIR}"/${PN}-1.1.24-qa-warnings.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-   default
-   sed -i -e "s/ -ggdb//g" configure.ac || die
-   eautoreconf
-   python_fix_shebang .
-}
-
-src_configure() {
-   # appends lib to localstatedir automatically
-   local myconf=(
-   --localstatedir=/var
-   --disable-fatal-warnings
-   --disable-static
-   --without-cs-quorum
-   --without-cman
-   $(use_with acl)
-   --without-heartbeat
-   $(use_with smtp esmtp)
-   $(use_with snmp)
-   --with-ais
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-   rm -rf "${D}/var/run" "${D}/etc/init.d"
-   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-   if has_version "

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2021-02-03 Thread Thomas Deutschmann
commit: 93af5c67756072a8746b0b8ee459585767c0e032
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Feb  3 20:19:00 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Feb  3 20:19:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93af5c67

sys-cluster/pacemaker: x86 stable (bug #711674)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-cluster/pacemaker/pacemaker-2.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
index 8dfa4cc494f..262f0c97543 100644
--- a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2021-01-08 Thread Alexys Jacob
commit: 828f77f0ae5e24768437eab1cfdaf14ef301
Author: Alexys Jacob  gentoo  org>
AuthorDate: Fri Jan  8 08:22:34 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Fri Jan  8 08:22:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828f77f0

sys-cluster/pacemaker: drop vulnerable wrt #711674

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Alexys Jacob  gentoo.org>

 sys-cluster/pacemaker/Manifest|  1 -
 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 67 ---
 2 files changed, 68 deletions(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 00e4e54cf37..70e7d979222 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,3 +1,2 @@
-DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd
 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B 
cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316
 SHA512 
6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 
4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc
 SHA512 
5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
deleted file mode 100644
index ef21da20c78..000
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-MY_PN="Pacemaker"
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="acl smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt
-   sys-cluster/cluster-glue
-   sys-cluster/corosync
-   >=sys-cluster/libqb-0.14.0
-   sys-cluster/resource-agents
-   smtp? ( net-libs/libesmtp )
-   snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-   default
-   sed -i -e "s/ -ggdb//g" configure.ac || die
-   eautoreconf
-   python_fix_shebang .
-}
-
-src_configure() {
-   # appends lib to localstatedir automatically
-   econf \
-   --localstatedir=/var \
-   --disable-fatal-warnings \
-   $(use_with acl) \
-   --without-cs-quorum \
-   --without-cman \
-   --without-heartbeat \
-   $(use_with smtp esmtp) \
-   $(use_with snmp) \
-   $(use_enable static-libs static) \
-   --with-ais
-}
-
-src_install() {
-   default
-   rm -rf "${D}"/var/run "${D}"/etc/init.d
-   newinitd "${FILESDIR}/${PN}.initd" ${PN}
-   if has_version "

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2021-01-01 Thread Sam James
commit: 42b048d157d700a676b8c8ad5bd26730fe34cc14
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  1 23:29:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  1 23:29:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b048d1

sys-cluster/pacemaker: Stabilize 2.0.5 amd64, #711674

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/pacemaker/pacemaker-2.0.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
index 0d030893990..0eed3c3478a 100644
--- a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-12-31 Thread Sam James
commit: 16b6c3a1537c087399618ec869b48ef4e8405eb4
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  1 05:45:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  1 05:45:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b6c3a1

sys-cluster/pacemaker: Stabilize 1.1.24 amd64, #762853

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/pacemaker/pacemaker-1.1.24.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
index 2b957bb10d3..4f09fb9802b 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-12-03 Thread Marc Schiffbauer
commit: 898c60b7238d3831ac4f970b110f9eb8f2367a5c
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Dec  4 01:02:08 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Dec  4 01:02:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898c60b7

sys-cluster/pacemaker: drop unstable vulnerable versions

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Marc Schiffbauer  gentoo.org>

 sys-cluster/pacemaker/Manifest   |  2 -
 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild | 72 --
 sys-cluster/pacemaker/pacemaker-1.1.19.ebuild| 67 
 sys-cluster/pacemaker/pacemaker-2.0.4.ebuild | 78 
 4 files changed, 219 deletions(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 9211ccdb8f8..00e4e54cf37 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,5 +1,3 @@
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd
 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
-DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
 DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B 
cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316
 SHA512 
6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd
-DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 
4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc
 SHA512 
5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
deleted file mode 100644
index 7790d983ce7..000
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl smtp snmp"
-
-DEPEND="${PYTHON_DEPS}
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt
-   sys-cluster/cluster-glue
-   sys-cluster/corosync
-   >=sys-cluster/libqb-0.14.0
-   sys-cluster/resource-agents
-
-   smtp?   ( net-libs/libesmtp )
-   snmp?   ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-   default
-   sed -i -e "s/ -ggdb//g" configure.ac || die
-   eautoreconf
-   python_fix_shebang .
-}
-
-src_configure() {
-   # appends lib to localstatedir automatically
-   local myconf=(
-   --localstatedir=/var
-   --disable-fatal-warnings
-   --disable-static
-   --without-cs-quorum
-   --without-cman
-   $(use_with acl)
-   --without-heartbeat
-   $(use_with smtp esmtp)
-   $(use_with snmp)
-   --with-ais
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-   rm -rf "${D}/var/run" "${D}/etc/init.d"
-   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-   if has_version "http://www.linux-ha.org/wiki/Pacemaker;
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt
-   sys-cluster/cluster-glue
-   sys-cluster/corosync
-   >=sys-cluster/libqb-0.14.0
-   sys-cluster/resource-agents
-   smtp? ( net-libs/libesmtp )
-   snmp? ( net-analyzer/net-snmp )
-"

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-12-03 Thread Marc Schiffbauer
commit: 8f24402dfd6437c52f328fd4f2b4f4412e244ace
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Dec  4 00:51:43 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Dec  4 00:55:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f24402d

sys-cluster/pacemaker: bump to 2.0.5 final

Bug: https://bugs.gentoo.org/711674
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Marc Schiffbauer  gentoo.org>

 sys-cluster/pacemaker/Manifest  | 2 +-
 .../pacemaker/{pacemaker-2.0.5_rc3.ebuild => pacemaker-2.0.5.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 3a92272a676..925a752e53d 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,4 +2,4 @@ DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5b
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
 DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 
7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262
 SHA512 
188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
 DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
-DIST Pacemaker-2.0.5-rc3.tar.gz 5433648 BLAKE2B 
f564ff0d7c33897bb58886194e169d2071823c43b27bb5e359a3a3a9a471cb8a9c22f86e93ed99d7eedcebfc530494a35fbd0b523287d3111dea0f507cf5b76b
 SHA512 
adf558d80d93ee7944b8e9eb5d07304e374ee61a4d81159daa9c6a9108ee77294e109766c21ed6f6eef2847ebc67d98925b8c63ff49bba958058bb7ef68d0f07
+DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 
4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc
 SHA512 
5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
similarity index 100%
rename from sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
rename to sys-cluster/pacemaker/pacemaker-2.0.5.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-12-03 Thread Marc Schiffbauer
commit: 25a9a9601046177b2c80702bf4b50541bd6d198f
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Dec  4 00:54:15 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Dec  4 00:55:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a9a960

sys-cluster/pacemaker: bump to 1.1.24 final

Bug: https://bugs.gentoo.org/711674
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Marc Schiffbauer  gentoo.org>

 sys-cluster/pacemaker/Manifest  | 2 +-
 .../pacemaker/{pacemaker-1.1.24_rc1.ebuild => pacemaker-1.1.24.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 925a752e53d..9211ccdb8f8 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,5 +1,5 @@
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd
 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
-DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 
7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262
 SHA512 
188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
+DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B 
cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316
 SHA512 
6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd
 DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 
4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc
 SHA512 
5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
similarity index 100%
rename from sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild
rename to sys-cluster/pacemaker/pacemaker-1.1.24.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-11-17 Thread Marc Schiffbauer
commit: a68d6fc8efca86e21615ab9aa273386e3da72e7b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Nov 17 18:59:29 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Nov 17 18:59:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68d6fc8

sys-cluster/pacemaker: remove 2.0.5_rc1

This version was vulnerable to CVE-2020-25654, so stabilize rc3 instead

Bug: https://bugs.gentoo.org/711674
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Marc Schiffbauer  gentoo.org>

 sys-cluster/pacemaker/Manifest   |  1 -
 sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild | 78 
 2 files changed, 79 deletions(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index a47ff037a5e..3a92272a676 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,5 +2,4 @@ DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5b
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
 DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 
7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262
 SHA512 
188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
 DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
-DIST Pacemaker-2.0.5-rc1.tar.gz 5432484 BLAKE2B 
34474ce29ed7822839676a4044129954e5b13038857aff156e3bf37090c000b421bcb2760b28b2c83531d92e32abbeb439a67b76154b8b7c10322d1e3467348d
 SHA512 
90e2994df8ee60f525dd919a5edad2c48bbe60fabd42318527c02bc47900bff24901f73eb6498d3fdf75996539e647460b540375008d263baf7890f271fae76c
 DIST Pacemaker-2.0.5-rc3.tar.gz 5433648 BLAKE2B 
f564ff0d7c33897bb58886194e169d2071823c43b27bb5e359a3a3a9a471cb8a9c22f86e93ed99d7eedcebfc530494a35fbd0b523287d3111dea0f507cf5b76b
 SHA512 
adf558d80d93ee7944b8e9eb5d07304e374ee61a4d81159daa9c6a9108ee77294e109766c21ed6f6eef2847ebc67d98925b8c63ff49bba958058bb7ef68d0f07

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild
deleted file mode 100644
index 0d030893990..000
--- a/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl smtp snmp"
-
-DEPEND="${PYTHON_DEPS}
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt
-   >=sys-cluster/cluster-glue-1.0.12-r1
-   >=sys-cluster/libqb-2.0.0:=
-   sys-cluster/resource-agents
-   sys-cluster/corosync
-   smtp? ( net-libs/libesmtp )
-   snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-   default
-   sed -i -e "s/ -ggdb//g" configure.ac || die
-   eautoreconf
-}
-
-src_configure() {
-   # appends lib to localstatedir automatically
-   local myconf=(
-   --with-ocfdir=/usr/$(get_libdir)/ocf
-   --localstatedir=/var
-   --disable-fatal-warnings
-   --disable-static
-   --without-cs-quorum
-   --without-cman
-   --without-heartbeat
-   --with-corosync
-   --with-ais
-   $(use_with acl)
-   $(use_with smtp esmtp)
-   $(use_with snmp)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-   python_optimize
-   rm -rf "${D}/var/run" "${D}/etc/init.d"
-
-   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-   keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
-   keepdir /var/log/pacemaker/bundles
-
-   find "${D}" -name '*.la' -delete || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-11-17 Thread Marc Schiffbauer
commit: f074c5ed7ad2d388e27114105dda9a147b5f31d1
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Nov 17 18:54:01 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Nov 17 18:54:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f074c5ed

sys-cluster/pacemaker: bump for CVE-2020-25654

Bug: https://bugs.gentoo.org/751430
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Marc Schiffbauer  gentoo.org>

 sys-cluster/pacemaker/Manifest   |  1 +
 sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild | 78 
 2 files changed, 79 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 5c63c1e1a45..a47ff037a5e 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -3,3 +3,4 @@ DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad3320140033
 DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 
7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262
 SHA512 
188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
 DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
 DIST Pacemaker-2.0.5-rc1.tar.gz 5432484 BLAKE2B 
34474ce29ed7822839676a4044129954e5b13038857aff156e3bf37090c000b421bcb2760b28b2c83531d92e32abbeb439a67b76154b8b7c10322d1e3467348d
 SHA512 
90e2994df8ee60f525dd919a5edad2c48bbe60fabd42318527c02bc47900bff24901f73eb6498d3fdf75996539e647460b540375008d263baf7890f271fae76c
+DIST Pacemaker-2.0.5-rc3.tar.gz 5433648 BLAKE2B 
f564ff0d7c33897bb58886194e169d2071823c43b27bb5e359a3a3a9a471cb8a9c22f86e93ed99d7eedcebfc530494a35fbd0b523287d3111dea0f507cf5b76b
 SHA512 
adf558d80d93ee7944b8e9eb5d07304e374ee61a4d81159daa9c6a9108ee77294e109766c21ed6f6eef2847ebc67d98925b8c63ff49bba958058bb7ef68d0f07

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
new file mode 100644
index 000..0d030893990
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl smtp snmp"
+
+DEPEND="${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   >=sys-cluster/cluster-glue-1.0.12-r1
+   >=sys-cluster/libqb-2.0.0:=
+   sys-cluster/resource-agents
+   sys-cluster/corosync
+   smtp? ( net-libs/libesmtp )
+   snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   # appends lib to localstatedir automatically
+   local myconf=(
+   --with-ocfdir=/usr/$(get_libdir)/ocf
+   --localstatedir=/var
+   --disable-fatal-warnings
+   --disable-static
+   --without-cs-quorum
+   --without-cman
+   --without-heartbeat
+   --with-corosync
+   --with-ais
+   $(use_with acl)
+   $(use_with smtp esmtp)
+   $(use_with snmp)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+   python_optimize
+   rm -rf "${D}/var/run" "${D}/etc/init.d"
+
+   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+   keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+   keepdir /var/log/pacemaker/bundles
+
+   find "${D}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/

2020-11-10 Thread Marc Schiffbauer
commit: 0d50a2d60855edd7408b35062cc596e4fca7a3f1
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Nov 10 23:19:16 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Nov 10 23:22:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d50a2d6

sys-cluster/pacemaker: bump 1.1 version

Bug: https://bugs.gentoo.org/751430
Bug: https://bugs.gentoo.org/711674
Closes: https://bugs.gentoo.org/728162
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Marc Schiffbauer  gentoo.org>

 sys-cluster/pacemaker/Manifest |  1 +
 .../files/pacemaker-1.1.24-python-fixes.patch  | 26 +++
 .../files/pacemaker-1.1.24-qa-warnings.patch   | 12 
 sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild  | 80 ++
 4 files changed, 119 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 7873e347cfd..8d90275c56f 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,3 +1,4 @@
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd
 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
+DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 
7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262
 SHA512 
188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
 DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d

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
new file mode 100644
index 000..2428a399d5f
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch
@@ -0,0 +1,26 @@
+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.0 +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.0 +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
new file mode 100644
index 000..37346d6a396
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch
@@ -0,0 +1,12 @@
+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.0 +0100
 pacemaker-Pacemaker-1.1.24-rc1/configure.ac2020-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)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild
new file mode 100644
index 000..2b957bb10d3
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-11-10 Thread Marc Schiffbauer
commit: 3b5d8d7b3e3513fab0c2c7feb10b3a3df929692f
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Nov 10 23:21:25 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Nov 10 23:22:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5d8d7b

sys-cluster/pacemaker: bump 2.0 version

Bug: https://bugs.gentoo.org/751430
Bug: https://bugs.gentoo.org/711674
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Marc Schiffbauer  gentoo.org>

 sys-cluster/pacemaker/Manifest   |  1 +
 sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild | 78 
 2 files changed, 79 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 8d90275c56f..5c63c1e1a45 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,3 +2,4 @@ DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5b
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
 DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 
7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262
 SHA512 
188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
 DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
+DIST Pacemaker-2.0.5-rc1.tar.gz 5432484 BLAKE2B 
34474ce29ed7822839676a4044129954e5b13038857aff156e3bf37090c000b421bcb2760b28b2c83531d92e32abbeb439a67b76154b8b7c10322d1e3467348d
 SHA512 
90e2994df8ee60f525dd919a5edad2c48bbe60fabd42318527c02bc47900bff24901f73eb6498d3fdf75996539e647460b540375008d263baf7890f271fae76c

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild
new file mode 100644
index 000..0d030893990
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl smtp snmp"
+
+DEPEND="${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   >=sys-cluster/cluster-glue-1.0.12-r1
+   >=sys-cluster/libqb-2.0.0:=
+   sys-cluster/resource-agents
+   sys-cluster/corosync
+   smtp? ( net-libs/libesmtp )
+   snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   # appends lib to localstatedir automatically
+   local myconf=(
+   --with-ocfdir=/usr/$(get_libdir)/ocf
+   --localstatedir=/var
+   --disable-fatal-warnings
+   --disable-static
+   --without-cs-quorum
+   --without-cman
+   --without-heartbeat
+   --with-corosync
+   --with-ais
+   $(use_with acl)
+   $(use_with smtp esmtp)
+   $(use_with snmp)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+   python_optimize
+   rm -rf "${D}/var/run" "${D}/etc/init.d"
+
+   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+   keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+   keepdir /var/log/pacemaker/bundles
+
+   find "${D}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, sys-cluster/pacemaker/files/

2020-10-21 Thread Alexys Jacob
commit: 694bc6925f5e973d4eda78d9366013dc5974a487
Author: Timo Rothenpieler  btbn  de>
AuthorDate: Fri Jul 24 19:35:49 2020 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Wed Oct 21 12:58:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694bc692

sys-cluster/pacemaker: bump for 2.0.4

Bug: https://bugs.gentoo.org/711674
Signed-off-by: Timo Rothenpieler  btbn.de>
Signed-off-by: Alexys Jacob  gentoo.org>

 sys-cluster/pacemaker/Manifest |  1 +
 .../files/pacemaker-2.0.4-qa-warnings.patch| 16 +
 sys-cluster/pacemaker/pacemaker-2.0.4.ebuild   | 78 ++
 3 files changed, 95 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index d9410b999b2..7873e347cfd 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,2 +1,3 @@
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd
 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
+DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 
8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d
 SHA512 
fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d

diff --git a/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch 
b/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch
new file mode 100644
index 000..33cf74d7326
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch
@@ -0,0 +1,16 @@
+diff -Naur pacemaker-Pacemaker-2.0.4.orig/extra/resources/pingd 
pacemaker-Pacemaker-2.0.4/extra/resources/pingd
+--- pacemaker-Pacemaker-2.0.4.orig/extra/resources/pingd   2020-07-13 
22:30:01.503255159 +0200
 pacemaker-Pacemaker-2.0.4/extra/resources/pingd2020-07-13 
22:33:27.434714056 +0200
+@@ -25,8 +25,10 @@
+ : ${OCF_RESKEY_interval:="1"}
+ : ${OCF_RESKEY_CRM_meta_interval:=0}
+ 
+-ocf_log err "This agent (ocf:pacemaker:pingd) is deprecated, does not work, 
and"
+-ocf_log err "will be removed in a future release (use ocf:pacemaker:ping 
instead)"
++if [ "$__OCF_ACTION" != "meta-data" ]; then
++ocf_log err "This agent (ocf:pacemaker:pingd) is deprecated, does not 
work, and"
++ocf_log err "will be removed in a future release (use ocf:pacemaker:ping 
instead)"
++fi
+ 
+ case "$__OCF_ACTION" in
+ start|monitor)

diff --git a/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild 
b/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild
new file mode 100644
index 000..0d030893990
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl smtp snmp"
+
+DEPEND="${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   >=sys-cluster/cluster-glue-1.0.12-r1
+   >=sys-cluster/libqb-2.0.0:=
+   sys-cluster/resource-agents
+   sys-cluster/corosync
+   smtp? ( net-libs/libesmtp )
+   snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   # appends lib to localstatedir automatically
+   local myconf=(
+   --with-ocfdir=/usr/$(get_libdir)/ocf
+   --localstatedir=/var
+   --disable-fatal-warnings
+   --disable-static
+   --without-cs-quorum
+   --without-cman
+   --without-heartbeat
+   --with-corosync
+   --with-ais
+   $(use_with acl)
+   $(use_with smtp esmtp)
+   $(use_with snmp)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+   python_optimize
+   rm -rf "${D}/var/run" "${D}/etc/init.d"
+
+   newinitd 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-10-09 Thread Michał Górny
commit: 234096c2d922648ed9345903a010d9c977937525
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct  9 08:20:08 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct  9 08:20:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234096c2

sys-cluster/pacemaker: Remove dep on heartbeat

Signed-off-by: Michał Górny  gentoo.org>

 sys-cluster/pacemaker/metadata.xml   |  1 -
 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild| 15 ---
 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild | 14 --
 sys-cluster/pacemaker/pacemaker-1.1.19.ebuild| 15 ---
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/sys-cluster/pacemaker/metadata.xml 
b/sys-cluster/pacemaker/metadata.xml
index 4548b53178e..dcb0f854efe 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -12,7 +12,6 @@
capabilities provided by your preferred cluster infrastructure 
(either OpenAIS or Heartbeat).


-   Enable sys-cluster/heartbeat 
support.
Enable SMTP support via 
net-libs/libesmtp



diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index f6bef07a121..ef21da20c78 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -16,16 +16,15 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+IUSE="acl smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
sys-cluster/cluster-glue
+   sys-cluster/corosync
>=sys-cluster/libqb-0.14.0
sys-cluster/resource-agents
-   heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-   !heartbeat? ( sys-cluster/corosync )
smtp? ( net-libs/libesmtp )
snmp? ( net-analyzer/net-snmp )
 "
@@ -43,12 +42,6 @@ src_prepare() {
 }
 
 src_configure() {
-   local myopts=""
-   if use heartbeat ; then
-   myopts="--without-corosync"
-   else
-   myopts="--with-ais"
-   fi
# appends lib to localstatedir automatically
econf \
--localstatedir=/var \
@@ -56,11 +49,11 @@ src_configure() {
$(use_with acl) \
--without-cs-quorum \
--without-cman \
-   $(use_with heartbeat) \
+   --without-heartbeat \
$(use_with smtp esmtp) \
$(use_with snmp) \
$(use_enable static-libs static) \
-   ${myopts}
+   --with-ais
 }
 
 src_install() {

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
index c20405e8e1b..7790d983ce7 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -16,17 +16,16 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp"
+IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
sys-cluster/cluster-glue
+   sys-cluster/corosync
>=sys-cluster/libqb-0.14.0
sys-cluster/resource-agents
 
-   heartbeat?  ( >=sys-cluster/heartbeat-3.0.0 )
-   !heartbeat? ( sys-cluster/corosync )
smtp?   ( net-libs/libesmtp )
snmp?   ( net-analyzer/net-snmp )
 "
@@ -52,17 +51,12 @@ src_configure() {
--without-cs-quorum
--without-cman
$(use_with acl)
-   $(use_with heartbeat)
+   --without-heartbeat
$(use_with smtp esmtp)
$(use_with snmp)
+   --with-ais
)
 
-   if use heartbeat ; then
-   myconf+=( --without-corosync )
-   else
-   myconf+=( --with-ais )
-   fi
-
econf "${myconf[@]}"
 }
 

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
index 0c8299ce037..d1e44f3de6f 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -16,16 +16,15 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+IUSE="acl smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
sys-cluster/cluster-glue
+   sys-cluster/corosync
>=sys-cluster/libqb-0.14.0
sys-cluster/resource-agents
-   heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-   !heartbeat? ( 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-09-27 Thread Sergei Trofimovich
commit: f91aa68ff93227c7a45805f33b4397bc04aa5155
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Sep 27 10:01:35 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 27 10:05:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91aa68f

sys-cluster/pacemaker: drop to ~hppa

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index 737be8f1968..f6bef07a121 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="acl heartbeat smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2020-05-07 Thread Michał Górny
commit: 546fed948279e4bff8aec93ea0187f03f8ef2450
Author: Michał Górny  gentoo  org>
AuthorDate: Thu May  7 15:19:46 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu May  7 17:58:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546fed94

sys-cluster/pacemaker: Remove py2.7

Signed-off-by: Michał Górny  gentoo.org>

 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
index 2378565f6dc..c20405e8e1b 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2019-11-15 Thread Alexys Jacob
commit: 43d97f36b607be3536627591c225a23e11a81215
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Oct 31 00:40:21 2019 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Fri Nov 15 21:52:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d97f36

sys-cluster/pacemaker: python compats, disable static lib

Since no other packages require the static libraries built
by pacemaker, I'll disable them as suggested by the links
below
https://flameeyes.blog/2011/08/29/useless-flag-static-libs/
https://archives.gentoo.org/gentoo-dev/message/2dada80c2b9c85b0e83e6328428bf8ab

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Alessandro Barbieri  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13442
Signed-off-by: Alexys Jacob  gentoo.org>

 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild | 80 
 1 file changed, 80 insertions(+)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
new file mode 100644
index 000..ed65ac8337a
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl heartbeat smtp snmp"
+
+DEPEND="${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   sys-cluster/cluster-glue
+   >=sys-cluster/libqb-0.14.0
+   sys-cluster/resource-agents
+
+   heartbeat?  ( >=sys-cluster/heartbeat-3.0.0 )
+   !heartbeat? ( sys-cluster/corosync )
+   smtp?   ( net-libs/libesmtp )
+   snmp?   ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   eautoreconf
+   python_fix_shebang .
+}
+
+src_configure() {
+   # appends lib to localstatedir automatically
+   local myconf=(
+   --libdir="/usr/$(get_libdir)"
+   --localstatedir=/var
+   --disable-dependency-tracking
+   --disable-fatal-warnings
+   --disable-static
+   --without-cs-quorum
+   --without-cman
+   $(use_with acl)
+   $(use_with heartbeat)
+   $(use_with smtp esmtp)
+   $(use_with snmp)
+   )
+
+   if use heartbeat ; then
+   myconf+=( --without-corosync )
+   else
+   myconf+=( --with-ais )
+   fi
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+   rm -rf "${D}/var/run" "${D}/etc/init.d"
+   newinitd "${FILESDIR}/${PN}.initd" "${PN}" || die
+   if has_version "

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, profiles/base/

2018-12-11 Thread Michał Górny
commit: e473547029f5b8fd9b0c1faa6dc33ea29d0e2024
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Dec 11 15:04:43 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Dec 11 15:33:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4735470

sys-cluster/pacemaker: [QA] Punt removed cman dep

Signed-off-by: Michał Górny  gentoo.org>

 profiles/base/package.use.mask| 4 
 sys-cluster/pacemaker/metadata.xml| 1 -
 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 8 +++-
 sys-cluster/pacemaker/pacemaker-1.1.19.ebuild | 8 +++-
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 468c52ff905..5ec2c69b9cc 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -48,10 +48,6 @@ sci-libs/ceres-solver sparse
 # upower-pm-utils will be removed (#596988)
 mate-extra/mate-power-manager pm-utils
 
-# Pacho Ramos  (04 Nov 2018)
-# cman and co. are going to be removed (#650738)
-sys-cluster/pacemaker cman
-
 # Pacho Ramos  (01 Nov 2018)
 # cman and co. are going to be removed (#650738)
 sys-fs/lvm2 cman clvm

diff --git a/sys-cluster/pacemaker/metadata.xml 
b/sys-cluster/pacemaker/metadata.xml
index fd2bc1c6902..4548b53178e 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -12,7 +12,6 @@
capabilities provided by your preferred cluster infrastructure 
(either OpenAIS or Heartbeat).


-   Enable cman support.
Enable sys-cluster/heartbeat 
support.
Enable SMTP support via 
net-libs/libesmtp


diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index a1744825da2..019e2630039 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -16,8 +16,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
+IUSE="acl heartbeat smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
@@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS}
sys-cluster/cluster-glue
>=sys-cluster/libqb-0.14.0
sys-cluster/resource-agents
-   cman? ( sys-cluster/cman )
heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
!heartbeat? ( sys-cluster/corosync )
smtp? ( net-libs/libesmtp )
@@ -58,8 +56,8 @@ src_configure() {
--disable-dependency-tracking \
--disable-fatal-warnings \
$(use_with acl) \
-   $(use_with cman cs-quorum) \
-   $(use_with cman cman) \
+   --without-cs-quorum \
+   --without-cman \
$(use_with heartbeat) \
$(use_with smtp esmtp) \
$(use_with snmp) \

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
index d53ebabf723..610fa658e5f 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -16,8 +16,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
+IUSE="acl heartbeat smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
@@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS}
sys-cluster/cluster-glue
>=sys-cluster/libqb-0.14.0
sys-cluster/resource-agents
-   cman? ( sys-cluster/cman )
heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
!heartbeat? ( sys-cluster/corosync )
smtp? ( net-libs/libesmtp )
@@ -58,8 +56,8 @@ src_configure() {
--disable-dependency-tracking \
--disable-fatal-warnings \
$(use_with acl) \
-   $(use_with cman cs-quorum) \
-   $(use_with cman cman) \
+   --without-cs-quorum \
+   --without-cman \
$(use_with heartbeat) \
$(use_with smtp esmtp) \
$(use_with snmp) \



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2018-12-04 Thread Michał Górny
commit: ca58114a4ef6520ac9c062dedeb9bef35499ef7d
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Dec  4 14:22:01 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Dec  4 14:22:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca58114a

sys-cluster/pacemaker: Fix PkgMetadataXmlInvalidPkgRef

Signed-off-by: Michał Górny  gentoo.org>

 sys-cluster/pacemaker/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/metadata.xml 
b/sys-cluster/pacemaker/metadata.xml
index 0d3bda39fd2..fd2bc1c6902 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -12,7 +12,7 @@
capabilities provided by your preferred cluster infrastructure 
(either OpenAIS or Heartbeat).


-   Enable sys-cluster/cman 
support.
+   Enable cman support.
Enable sys-cluster/heartbeat 
support.
Enable SMTP support via 
net-libs/libesmtp




[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2018-08-14 Thread Alexys Jacob
commit: d4b40465b27860b99a65808e467fba687459caa0
Author: Ultrabug  gentoo  org>
AuthorDate: Tue Aug 14 22:00:37 2018 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Tue Aug 14 22:00:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b40465

sys-cluster/pacemaker: version bump

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 sys-cluster/pacemaker/Manifest|  1 +
 sys-cluster/pacemaker/pacemaker-1.1.19.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 6026aa42b4f..d9410b999b2 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1 +1,2 @@
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd
 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
+DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 
9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2
 SHA512 
c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
new file mode 100644
index 000..d53ebabf723
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1
+
+MY_PN="Pacemaker"
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE="cman? ( !heartbeat )"
+IUSE="acl cman heartbeat smtp snmp static-libs"
+
+DEPEND="${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   sys-cluster/cluster-glue
+   >=sys-cluster/libqb-0.14.0
+   sys-cluster/resource-agents
+   cman? ( sys-cluster/cman )
+   heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+   !heartbeat? ( sys-cluster/corosync )
+   smtp? ( net-libs/libesmtp )
+   snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   eautoreconf
+   python_fix_shebang .
+}
+
+src_configure() {
+   local myopts=""
+   if use heartbeat ; then
+   myopts="--without-corosync"
+   else
+   myopts="--with-ais"
+   fi
+   # appends lib to localstatedir automatically
+   econf \
+   --libdir=/usr/$(get_libdir) \
+   --localstatedir=/var \
+   --disable-dependency-tracking \
+   --disable-fatal-warnings \
+   $(use_with acl) \
+   $(use_with cman cs-quorum) \
+   $(use_with cman cman) \
+   $(use_with heartbeat) \
+   $(use_with smtp esmtp) \
+   $(use_with snmp) \
+   $(use_enable static-libs static) \
+   ${myopts}
+}
+
+src_install() {
+   default
+   rm -rf "${D}"/var/run "${D}"/etc/init.d
+   newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+   if has_version "

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/

2018-02-11 Thread Alexys Jacob
commit: a4b74a98d540fe57489b4995740b492196389b2a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Feb  1 17:07:45 2018 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Sun Feb 11 16:43:32 2018 +
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..000
--- 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 <
-
-
-1.0
-
-
-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.
-
-node connectivity
-
-
-
-
-PID file
-PID file
-
-
-
-
-
-The time to wait (dampening) further changes occur
-
-Dampening interval
-
-
-
-
-
-The name of the attributes to set.  This is the name to be used in the 
constraints.
-
-Attribute name
-
-
-
-
-
-The number by which to multiply the number of connected ping nodes by
-
-Value multiplier
-
-
-
-
-
-The list of ping nodes to count.
-
-Host list
-
-
-
-
-
-Number of ping attempts, per host, before declaring it dead
-
-no. of ping attempts
-
-
-
-
-
-How long, in seconds, to wait before declaring a ping lost
-
-ping timeout in seconds
-
-
-
-
-
-A catch all for any other options that need to be passed to ping.
-
-Extra Options
-
-
-
-
-
-Resource is failed if the score is less than failure_score.
-Default never fails.
-
-failure_score
-
-
-
-
-
-Enables to use default attrd_updater verbose logging on every call.
-
-Verbose logging
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-END
-}
-
-###
-
-ping_conditional_log() {
-level=$1; shift 
-if [ ${OCF_RESKEY_debug} = "true" ]; then
-   ocf_log $level "$*"
-fi
-}
-
-ping_usage() {
-   cat <$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=$?
-

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, sys-cluster/pacemaker/files/

2018-01-25 Thread Alexys Jacob
commit: b1871e509fba489c2e72d2697ff51926df1b5a2d
Author: Ultrabug  gentoo  org>
AuthorDate: Thu Jan 25 08:31:18 2018 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Thu Jan 25 08:31:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1871e50

sys-cluster/pacemaker: drop vulnerable wrt #599194

 sys-cluster/pacemaker/Manifest |   2 -
 .../pacemaker/files/pacemaker-1.1.10-tinfo.patch   |  21 -
 .../pacemaker/files/pacemaker-1.1.12-glib.patch|  47 --
 .../pacemaker/files/pacemaker-1.1.12-stonith.patch |  21 -
 sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild   | 100 -
 sys-cluster/pacemaker/pacemaker-1.1.14.ebuild  |  94 ---
 6 files changed, 285 deletions(-)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 2d5310ab436..6026aa42b4f 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,3 +1 @@
-DIST Pacemaker-1.1.12.tar.gz 10459675 BLAKE2B 
31fe62a4a21523653e232812cb61b636adf2e5965f3d863a39f6d511950e892be126d954f0dd338bfd26a07eee2966a09ccf8d166c9c8bc1fd2ba73898a25ba8
 SHA512 
cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1
-DIST Pacemaker-1.1.14.tar.gz 4729808 BLAKE2B 
90e5fcbfcb88c65b590367c2e99f848f3fa585353308df41684c8a7a039782b3ac507cbf347faf3b68d2f866763df1b713ac8d1ce34579b6b80708277eec0e89
 SHA512 
81927061bcc0a0b88c472f87a2cbdb26b88a2443b06112cd8c8d58d8491da4e9ae03997108c9d40aa408e80e2998bdc0ac03691f1732d2629c4cef0adcc4b7fa
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B 
a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd
 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534

diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch 
b/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
deleted file mode 100644
index 1dba440c9e7..000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/configure.ac 2014-12-12 14:13:07.262413254 +0100
-+++ b/configure.ac 2014-12-12 14:13:14.922480835 +0100
-@@ -885,14 +885,16 @@
- CURSESLIBS=''
- if test "$ac_cv_header_ncurses_h" = "yes"; then
-   AC_CHECK_LIB(ncurses, printw,
--[CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses 
library)]
-+[AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-   )
-+  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
- fi
- 
- if test "$ac_cv_header_ncurses_ncurses_h" = "yes"; then
-   AC_CHECK_LIB(ncurses, printw,
--[CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses 
library)]
-+[AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-   )
-+  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
- fi
- 
- dnl Only look for non-n-library if there was no n-library.

diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch 
b/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch
deleted file mode 100644
index 8233f98a17e..000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 568e41db929a34106c8c2ff7c48716ab5c13ef49 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof 
-Date: Mon, 13 Oct 2014 13:30:58 +1100
-Subject: [PATCH] Fix: lrmd: Prevent glib assert triggered by timers being
- removed from mainloop more than once
-

- lib/services/services.c   | 3 +++
- lib/services/services_linux.c | 1 +
- 2 files changed, 4 insertions(+)
-
 a/lib/services/services.c
-+++ b/lib/services/services.c
-@@ -313,6 +313,7 @@ services_action_free(svc_action_t * op)
- 
- if (op->opaque->repeat_timer) {
- g_source_remove(op->opaque->repeat_timer);
-+op->opaque->repeat_timer = 0;
- }
- if (op->opaque->stderr_gsource) {
- mainloop_del_fd(op->opaque->stderr_gsource);
-@@ -425,6 +426,7 @@ services_action_kick(const char *name, c
- } else {
- if (op->opaque->repeat_timer) {
- g_source_remove(op->opaque->repeat_timer);
-+op->opaque->repeat_timer = 0;
- }
- recurring_action_timer(op);
- return TRUE;
-@@ -459,6 +461,7 @@ handle_duplicate_recurring(svc_action_t
- if (dup->pid != 0) {
- if (op->opaque->repeat_timer) {
- g_source_remove(op->opaque->repeat_timer);
-+op->opaque->repeat_timer = 0;
- }
- recurring_action_timer(dup);
- }
 a/lib/services/services_linux.c
-+++ b/lib/services/services_linux.c
-@@ -226,6 +226,7 @@ recurring_action_timer(gpointer data)
- op->stdout_data = NULL;
- free(op->stderr_data);
- op->stderr_data = NULL;
-+op->opaque->repeat_timer = 0;
- 
- services_action_async(op, NULL);
- return FALSE;

diff --git 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2017-10-14 Thread Sergei Trofimovich
commit: 32485adec372fed756c4e64d4469d0af0e99e131
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 14 20:15:09 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 14 20:15:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32485ade

sys-cluster/pacemaker: stable 1.1.16 for hppa, bug #599194

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa"

 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index 300cc72025e..a1744825da2 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 REQUIRED_USE="cman? ( !heartbeat )"
 IUSE="acl cman heartbeat smtp snmp static-libs"
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2017-06-19 Thread Agostino Sarubbo
commit: 75674354be3b8d5e0f6929d9ee2363b6807fde4e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun 20 05:16:13 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun 20 05:16:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75674354

sys-cluster/pacemaker: x86 stable wrt bug #599194

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index 5eefe28ab16..300cc72025e 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 REQUIRED_USE="cman? ( !heartbeat )"
 IUSE="acl cman heartbeat smtp snmp static-libs"
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2017-06-18 Thread Agostino Sarubbo
commit: c7e3242701adab6bf880b99e4228b5033833e4df
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 18 13:58:33 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 18 13:58:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e32427

sys-cluster/pacemaker: amd64 stable wrt bug #599194

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index e746e5d0bca..5eefe28ab16 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 REQUIRED_USE="cman? ( !heartbeat )"
 IUSE="acl cman heartbeat smtp snmp static-libs"
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2017-04-25 Thread Alexys Jacob
commit: 4f7b8a6abd44eb279325db71b92799bbc8437a86
Author: Ultrabug  gentoo  org>
AuthorDate: Tue Apr 25 09:28:26 2017 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Tue Apr 25 09:28:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7b8a6a

sys-cluster/pacemaker: version bump

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-cluster/pacemaker/Manifest|  1 +
 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 64d19872148..3897785ab98 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,2 +1,3 @@
 DIST Pacemaker-1.1.12.tar.gz 10459675 SHA256 
f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c SHA512 
cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1
 WHIRLPOOL 
e737d70288936d2f76d310848940bde78537c32e703c68d8dd37a78e54a66dc9d34cf2fe0037f1621fbc5ba10bb9688490da96394cde65f0668d4b62eccf3f03
 DIST Pacemaker-1.1.14.tar.gz 4729808 SHA256 
2f73043a5de5e66a47462d37cd68c4c6861f71a03c0ea02eb4ae2b1a550cd7b0 SHA512 
81927061bcc0a0b88c472f87a2cbdb26b88a2443b06112cd8c8d58d8491da4e9ae03997108c9d40aa408e80e2998bdc0ac03691f1732d2629c4cef0adcc4b7fa
 WHIRLPOOL 
cbae34051a406a9379157fe13171ea8b04c9793528c5f346a7845b2ffa894df4a74fd008e708d99207c6064acf2a39bf569dff0200c47552c0b3b124de00e7eb
+DIST Pacemaker-1.1.16.tar.gz 4897772 SHA256 
dffcae035975669a66ab545d45216a637496a251ee2114fa03d58acfcc969202 SHA512 
967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 WHIRLPOOL 
8beb0188968743d6415c7158790582f01192a643a13246e61cafd6eb8e0d22cd2565dd31e5cfcda04b3aa3e9c749b4c1f0c44bd9419c3fffcc815909e836a92f

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
new file mode 100644
index 000..e746e5d0bca
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1
+
+MY_PN="Pacemaker"
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE="cman? ( !heartbeat )"
+IUSE="acl cman heartbeat smtp snmp static-libs"
+
+DEPEND="${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   sys-cluster/cluster-glue
+   >=sys-cluster/libqb-0.14.0
+   sys-cluster/resource-agents
+   cman? ( sys-cluster/cman )
+   heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+   !heartbeat? ( sys-cluster/corosync )
+   smtp? ( net-libs/libesmtp )
+   snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   eautoreconf
+   python_fix_shebang .
+}
+
+src_configure() {
+   local myopts=""
+   if use heartbeat ; then
+   myopts="--without-corosync"
+   else
+   myopts="--with-ais"
+   fi
+   # appends lib to localstatedir automatically
+   econf \
+   --libdir=/usr/$(get_libdir) \
+   --localstatedir=/var \
+   --disable-dependency-tracking \
+   --disable-fatal-warnings \
+   $(use_with acl) \
+   $(use_with cman cs-quorum) \
+   $(use_with cman cman) \
+   $(use_with heartbeat) \
+   $(use_with smtp esmtp) \
+   $(use_with snmp) \
+   $(use_enable static-libs static) \
+   ${myopts}
+}
+
+src_install() {
+   default
+   rm -rf "${D}"/var/run "${D}"/etc/init.d
+   newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+   if has_version "

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/files/

2017-02-10 Thread David Seifert
commit: f9289de293c88909af80c69f2ff6f602bc0b127f
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 15:56:52 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Feb 10 22:33:24 2017 +
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..00
--- 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..00
--- 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 
- #include 
- #include 
-+#include 
- 
- #include 
- 

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..00
--- 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 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2016-04-19 Thread Ian Stakenvicius
commit: 441944fde661f00cd94043f8159c9c570d612968
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Tue Apr 19 20:07:23 2016 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Tue Apr 19 20:07:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441944fd

fix  reference in metadata.xml

Package-Manager: portage-2.2.26

 sys-cluster/pacemaker/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pacemaker/metadata.xml 
b/sys-cluster/pacemaker/metadata.xml
index 48699da..c486adb 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -13,7 +13,7 @@
   
 Enable sys-cluster/cman support.
 Enable sys-cluster/heartbeat 
support.
-Enable SMTP support via 
net-libs/libsmtp
+Enable SMTP support via 
net-libs/libesmtp
   
   
 ClusterLabs/pacemaker



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

2016-01-26 Thread Alexys Jacob
commit: 67b9a38fa41a5a8723d209c2801e10ce648b4feb
Author: Ultrabug  gentoo  org>
AuthorDate: Tue Jan 26 08:40:00 2016 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Tue Jan 26 08:40:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b9a38f

sys-cluster/pacemaker: version bump fix #572062

Package-Manager: portage-2.2.27

 sys-cluster/pacemaker/Manifest|  1 +
 sys-cluster/pacemaker/pacemaker-1.1.14.ebuild | 95 +++
 2 files changed, 96 insertions(+)

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index b3ff3c0..64d1987 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1 +1,2 @@
 DIST Pacemaker-1.1.12.tar.gz 10459675 SHA256 
f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c SHA512 
cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1
 WHIRLPOOL 
e737d70288936d2f76d310848940bde78537c32e703c68d8dd37a78e54a66dc9d34cf2fe0037f1621fbc5ba10bb9688490da96394cde65f0668d4b62eccf3f03
+DIST Pacemaker-1.1.14.tar.gz 4729808 SHA256 
2f73043a5de5e66a47462d37cd68c4c6861f71a03c0ea02eb4ae2b1a550cd7b0 SHA512 
81927061bcc0a0b88c472f87a2cbdb26b88a2443b06112cd8c8d58d8491da4e9ae03997108c9d40aa408e80e2998bdc0ac03691f1732d2629c4cef0adcc4b7fa
 WHIRLPOOL 
cbae34051a406a9379157fe13171ea8b04c9793528c5f346a7845b2ffa894df4a74fd008e708d99207c6064acf2a39bf569dff0200c47552c0b3b124de00e7eb

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild 
b/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
new file mode 100644
index 000..4c58935
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+WANT_AUTOMAKE="1.12"
+
+inherit autotools eutils python-single-r1
+
+MY_PN="Pacemaker"
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker;
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE="cman? ( !heartbeat )"
+IUSE="acl cman heartbeat smtp snmp static-libs"
+
+DEPEND="${PYTHON_DEPS}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   sys-cluster/cluster-glue
+   >=sys-cluster/libqb-0.14.0
+   sys-cluster/resource-agents
+   cman? ( sys-cluster/cman )
+   heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+   !heartbeat? ( sys-cluster/corosync )
+   smtp? ( net-libs/libesmtp )
+   snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+   default
+   epatch_user
+
+   # bug #490908
+   cp "${FILESDIR}/ping" extra/resources/ping || die
+
+   sed -i -e "/ggdb3/d" configure.ac || die
+   sed -i -e "s/ -ggdb//g" configure.ac || die
+   sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" 
lib/common/ipc.c || die
+   sed -i -e "s:::" lib/ais/plugin.c || die
+   eautoreconf
+
+   python_fix_shebang .
+}
+
+src_configure() {
+   local myopts=""
+   if use heartbeat ; then
+   myopts="--without-corosync"
+   else
+   myopts="--with-ais"
+   fi
+   # appends lib to localstatedir automatically
+   econf \
+   --libdir=/usr/$(get_libdir) \
+   --localstatedir=/var \
+   --disable-dependency-tracking \
+   --disable-fatal-warnings \
+   $(use_with acl) \
+   $(use_with cman cs-quorum) \
+   $(use_with cman cman) \
+   $(use_with heartbeat) \
+   $(use_with smtp esmtp) \
+   $(use_with snmp) \
+   $(use_enable static-libs static) \
+   ${myopts}
+}
+
+src_install() {
+   default
+   rm -rf "${D}"/var/run "${D}"/etc/init.d
+   newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+   if has_version "