commit: 0d50a2d60855edd7408b35062cc596e4fca7a3f1 Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> AuthorDate: Tue Nov 10 23:19:16 2020 +0000 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> CommitDate: Tue Nov 10 23:22:21 2020 +0000 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 <mschiff <AT> 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 00000000000..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.000000000 +0100 ++++ pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py 2020-11-10 22:47:21.600435423 +0100 +@@ -125,7 +125,7 @@ + ''' + + def __init__(self, rsh, silent=False): +- self.async = [] ++ self.hasync = [] + self.rsh = rsh + self.silent = silent + self.logger = LogFactory() +diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py +--- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py 2020-10-30 18:35:13.000000000 +0100 ++++ pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py 2020-11-10 22:46:08.287258247 +0100 +@@ -140,8 +140,8 @@ + self.logger.debug(message) + + def harvest(self, delegate=None): +- async = self.harvest_async(delegate) +- async.join() ++ hasync = self.harvest_async(delegate) ++ hasync.join() + + def harvest_async(self, delegate=None): + self.log("Not implemented") diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch new file mode 100644 index 00000000000..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.000000000 +0100 ++++ pacemaker-Pacemaker-1.1.24-rc1/configure.ac 2020-11-10 23:21:04.728714112 +0100 +@@ -2198,7 +2198,7 @@ + + dnl Put the above variables to use + LIBTOOL="${LIBTOOL} --tag=CC \$(QUIET_LIBTOOL_OPTS)" +-MAKE="${MAKE} \$(QUIET_MAKE_OPTS)" ++MAKE="${MAKE} ${QUIET_MAKE_OPTS}" + + AC_SUBST(CC) + AC_SUBST(MAKE) 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 00000000000..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 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 "<sys-cluster/corosync-2.0"; then + insinto /etc/corosync/service.d + newins "${FILESDIR}/${PN}.service" "${PN}" + fi + find "${D}" -name '*.la' -delete || die + + keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine} + python_optimize +}
