* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, sys-cluster/pacemaker/files/
@ 2018-01-25 8:31 Alexys Jacob
0 siblings, 0 replies; 3+ messages in thread
From: Alexys Jacob @ 2018-01-25 8:31 UTC (permalink / raw
To: gentoo-commits
commit: b1871e509fba489c2e72d2697ff51926df1b5a2d
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 08:31:18 2018 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 08:31:18 2018 +0000
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..00000000000
--- 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..00000000000
--- 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 <andrew@beekhof.net>
-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 a/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch
deleted file mode 100644
index 31c729559f3..00000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix: stonith-ng: Reset mainloop source IDs after removing them
-
-Origin: upstream, commit: 0326f05c9e26f39a394fa30830e31a76306f49c7
-Author: Andrew Beekhof <andrew@beekhof.net>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1412962
-Last-Update: 2015-01-20
-
---- a/lib/fencing/st_client.c
-+++ b/lib/fencing/st_client.c
-@@ -663,9 +663,11 @@ stonith_action_async_done(mainloop_child
-
- if (action->timer_sigterm > 0) {
- g_source_remove(action->timer_sigterm);
-+ action->timer_sigterm = 0;
- }
- if (action->timer_sigkill > 0) {
- g_source_remove(action->timer_sigkill);
-+ action->timer_sigkill = 0;
- }
-
- if (action->last_timeout_signo) {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
deleted file mode 100644
index fc65ae9855a..00000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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}
-
-PATCHES=(
- "${FILESDIR}"/pacemaker-1.1.10-tinfo.patch
- "${FILESDIR}"/pacemaker-1.1.12-glib.patch
- "${FILESDIR}"/pacemaker-1.1.12-stonith.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- 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:<glib/ghash.h>:<glib.h>:" 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 "<sys-cluster/corosync-2.0"; then
- insinto /etc/corosync/service.d
- newins "${FILESDIR}/${PN}.service" ${PN} || die
- fi
-}
-
-pkg_postinst() {
- elog " "
- elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
- elog " "
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
deleted file mode 100644
index 492f531c702..00000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:<glib/ghash.h>:<glib.h>:" 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 "<sys-cluster/corosync-2.0"; then
- insinto /etc/corosync/service.d
- newins "${FILESDIR}/${PN}.service" ${PN} || die
- fi
-}
-
-pkg_postinst() {
- elog " "
- elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
- elog " "
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, sys-cluster/pacemaker/files/
@ 2020-10-21 12:59 Alexys Jacob
0 siblings, 0 replies; 3+ messages in thread
From: Alexys Jacob @ 2020-10-21 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 694bc6925f5e973d4eda78d9366013dc5974a487
Author: Timo Rothenpieler <btbn <AT> btbn <DOT> de>
AuthorDate: Fri Jul 24 19:35:49 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 12:58:11 2020 +0000
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 <AT> btbn.de>
Signed-off-by: Alexys Jacob <ultrabug <AT> 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 00000000000..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/pingd 2020-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 00000000000..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 "${FILESDIR}/${PN}.initd" "${PN}"
+
+ keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+ keepdir /var/log/pacemaker/bundles
+
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, sys-cluster/pacemaker/files/
@ 2023-05-01 12:49 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-05-01 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 8ccf91cfa8f86ee26dbdec9f88f9fead27f97437
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 12:47:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 12:49:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccf91cf
sys-cluster/pacemaker: drop 2.0.5
Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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/pingd 2020-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..000000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-01 12:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-01 12:49 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, sys-cluster/pacemaker/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-10-21 12:59 Alexys Jacob
2018-01-25 8:31 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox