Do not keepdir /var/run/crm wrt #449878

Package-Manager: portage-2.1.11.41/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 105 insertions, 9 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index ed2219ed7bcd..e3c055091cbd 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/pacemaker
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.26 2012/11/14 17:24:22 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.27 2013/01/18 11:51:54 ultrabug Exp $
+
+*pacemaker-1.1.8-r1 (18 Jan 2013)
+
+  18 Jan 2013; Ultrabug <ultrabug@gentoo.org> +pacemaker-1.1.8-r1.ebuild,
+  files/pacemaker.initd:
+  Do not keepdir /var/run/crm wrt #449878
 
   14 Nov 2012; Jeroen Roovers <jer@gentoo.org> pacemaker-1.1.8.ebuild:
   Marked ~hppa (bug #442408).
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 725913559cde..a95ae434bc56 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -6,7 +6,7 @@ AUX 1.1.7-glibc2.16.patch 262 SHA256 4c0cce3eb7b02e7a879b81549e8300ca3d71af70d53
 AUX 1.1.8-backwards_compatibility.patch 1574 SHA256 e76dc96b2bcec2c7ea52be3a69b31668cac6292942c100ef4edf02deb5e37d8c SHA512 0544ed0bbb4b7ba7a39d03cc1f77be43ae35b315549304ba77d723a2545509c8069b208def3a3ae5510b0d2e51b7ef1c78f803902ed002b98aebd60c9ed221e1 WHIRLPOOL 1e87359be7695c84310e1497f247fbecc4570baa91895755ca92f32d4260fb8423a408c536750ded1f932d37c9f2c50c7791ac29f724645c1dd4f452f46ef929
 AUX pacemaker-1.0.10-asneeded.patch 750 SHA256 552e14bc626aafc7f290d5d5e2968679ee8b506bb200ef5f1bdb1dfd17db2b34 SHA512 01df0f4e0b7b429138cb0599242de0bb2c82ceb5f4cb2bf9c3c9952630c3721484fb9fb9367a09fea6d2234e1086b1ebb651bc42f9dbd81e2d17dee881c1e09b WHIRLPOOL 07cae71b91114a5aa7d22f48e41e72e11eb9676389f3df4c9158e878de28ac40665535e2dcc452e284758aac43261c5af4a6c681873bdcd7abc5d87ba18f19c4
 AUX pacemaker-1.0.10-installpaths.patch 200 SHA256 4b8d82244123f88491b7deecb99b2d36d6317ada5aa6c6339e95dbcdc73dbbee SHA512 68442af7365c145f28346e5d1b53ba8498b59b619cc6f769f5b407c246cd676821b28b7241777523794251cf1bdd36d57f2ace6d294ad6e33137bc57d71ae492 WHIRLPOOL 4c0e9c7deb9ed9244cb349ea8055328bf6d70b2dbc57b79538176a7fc5aca703ea4709623f137909203f76f376bf734175afbea56ebede7bf01614b6b0c8d4b4
-AUX pacemaker.initd 922 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af SHA512 ccd15fb4401863e51cf7639f3f143e35a969b11a53e0fcff49f70f33e78975051c7b879a299c082951e0b10db32eb9f53a52aaadfaab27cd27cc85be742e264a WHIRLPOOL 5f3e2a8cf4234684b9949d25e949ff187c1629914b580d379ad565856661127ceca48bcfd7715ecd0eb6e22650123d3dc1a282a3bbf5f0751fb95f8fb5e9bed7
+AUX pacemaker.initd 981 SHA256 9c081cbbf9e3843d61f8175e430f82414bd21661b6b7fb31f74b9c6c64874204 SHA512 ebf1fa1043dda01e1409960f6a0b13284186644e4ced9e348e61ac137c4d8151aa4bf82740fc553a347d19e547f61f5f08d7bd24ce2247dfeae38e7648945103 WHIRLPOOL edc3634278151e5c88082768b71281cc8cd1dd5b191ac93da219b0024a30e29fad538b904a99805b55d20ebec7212c7d8e4269524a846ece117a8aa442ab7c7e
 AUX pacemaker.service 105 SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b WHIRLPOOL ec891f83ec9f561060b08bd39e9e0ecf5b243617958bd68f07a2f087a881af85895a4f25f810657ababb6d4541dfcc63e59e195fb6006717dc0cb69a1f869376
 DIST Pacemaker-1.0.10.tar.bz2 6642704 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9 SHA512 ceed7414ce14d136205d35f4e3e11aa0c5b57b3e0069486ea2b9827d3f78f69ff216474348d3360f31ace06d1071f9287ae3300a495391509c2fb43407fc2711 WHIRLPOOL 3ac764ddcf00eebd851fdd69398670bb4cb5c083f89c6e770759463da8b1fb0f0ca03c0bb134386c45703e0db7b50139e466ba71ded72647131abde4301c283f
 DIST Pacemaker-1.0.11.tar.bz2 6706773 SHA256 568a8a7257ca9eb2d546c74fb18ee27d1e4e8eb58d9e2be0325cda1569b0ae75
@@ -17,13 +17,14 @@ EBUILD pacemaker-1.0.10.ebuild 1779 SHA256 642b4687ce2abdbba8fcad04fc6c76f1aa3dd
 EBUILD pacemaker-1.0.11.ebuild 1763 SHA256 693a452ee09487ab23cc7a0e83f78249eb962644637ff4d1c68337ab93e9f5ed SHA512 54589d39d6392afebf7f612007dc51b8bc36730bcc08de80597e5c41e2165694adffb1a8b4ddf18f0d051af573eba252610ad1c23e4225894e6908da8dd13f8a WHIRLPOOL 8a0c2ccd8e3d9aba8767607431efbe18c1265a815a840f58cfebfb6fc63fa28d5eed79535d06af24baae2adf2cac9c14bf44298969ffa0744799a0feffacfab6
 EBUILD pacemaker-1.0.12.ebuild 1748 SHA256 d2e1d4c2e6856d1e5acb946a7b3e350c2f53df7a27e317e81578cb7ac8fd7fc8 SHA512 a759d7d97e75f0735275c3fa42c61481ca2ca92c8f1b2de6006c630e913de1e57f90289264ae5c4967eacee7c83707780d3b8969bddb41dcfe11dc0660c2dab6 WHIRLPOOL 9cedbfff135b60dfa5c27b2199d9a0291430f1a1cbde76ae2d3dcc7b956107be43664e4d19043f8e20f1eaff278e706749c285874c6cdec47d8022ea55268870
 EBUILD pacemaker-1.1.7.ebuild 2397 SHA256 d6c799fd86e449edbeebe06ec709a5b5cf47f89677cf15fc3037716f39a2c167 SHA512 9aa981604060b494c09d5ae751732d887ea439e9099be5676f8f9bc8b4466537f83628d7e545ea45c6900d99871e3f1a1064a2d637a77abeb6ec852da27a8fc8 WHIRLPOOL 23b32d1ffde85726fffb00a644a9c9c7ba4433e73c040650062077a73170e16f805ebfadf30db9a3aac0a33559d94abaf832b96dfaa537ac42909e15326da554
+EBUILD pacemaker-1.1.8-r1.ebuild 2041 SHA256 cbc980a102ba7fea97050bfbaed41f33e1de9342466a57e7791d9d5fe4bf0241 SHA512 23f658c0b3e4de8eed72dfa9d6df6c059f084e24b5a44e362045c88b778e5b3de6bdff210378020f3b6f11af14f5a2d9ab8c448418bafc38cada99b97b4ee903 WHIRLPOOL d58dc823061fb0e1660f0a2c4cf70a28cda7ca59a369f59240a1bf84ddcc8c4dcc4d3ccb8c23ce73f7401cf53bf4aa4502a431dfce58c3f456b7a2a2e2277b05
 EBUILD pacemaker-1.1.8.ebuild 2010 SHA256 fe2b205b29edc05e3d9c6182fca1d9390ad3d47f2c004d162cb1dec8e3e07b7b SHA512 5be52a4d705365b57848bed75aa91363edbce48607974666a11ccd0d00f9eb0a15d4cc254baa2ea0f72fc1a01faebe2efe0527d5774b2574837944693dedf118 WHIRLPOOL 1437c531d6aceacc726dd42e547ae713e2cb3dbb144a1f18310594db9880418d5ec42db27142cb2a571f4552eb1927959a7eff85baa0dedc1541dee54bc0d472
-MISC ChangeLog 5083 SHA256 fd8f1b6b0fafd96bbea4c1388cc1679e6f76c01f94886c47d3b48e517566a3a4 SHA512 3eb3a9fe9d651161a3b37d3f1ed95d7d1ec2b006036087b2bdb701245a34aa478d0eb40bbccf08afe0ca00d646e6958d45739d8da7567fa6843ac848d13ce027 WHIRLPOOL abb35c8ef19d48f2cc73afc26e04882f495be89d54af08d7299e27af65150252719e49f233b975d52d947539eac183733b8d72d28e9a32e98e779be4431b183b
+MISC ChangeLog 5265 SHA256 473ccffe3da52ba5057848959f7ae7c177b6fff420b0dfd6d3a61c741f9aca98 SHA512 5a3c5868dbecada7718f2cc8328ee725fb399c8173443de996f0c48f57f6bb6392a774008280f56d9007a7e04997b061ce54366c96aa7fd654199495f04b8206 WHIRLPOOL bab2f78c586120b2ad98347c1275559c7f31b6d39d0f7b0abc2da530a61f58910cfc1b4f00330c6a004f17d17abdef215e8861d1215617b5676a1cfede26cc11
 MISC metadata.xml 870 SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b SHA512 57a334af692d25bd670f652d03aec50db6b19676910f8f988fff1f3e84af5d6c379204ee277eafcc8f570ad15445ce6364c9643f2d58540f9ee98b12ce9524c8 WHIRLPOOL 2e278c69b2f24eb38b876f832292bedcf2729252e36584c42a8438a965661bc63d87affe3e5e3e09b53b75a7e2f88e31f92edd857b1ff5ea897f47b286567c2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCj08cACgkQVWmRsqeSphPQiwCfQCFgdH4Jgb/i4b/SNB+ZpnFH
-ot8An3DNKPo3BfuN9niD9W7zH+OTYDKy
-=qbFt
+iF4EAREIAAYFAlD5N18ACgkQKiQSS7ZY+hPtzAD9GGplA83F3PmUetOVAbLjNDSL
+loXm72bSniCQVQ4AEucA/1Ml6ksWxsETORgXON9zfQebNmz8ABASieMHmUF82Rb6
+=tb6/
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/files/pacemaker.initd b/sys-cluster/pacemaker/files/pacemaker.initd
index 4231425f8874..98bc0d0e0e88 100644
--- a/sys-cluster/pacemaker/files/pacemaker.initd
+++ b/sys-cluster/pacemaker/files/pacemaker.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.initd,v 1.1 2011/02/21 14:39:28 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.initd,v 1.2 2013/01/18 11:51:54 ultrabug Exp $
 
 PIDFILE=/var/run/pacemaker.pid
 
@@ -13,6 +13,9 @@ depend() {
 start() {
 	nc=0
 	ebegin "Starting Pacemaker Cluster Manager"
+
+	checkpath -d -m 0750 -o hacluster:haclient /var/run/crm
+
 	einfon "Waiting for Corosync startup ."
 	while true; do
 		/usr/sbin/corosync-cfgtool -s &>/dev/null && break
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..642afe4f773f
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild,v 1.1 2013/01/18 11:51:54 ultrabug Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit autotools base python
+
+MY_PN=Pacemaker
+MY_P=${MY_PN}-${PV}
+MY_TREE="1f8858c"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
+SRC_URI="https://github.com/ClusterLabs/${PN}/tarball/${MY_P} -> ${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="
+	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}"
+PDEPEND="sys-cluster/crmsh"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-backwards_compatibility.patch
+	)
+
+S="${WORKDIR}/ClusterLabs-${PN}-${MY_TREE}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "/ggdb3/d" configure.ac || die
+	sed -e "s:<glib/ghash.h>:<glib.h>:" \
+		-i lib/ais/plugin.c || die
+	eautoreconf
+	python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+	local myopts=""
+	use heartbeat || myopts="--with-ais"
+	# appends lib to localstatedir automatically
+	econf \
+		--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() {
+	base_src_install
+	rm -rf "${D}"/var/run
+	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
+}