fix bug #348783 about libnet dep on sys-cluster/cluster-glue and sys-cluster/resource-agents

9 files changed, 299 insertions, 0 deletions

diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
new file mode 100644
index 000000000..7b420b40a
--- /dev/null
+++ b/sys-cluster/cluster-glue/Manifest
@@ -0,0 +1,5 @@
+AUX 1.0.5-docs.patch 1329 RMD160 e3617a9ce4b9ca562328d81b4563bb2ab82324c4 SHA1 08c689eebdee966512721328277ea7f828a6702e SHA256 27d854f18b0830b9f2ac0161a244a06edc04da0fa4661d81dc171e07e3efa24b
+AUX 1.0.5-respect_cflags.patch 287 RMD160 b61f719213f4d11fd43d9b6444201d26048de468 SHA1 e0a41227a9f463d5f431d64c240746a3587dcdd7 SHA256 be7f2c9cbfc8201118abbdb2aeb1cf6d9aca2c586ae7a6d55963ee3143d9f71e
+AUX heartbeat-logd.init 953 RMD160 7319d87e690f2309c9b76a9cd52f96c0754b5362 SHA1 cd324adbc95b65bf42eafed4a3aa6a9709395719 SHA256 c174d2767c7cee63d77436c8e533aba7d6856af398c82881c7ba3758eba38e7b
+DIST glue-1.0.7.tar.bz2 444765 RMD160 b3e0cbfc98815d2f4adf9c6f64276b2f5b7df494 SHA1 f02ab98686a3a89879e96d1e3846033bb96daf2d SHA256 dcb2500d049476142204491113ff8eeeda210ca26530aa982ff3896bb65a84c7
+EBUILD cluster-glue-1.0.7-r1.ebuild 2142 RMD160 129e516bd6e2700ef61fdf9a8ad9eebd3d0a8a24 SHA1 b52233b4867129aa30770a3cb7c7274a016ea2e0 SHA256 4d809326389babc327ae3f20e09c44a95508277aa1a7a7b6f8df4bd33bdcf75e
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.7-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.7-r1.ebuild
new file mode 100644
index 000000000..c47460be0
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.7-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.7.ebuild,v 1.1 2010/12/12 09:49:31 xarthisius Exp $
+
+EAPI="2"
+
+MY_P="${P/cluster-}"
+inherit autotools multilib eutils base
+
+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 libnet static-libs"
+
+RDEPEND="app-arch/bzip2
+	dev-libs/glib:2
+	libnet? ( <net-libs/libnet-1.1.5 )
+	net-misc/curl
+	net-misc/iputils
+	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+	dev-libs/libxml2
+	!<sys-cluster/heartbeat-3.0"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		)"
+
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/1.0.5-docs.patch"
+	"${FILESDIR}/1.0.5-respect_cflags.patch"
+)
+
+pkg_setup() {
+	enewgroup haclient
+	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
+}
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	use doc && myopts=" --enable-doc"
+	econf \
+		$(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() {
+	base_src_install
+
+	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
+}
+
+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/files/1.0.5-docs.patch b/sys-cluster/cluster-glue/files/1.0.5-docs.patch
new file mode 100644
index 000000000..424c52962
--- /dev/null
+++ b/sys-cluster/cluster-glue/files/1.0.5-docs.patch
@@ -0,0 +1,40 @@
+--- doc/Makefile.am
++++ doc/Makefile.am
+@@ -29,11 +29,10 @@
+ 
+ if BUILD_DOC
+ man_MANS		+= hb_report.8 ha_logd.8 ha_logger.1 stonith.8 meatclient.8
+-endif
+ 
+ EXTRA_DIST		= $(man_MANS)
+ 
+-STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
++STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets/
+ MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
+ HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
+ FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
+@@ -47,3 +46,4 @@
+ 	$(XSLTPROC) \
+ 	$(XSLTPROC_MANPAGES_OPTIONS) \
+ 	$(MANPAGES_STYLESHEET) $<
++endif
+--- configure.ac
++++ configure.ac
+@@ -492,11 +492,13 @@
+ AC_PATH_PROGS(PKGCONFIG, pkg-config)
+ AC_PATH_PROGS(XML2CONFIG, xml2-config)
+ 
+-AC_PATH_PROGS(XSLTPROC, xsltproc)
+-AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" )
+-if test "x$XSLTPROC" = "x"; then
+-   AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages])
++AC_ARG_ENABLE([doc],
++ [  --enable-doc 	build documentation, [default=no]],
++ [enable_doc=$withval], [enable_doc=no])
++if test "x$enable_doc" != "xno"; then
++	AC_PATH_PROGS(XSLTPROC, xsltproc)
+ fi
++AM_CONDITIONAL(BUILD_DOC, test "x$enable_doc" != "xno" )
+ 
+ AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind)
+ AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command)
diff --git a/sys-cluster/cluster-glue/files/1.0.5-respect_cflags.patch b/sys-cluster/cluster-glue/files/1.0.5-respect_cflags.patch
new file mode 100644
index 000000000..f89432fc7
--- /dev/null
+++ b/sys-cluster/cluster-glue/files/1.0.5-respect_cflags.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -1149,8 +1149,6 @@
+         CFLAGS="$CFLAGS -g"
+ 	enable_fatal_warnings=no
+ else
+-        CFLAGS="$CFLAGS -ggdb3 -O0"
+-
+ 	# We had to eliminate -Wnested-externs because of libtool changes
+         EXTRA_FLAGS="-fgnu89-inline
+ 		-fstack-protector-all
diff --git a/sys-cluster/cluster-glue/files/heartbeat-logd.init b/sys-cluster/cluster-glue/files/heartbeat-logd.init
new file mode 100644
index 000000000..60de12026
--- /dev/null
+++ b/sys-cluster/cluster-glue/files/heartbeat-logd.init
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+
+PIDFILE=/var/run/heartbeat-logd.pid
+
+depend() {
+	need net
+}
+
+BINARY="/usr/%libdir%/heartbeat/ha_logd"
+USER="hacluster"
+GROUP="haclient"
+CONFIG="/etc/logd.cf"
+LOGFILE="/var/log/ha_logger.log"
+
+start() {
+	ebegin "Starting heartbeat non-blocking log service"
+
+	COMMAND_ARGS="-d"
+	[[ -f "${CONFIG}" ]] && COMMAND_ARGS+=" -c ${CONFIG}"
+
+	if [ -n "${RC_UNAME}" ]; then
+		PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}"
+	else
+		PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1 &"
+	fi
+	eval ${CHRT} start-stop-daemon \
+		--quiet --start --chdir "${RUNTIMEDIR}" \
+		--pidfile "${PIDFILE}" \
+		--make-pidfile \
+		--exec ${BINARY} ${COMMAND_ARGS} --chuid "${USER}:${GROUP}" \
+		--nicelevel "${NICELEVEL}" \
+		${PARAMS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping heartbeat non-blocking log service"
+	start-stop-daemon --stop --retry 3 --quiet --exec "${BINARY}"
+	rm -f "${PIDFILE}"
+	eend $?
+}
+
+restart() {
+	stop
+	sleep 3
+	start
+}
diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
new file mode 100644
index 000000000..f18e287c6
--- /dev/null
+++ b/sys-cluster/resource-agents/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.3-docs.patch 1164 RMD160 b557476f4d8867ddb7bdf7aae786c7b8a414a6a7 SHA1 91cb5a505c069bfc42dfef966240286a7a66c761 SHA256 92f061cf7926e6d93ed993d94df1e360be3a4f88e54cdf0134d14d0d054b6350
+AUX 1.0.3-respect_cflags.patch 316 RMD160 18c50ad77c7192840a14aaa3a6487cca8d5f2028 SHA1 1d6f2a42c83f9439934811f0a0a4d3c168c411a9 SHA256 62cee339be61f5d1fd0cf0e335687633e19e38f84feb4ae2de52547269f9fce2
+DIST agents-1.0.3.tar.bz2 247634 RMD160 f3596d15f50567abd336161fe31415e8017b48ec SHA1 30b6f21f4023736b64ed42c44eb20eca7eb805b7 SHA256 09b58332e34cf128c8d53d5bb4b3f61e402c2e0c0c809f5abae53ca144ad101e
+EBUILD resource-agents-1.0.3-r1.ebuild 1583 RMD160 b738b194311fe4bc3ebe71febeddd49d46ff6798 SHA1 58545231cb81dd4ffc918857e0d4d4815c70e966 SHA256 13c4385a0ee825f43b4dd080fe7068784b5560d5b59d1ef2879fec5bef2e0d11
diff --git a/sys-cluster/resource-agents/files/1.0.3-docs.patch b/sys-cluster/resource-agents/files/1.0.3-docs.patch
new file mode 100644
index 000000000..c4069392c
--- /dev/null
+++ b/sys-cluster/resource-agents/files/1.0.3-docs.patch
@@ -0,0 +1,31 @@
+--- configure.in
++++ configure.in
+@@ -481,10 +481,12 @@
+ AC_DEFINE_UNQUOTED(POWEROFF_CMD, "$POWEROFF_CMD", path to the poweroff command)
+ AC_DEFINE_UNQUOTED(POWEROFF_OPTIONS, "$POWEROFF_OPTIONS", poweroff options)
+ 
+-AC_PATH_PROGS(XSLTPROC, xsltproc)
+-AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" )
+-if test "x$XSLTPROC" = "x"; then
+-   AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages])
+-fi
++AC_ARG_ENABLE([doc],
++	AS_HELP_STRING([--enable-doc],[Build documentation]))
++
++AS_IF([test "x$enable_doc" = "xyes"], [
++	AC_PATH_PROGS(XSLTPROC, xsltproc)
++])
++AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"] )
+ AC_SUBST(XSLTPROC)
+ 
+--- doc/Makefile.am
++++ doc/Makefile.am	2010-06-20 22:04:12.649433890 +0000
+@@ -18,7 +18,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
++STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets/
+ MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
+ HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
+ FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
diff --git a/sys-cluster/resource-agents/files/1.0.3-respect_cflags.patch b/sys-cluster/resource-agents/files/1.0.3-respect_cflags.patch
new file mode 100644
index 000000000..e22603a9f
--- /dev/null
+++ b/sys-cluster/resource-agents/files/1.0.3-respect_cflags.patch
@@ -0,0 +1,11 @@
+--- configure.in
++++ configure.in
+@@ -646,8 +646,6 @@
+         CFLAGS="$CFLAGS -g"
+ 	enable_fatal_warnings=no
+ else
+-        CFLAGS="$CFLAGS -ggdb3 -O0"
+-
+ 	# We had to eliminate -Wnested-externs because of libtool changes
+ 	# Also remove -Waggregate-return because we use one libnet
+ 	# call which returns a struct
diff --git a/sys-cluster/resource-agents/resource-agents-1.0.3-r1.ebuild b/sys-cluster/resource-agents/resource-agents-1.0.3-r1.ebuild
new file mode 100644
index 000000000..a5e02bb7c
--- /dev/null
+++ b/sys-cluster/resource-agents/resource-agents-1.0.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild,v 1.4 2010/08/28 09:16:01 xarthisius Exp $
+
+EAPI="2"
+
+MY_P="${P/resource-}"
+inherit autotools multilib eutils base
+
+DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents"
+SRC_URI="http://hg.linux-ha.org/agents/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc libnet"
+
+DEPEND="sys-apps/iproute2
+	sys-cluster/cluster-glue
+	!<sys-cluster/heartbeat-3.0
+	libnet? ( <net-libs/libnet-1.1.5 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Cluster-Resource-Agents-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/1.0.3-docs.patch"
+	"${FILESDIR}/1.0.3-respect_cflags.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		--localstatedir=/var \
+		--docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
+		$(use_enable doc) \
+		$(use_enable libnet)
+}
+
+src_install() {
+	base_src_install
+	rm -rf "${D}"/etc/init.d/ldirectord || die
+}
+
+pkg_postinst() {
+	elog "To use Resource Agents installed in /usr/$(get_libdir)/ocf/resource.d"
+	elog "you have to emerge required runtime dependencies manually."
+	elog ""
+	elog "Description and dependencies of all Agents can be found on"
+	elog "http://www.linux-ha.org/wiki/Resource_Agents"
+	elog "or in the documentation of this package."
+}