Version bump fix #453134, update init scripts, drop old

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

5 files changed, 153 insertions, 20 deletions

diff --git a/sys-cluster/moosefs/ChangeLog b/sys-cluster/moosefs/ChangeLog
index eedce5404250..0142f20d9e06 100644
--- a/sys-cluster/moosefs/ChangeLog
+++ b/sys-cluster/moosefs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/moosefs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/ChangeLog,v 1.4 2012/07/02 13:51:07 ultrabug Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/ChangeLog,v 1.5 2013/01/21 12:56:41 ultrabug Exp $
+
+*moosefs-1.6.26 (21 Jan 2013)
+
+  21 Jan 2013; Ultrabug <ultrabug@gentoo.org> -moosefs-1.6.20-r2.ebuild,
+  +moosefs-1.6.26.ebuild, +files/mfs.initd-r1, +files/mfscgiserver.initd-r1:
+  Version bump fix #453134, update init scripts, drop old
 
 *moosefs-1.6.25 (02 Jul 2012)
 
diff --git a/sys-cluster/moosefs/Manifest b/sys-cluster/moosefs/Manifest
index 66663de7d790..f408d6547b25 100644
--- a/sys-cluster/moosefs/Manifest
+++ b/sys-cluster/moosefs/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mfs.confd 368 RMD160 74784eff195a3baf07d07505fb518bcfdd6fda9e SHA1 e47cca98f9e677bcb4a71c829294e41506010c62 SHA256 be22c70e7a40a5373d18bfe17ec5a692f50b914c5c044a121a83cfb90a680c43
-AUX mfs.initd 1284 RMD160 ebe77392558ed7bb945c06b98ae6b8efb87216f4 SHA1 3d0f3f53753b523bdc60186c85c1c874b72239b3 SHA256 ba981b336e4a2b299825f43e6f071cd87276a8ae7cc259450ba9a9394aa3cd24
-AUX mfscgiserver.confd 180 RMD160 c0871d4f71269f8e08ddfb40216666264bd31c4e SHA1 c0298da576bdd72167352cbffc7d23dff45fb408 SHA256 23ccc3ee023543a162d6b4cfb1406922597b4cd744d35b6db1f4f7ea8bc138f6
-AUX mfscgiserver.initd 396 RMD160 81cc66fedc9d0e7b324f80cce7715bca29eda907 SHA1 1456a6e3550d5c8654e9ee8e10fcb33d1638383d SHA256 e406762ce1a098e32458594e8a7a0c2a26a87df7726f274cf60aecc21a7c7da2
-DIST mfs-1.6.20.tar.gz 657147 RMD160 039863f00882678cbba44db34eb7d2e755161925 SHA1 2d163a6fb15f98ba2a7b010ac1ec33f6cba40bfe SHA256 a3bf6c992a9b5724c37dea6c76091072e22f00a749d6aecc61d8c885607246a1
-DIST mfs-1.6.25.tar.gz 740983 RMD160 2be758260f4161d8da21e5313a30e680d56fe25a SHA1 c2f4233940dd8025bb32077f0263af7767e52602 SHA256 64b7ce749699e437f47e1561e8044362ea714a8dd2d3bad0c6a7165e9ad142ee
-EBUILD moosefs-1.6.20-r2.ebuild 1401 RMD160 e5988ff8d35ed64ba2d1f3d852fdf60c515f816f SHA1 03aea6b4788864cedfa90349145a880b2b76358b SHA256 8551165641b4c010370d51353044a0460d79fc91b567575dd95ccdfec2bd22b3
-EBUILD moosefs-1.6.25.ebuild 1411 RMD160 8e1315f76d981987ed2497d1effeeb21fa5ab523 SHA1 d538f62bcdd563dc87805ae55b8df2e6f60d5eda SHA256 2baed169e4db5bd4224f356c66a3460f76c78e8430c4bbb508406481364728ae
-MISC ChangeLog 804 RMD160 4bd3bb4974452424a9bcd01b6d771581309b6492 SHA1 a4befb73aedfe15bc5267e1af469e1f9f66341b5 SHA256 b7fe88ff02756ba7f28efc6a6c772c7ca45f65795e25f53142da64ef3d66ac2b
-MISC metadata.xml 561 RMD160 d211a5158eec236f4516d6fc4a2e6993629384f7 SHA1 5464254a876d09e3fc5cd4f858ea9a419b3c9c4f SHA256 8af3c3972cc3b105e3b7c75cd515a898e094d428a6b7133e85c052547a86b44d
+AUX mfs.confd 368 SHA256 be22c70e7a40a5373d18bfe17ec5a692f50b914c5c044a121a83cfb90a680c43 SHA512 508b1d99befd1340d3685df3d548399789321edf7f73f11b32baa88291b65dfcba98436b6f85b1975924ae596b962c501391fd783562b12f7cc3862183646e56 WHIRLPOOL 9d566699211cb1acc4c59743bf42571755d472ddca54f06219205aa2a3a167e1f4760a16abf699659e23a941b720c3c6d1ede3bf7f25875a2d55acd16813568e
+AUX mfs.initd 1284 SHA256 ba981b336e4a2b299825f43e6f071cd87276a8ae7cc259450ba9a9394aa3cd24 SHA512 c5d761efab05590f9fdd06d2b401f0100ba745e7d34fe66b4ccb97cb62f29325b0e0394ceeb948fbf816f0d496bb015b608ba0f18911c580935d0ac701d4fb19 WHIRLPOOL b45de0e0ca8d1fb5dbb57f2f273ddbc57b25fd06485f302916eb21cbc1c0f36a0bbca6b56194ce2a98d181890cf339144ed5d3ff3753057f551e6b225883fc39
+AUX mfs.initd-r1 1525 SHA256 f555079d54c33dd0974bbd7dbb8ad5178df8bb6e88ad8d1b5a374c22c774877b SHA512 c247767838c7954abd2193c4a79d662aa35d81b2460d8b247b46d833764f469a59390ceebec914b44042f91abaf0f60aaa28a9ac5507e6901378d659f73ba783 WHIRLPOOL aafcc9cf20dcf27b471c70285f5d46d178f0487847be2e2ba70e27febaf993a9ff4f5e0996b6abf7b6ce37ace6dadc5f09f34b359f591b4939a62c6711a401de
+AUX mfscgiserver.confd 180 SHA256 23ccc3ee023543a162d6b4cfb1406922597b4cd744d35b6db1f4f7ea8bc138f6 SHA512 d0389a3200f3ccad16578970d7c0e4c649df8d35eb25b586ac23ad828d06ce9280a5b977174e7a1d03d67af28817fc35df5544e0190a159b3e7ad1aebb92cc7c WHIRLPOOL a36adaa149eb2314c315831d94998f5c1844510267e25c1e7f124c3a70dc9561d71c6f31d5ae316929fe561966d450c21c86737433ca3b8b314d00e0f6bdeaa3
+AUX mfscgiserver.initd 396 SHA256 e406762ce1a098e32458594e8a7a0c2a26a87df7726f274cf60aecc21a7c7da2 SHA512 8898e8220f517d9e6c28392f363576679bd350634e1bcbe702a3dbe40bde698fb02cb1dec08cfd63b80c04143c45fc4b2ea4e1cc0c2483037d68db744ef06a0a WHIRLPOOL b1640f6cfc456c4cfcf66f572b1dcec8e0df275c2e0dd869dd90006524539d6c958a656d6e86f6f01a945ab385dd5088206486497f2808f26fce646e4ea1f2f6
+AUX mfscgiserver.initd-r1 542 SHA256 f2618f27fd5525e1db4f7f3bb3148be0d328c99bb03108741c88e948cf9dd472 SHA512 8492575abf94cfc2a02f741cb43fef0175ac03a7d08accf1b9e8e35817cdc2a0e9a176f978aa2c312ec6e0a44feeb5c1856a91ff34851af487217bb8b68436de WHIRLPOOL d7bd46817ab41fc345181b5e11fe69658502c31f0c21e422715404e50637cca01ba6f31f4be8e259e70dce85aa4bac3ad3eb4bb8fe6ffe43a0a20e4122d914f3
+DIST mfs-1.6.25.tar.gz 740983 SHA256 64b7ce749699e437f47e1561e8044362ea714a8dd2d3bad0c6a7165e9ad142ee
+DIST mfs-1.6.26.tar.gz 754573 SHA256 f250f97c6f2a229277fdbf9fe96036873fd6c95a38f484f06e6b87a404c01885 SHA512 42fdf2b43f3d4a81068ecad48da5519adbc9fb753931198f48741e6d7235b80864ee7d8e3c04b5de2e9536be9459b72e3a5b12037adfdb97bf2a7695595e9ec5 WHIRLPOOL 234ea32360db89076d1c1da5875d28277c27a5989195c4fb638b44c86fca0df183c2bb62a73dd3e3e2a5118e04223f8e14b66da5b5a090fed1c1d3f3dae3888a
+EBUILD moosefs-1.6.25.ebuild 1411 SHA256 2baed169e4db5bd4224f356c66a3460f76c78e8430c4bbb508406481364728ae SHA512 de8afe551e1a739edbc197e22b2a206fbb45ebd88b3130ad2c451ea7e60486a21d5ab5e2bec736c7c4b1766a96f170039d89442336ad603a02e65afb6df01816 WHIRLPOOL f58b2b1bdfd23d31488d74b243969304db12bada1903e848d2983c46eac85357ac0e21d419685e7d358d8c5128d171ee24e85fc9ffcbacc5c167d9e6085d6ca4
+EBUILD moosefs-1.6.26.ebuild 1417 SHA256 d0ec8c62d082fc6962ed63f20583fbd9af21dc91b37842b411661614f36a0569 SHA512 45daba095b458832f52c4e8165c15216dcafb7f8ea0f255dad5d915edf0a502d462a87e5b76c5335a2127fe5fb9a9fc1ac629ab874106b903282d4b0faff73aa WHIRLPOOL 7bbbd96cb198852ef6b1d5e6d2367a8d4dfd38cf292c3565571f7700282570ea778429b665dbcfd9efa3ad8350265085ba2c28c20df741b225064beae024514f
+MISC ChangeLog 1044 SHA256 94efd929598f97b0655d3f330932c3a4c2e81879dd00e21b6ee01a9882e32698 SHA512 6f64d4df11d92a152bc94bda61de32ce7c4e19634520b008eee9e0f062e4f2bd6a5c3a7abe17cd6ebbf7b68ce2087dfe81fbeaefe30d40cdf8c229edec7db1e5 WHIRLPOOL 48307463554db25853870a2b27421c264987145357719cfb88ad65d9011fc7710d728d3273e06ae20687c452e47081b17fa5bee4c787d7d9665450a4380c5a8c
+MISC metadata.xml 561 SHA256 8af3c3972cc3b105e3b7c75cd515a898e094d428a6b7133e85c052547a86b44d SHA512 2baecd00d7097b7fc799458236db7e527c03e1637de34902b7517351ad9abc9194c5da805352809afbadfdc3a984440e6857320b2eab87d24cc8438799b26b02 WHIRLPOOL e4a5944742de2facd2f2ff636fa7d8c1dc3498f31f61d024f068e4d8ca1f88ffbf0166e2d9fec12e990ff5bc71a1d26b8edd36e0c73824bd0af7e51a038f70ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/xp1YACgkQKiQSS7ZY+hMb5AD/Usprlphy2CrYOvaaePoXI32K
-KLVWvyTj6fVHfzVk5IoA/0ABw31T5F+Qm1toHVKC00YboRqhYAJSPmG/E6B8/Nqt
-=kbw1
+iF4EAREIAAYFAlD9Ow4ACgkQKiQSS7ZY+hMk+AEAwoxvQDAyiNXixW8BCsxfy5A1
+kFCdPonQxGcoRWV4I3YA/ipF5nrb2CgMQBEZ9z4GKl8za48WwiuX0N4WGMrKvgCc
+=3bCF
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/moosefs/files/mfs.initd-r1 b/sys-cluster/moosefs/files/mfs.initd-r1
new file mode 100644
index 000000000000..9c9e7a39b7ba
--- /dev/null
+++ b/sys-cluster/moosefs/files/mfs.initd-r1
@@ -0,0 +1,96 @@
+#!/sbin/runscript
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+}
+
+chkconfig() {
+	[ -z "${ROLES}" ] && { eerror "No role defined !"; return 1;}
+	for ROLE in ${ROLES}; do
+		if [ ! -f /etc/mfs/${ROLE}.cfg ]; then
+			eerror "Missing configuration file for role ${ROLE} !"
+			return 1
+		fi
+	done
+	return 0
+}
+
+autorestore() {
+	einfo "AUTORESTORE set, trying to restore metadata files"
+	mfsmetarestore -a &>/dev/null
+	return $?
+}
+
+start_role() {
+	local ROLE=$1
+	local RETURN=0
+
+	ebegin "${ROLE}"
+	start-stop-daemon -q --start --exec "${ROLE}" -- start >/dev/null
+	RETURN=$?
+	eend ${RETURN}
+
+	return ${RETURN}
+}
+
+start_roles() {
+	local RETURN=0
+
+	eindent
+	for ROLE in ${ROLES}; do
+
+		start_role ${ROLE} || RETURN=$?
+		eend ${RETURN}
+
+		if [ "${RETURN}" != "0" ] && [ "${ROLE}" == "mfsmaster" ] && [ ${AUTORESTORE} -eq 1 ]; then
+			eindent
+			autorestore && start_role ${ROLE}
+			RETURN=$?
+			eoutdent
+		fi
+
+		[ "${RETURN}" != "0" ] && break
+	done
+	eoutdent
+
+	return ${RETURN}
+}
+
+start() {
+	ebegin "Starting mfs node"
+	chkconfig && start_roles
+	eend $?
+}
+
+stop() {
+	local RETURN=0
+
+	ebegin "Stopping mfs node"
+	eindent
+	local REVERSE=$(echo ${ROLES} | tac -s' ')
+	for ROLE in ${REVERSE}; do
+		ebegin "${ROLE}"
+		start-stop-daemon -q --stop -n ${ROLE} || RETURN=$?
+		eend ${RETURN}
+	done
+	eoutdent
+
+	eend ${RETURN}
+}
+
+reload() {
+	local RETURN=0
+
+	ebegin "Reloading mfs node"
+	eindent
+	for ROLE in ${ROLES}; do
+		ebegin "${ROLE}"
+		start-stop-daemon --signal HUP -n ${ROLE}
+		eend ${RETURN}
+	done
+	eoutdent
+
+	eend ${RETURN}
+}
diff --git a/sys-cluster/moosefs/files/mfscgiserver.initd-r1 b/sys-cluster/moosefs/files/mfscgiserver.initd-r1
new file mode 100644
index 000000000000..b4ebd1f9d1c2
--- /dev/null
+++ b/sys-cluster/moosefs/files/mfscgiserver.initd-r1
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+
+PIDFILE=/var/run/mfscgiserv.pid
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting mfs CGI server"
+	start-stop-daemon --start --quiet --exec /usr/sbin/mfscgiserv \
+	--pidfile "${PIDFILE}" --make-pidfile --background \
+	-- -H ${BIND_HOST} -P ${BIND_PORT} -f
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mfs CGI server"
+	start-stop-daemon --stop -q --pidfile "${PIDFILE}"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading mfs CGI server"
+	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/sys-cluster/moosefs/moosefs-1.6.20-r2.ebuild b/sys-cluster/moosefs/moosefs-1.6.26.ebuild
index f1c6e7b48ccf..d666a7098cdd 100644
--- a/sys-cluster/moosefs/moosefs-1.6.20-r2.ebuild
+++ b/sys-cluster/moosefs/moosefs-1.6.26.ebuild
@@ -1,6 +1,6 @@
-# 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/moosefs/moosefs-1.6.20-r2.ebuild,v 1.1 2011/08/02 08:47:31 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/moosefs-1.6.26.ebuild,v 1.1 2013/01/21 12:56:41 ultrabug Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A filesystem for highly reliable petabyte storage"
 HOMEPAGE="http://www.moosefs.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.moosefs.org/tl_files/mfscode/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -49,10 +49,10 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	newinitd "${FILESDIR}/mfs.initd" mfs
+	newinitd "${FILESDIR}/mfs.initd-r1" mfs
 	newconfd "${FILESDIR}/mfs.confd" mfs
 	if use cgi; then
-		newinitd "${FILESDIR}/mfscgiserver.initd" mfscgiserver
+		newinitd "${FILESDIR}/mfscgiserver.initd-r1" mfscgiserver
 		newconfd "${FILESDIR}/mfscgiserver.confd" mfscgiserver
 	fi