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 <[email protected]> -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 <[email protected]> -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 " " -}
