From 564b9f3505e189da565103bcca4c4e88c63467fd Mon Sep 17 00:00:00 2001
From: Kacper Kowalik <xarthisius@gentoo.org>
Date: Wed, 6 Oct 2010 07:17:12 +0000
Subject: Don't hardcode uid/gid wrt bug 339857. Thanks to Joe Flasch
 <jflasch@eb.com> for the report. Drop old.

(Portage version: 2.2_rc88/cvs/Linux x86_64)
---
 sys-cluster/cluster-glue/ChangeLog                 |  9 ++-
 .../cluster-glue/cluster-glue-1.0.6-r1.ebuild      | 90 +++++++++++++++++++++
 sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild | 91 ----------------------
 3 files changed, 98 insertions(+), 92 deletions(-)
 create mode 100644 sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild
 delete mode 100644 sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild

(limited to 'sys-cluster/cluster-glue')

diff --git a/sys-cluster/cluster-glue/ChangeLog b/sys-cluster/cluster-glue/ChangeLog
index 73f6b4ea08fd..75f23708afbb 100644
--- a/sys-cluster/cluster-glue/ChangeLog
+++ b/sys-cluster/cluster-glue/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/cluster-glue
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.8 2010/08/02 05:46:20 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.9 2010/10/06 07:17:12 xarthisius Exp $
+
+*cluster-glue-1.0.6-r1 (06 Oct 2010)
+
+  06 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -cluster-glue-1.0.6.ebuild, +cluster-glue-1.0.6-r1.ebuild:
+  Don't hardcode uid/gid wrt bug 339857. Thanks to Joe Flasch
+  <jflasch@eb.com> for the report. Drop old.
 
 *cluster-glue-1.0.6 (02 Aug 2010)
 
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..75d970e65bbe
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild
@@ -0,0 +1,90 @@
+# 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.6-r1.ebuild,v 1.1 2010/10/06 07:17:12 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 static-libs"
+
+RDEPEND="app-arch/bzip2
+	dev-libs/glib:2
+	net-libs/libnet:1.1
+	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-${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 static-libs static) \
+		--disable-fatal-warnings \
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-libnet \
+		--localstatedir=/var \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
+		--sysconfdir=/var \
+		${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/cluster-glue-1.0.6.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild
deleted file mode 100644
index 182b29b84a8c..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.6.ebuild,v 1.1 2010/08/02 05:46:20 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 static-libs"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/glib:2
-	net-libs/libnet:1.1
-	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-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.0.5-docs.patch"
-	"${FILESDIR}/1.0.5-respect_cflags.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-libnet \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		--sysconfdir=/var \
-		${myopts} \
-		--with-group-id=65 --with-ccmuser-id=65 \
-		--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_preinst() {
-	# check for cluster group, if it doesn't exist make it
-	groupadd -g 65 haclient
-	# check for cluster user, if it doesn't exist make it
-	useradd -u 65 -g haclient -s /dev/null -d /var/lib/heartbeat hacluster
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
-- 
cgit v1.2.3-65-gdbad