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

(Portage version: 2.1.11.41/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

4 files changed, 138 insertions, 7 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/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