sys-cluster/cluster-glue: Fix implicit openipmi dependency

* Depend on sys-libs/openipmi if USE=ipmilan
* Fix selector_t compile error with >openipmi-2.0.22
* Drop -fstack-protector-all while we're there

Fixes: https://bugs.gentoo.org/653248
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
new file mode 100644 (file)
index 0000000..74f9306
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/cluster-}"
+inherit autotools eutils flag-o-matic multilib user
+
+DESCRIPTION="Library pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
+SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc ipmilan libnet static-libs"
+
+RDEPEND="
+       !<sys-cluster/heartbeat-3.0
+       app-arch/bzip2
+       app-text/asciidoc
+       app-text/docbook-xml-dtd:4.4
+       dev-libs/glib:2
+       dev-libs/libaio
+       dev-libs/libxml2
+       ipmilan? ( sys-libs/openipmi )
+       libnet? ( net-libs/libnet:1.1 )
+       net-misc/curl
+       net-misc/iputils
+       || ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+"
+DEPEND="${RDEPEND}
+       doc? (
+               dev-libs/libxslt
+               app-text/docbook-xsl-stylesheets
+               )"
+
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
+
+pkg_setup() {
+       enewgroup haclient
+       enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
+}
+
+src_prepare() {
+       default
+       sed -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
+       sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
+               -i doc/Makefile.am || die
+       eautoreconf
+}
+
+src_configure() {
+       append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
+       local myopts
+
+       use doc && myopts=" --enable-doc"
+       econf \
+               $(use_enable ipmilan) \
+               $(use_enable libnet) \
+               $(use_enable static-libs static) \
+               --disable-fatal-warnings \
+               --disable-dependency-tracking \
+               --docdir=/usr/share/doc/${PF} \
+               --localstatedir=/var \
+               --with-ocf-root=/usr/$(get_libdir)/ocf \
+               ${myopts} \
+               --with-group-id=$(id -g hacluster) \
+               --with-ccmuser-id=$(id -u hacluster) \
+               --with-daemon-user=hacluster --with-daemon-group=haclient
+}
+
+src_install() {
+       default
+
+       dodir /var/lib/heartbeat/cores
+       dodir /var/lib/heartbeat/lrm
+
+       keepdir /var/lib/heartbeat/cores
+       keepdir /var/lib/heartbeat/lrm
+
+       # init.d file
+       cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
+       sed -i \
+               -e "s:%libdir%:$(get_libdir):" \
+               "${T}/heartbeat-logd.init" || die
+#      newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die
+       rm "${D}"/etc/init.d/logd
+
+       use static-libs || find "${D}" -type f -name "*.la" -delete
+}
+
+pkg_postinst() {
+       chown -R hacluster:haclient /var/lib/heartbeat/cores
+       chown -R hacluster:haclient /var/lib/heartbeat/lrm
+}

diff --git a/sys-cluster/cluster-glue/metadata.xml b/sys-cluster/cluster-glue/metadata.xml
index c8788d4ba4599ceef1490feac3ab4fbe4d01647d..a3716ef230b335976b5da45ee33c6a0cbcbafe86 100644 (file)
--- a/sys-cluster/cluster-glue/metadata.xml
+++ b/sys-cluster/cluster-glue/metadata.xml
@@ -7,6 +7,7 @@
        </maintainer>
        <longdescription>Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.</longdescription>
        <use>
+               <flag name="ipmilan">Install the ipmilan plugin (requires <pkg>sys-libs/openipmi</pkg>)</flag>
                <flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
        </use>
 </pkgmetadata>