Added rewritten init script so running murmurd won't be seen as crashed by openrc anymore. Removed pidfile variable from conf.d file

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

5 files changed, 22 insertions, 22 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index 6f7e7669add3..6bb376eb20d5 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/murmur
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.35 2012/11/16 00:51:01 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.36 2012/12/31 09:52:43 polynomial-c Exp $
+
+*murmur-1.2.4_beta1-r1 (31 Dec 2012)
+*murmur-1.2.3-r4 (31 Dec 2012)
+
+  31 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> -murmur-1.2.3-r3.ebuild,
+  +murmur-1.2.3-r4.ebuild, -murmur-1.2.4_beta1.ebuild,
+  +murmur-1.2.4_beta1-r1.ebuild, files/murmur.confd, files/murmur.initd:
+  non-maintainer commit: Added rewritten init script so running murmurd won't
+  be seen as crashed by openrc anymore. Removed pidfile variable from conf.d
+  file. It's now hardcoded in the init script.
 
   16 Nov 2012; Timo Gurr <tgurr@gentoo.org> -murmur-1.2.3.ebuild:
   Actually remove the old.
diff --git a/media-sound/murmur/files/murmur.confd b/media-sound/murmur/files/murmur.confd
index 4e8c0cead76f..36367c51136b 100644
--- a/media-sound/murmur/files/murmur.confd
+++ b/media-sound/murmur/files/murmur.confd
@@ -1,9 +1,6 @@
 # where to look for the config file
 MURMUR_CONF=/etc/murmur/murmur.ini
 
-# where to look for the pid file
-MURMUR_PID=/var/run/murmur/murmur.pid
-
 # run as this user
 MURMUR_USER=murmur
 
diff --git a/media-sound/murmur/files/murmur.initd b/media-sound/murmur/files/murmur.initd
index f7c2ddd6480f..5b8c3b9938f5 100644
--- a/media-sound/murmur/files/murmur.initd
+++ b/media-sound/murmur/files/murmur.initd
@@ -1,5 +1,9 @@
 #!/sbin/runscript
 
+pidfile="/var/run/murmur/murmur.pid"
+command="/usr/bin/murmurd"
+command_args="-ini \"${MURMUR_CONF}\""
+start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20"
 extra_started_commands="reload"
 
 depend() {
@@ -8,29 +12,18 @@ depend() {
 	after bootmisc mysql
 }
 
-start() {
-	ebegin "Starting Murmur"
-	start-stop-daemon --start --pidfile "${MURMUR_PID}" \
-		--user "${MURMUR_USER}" --env HOME="${MURMUR_HOME}" \
-		--exec /usr/bin/murmurd -- -ini "${MURMUR_CONF}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Murmur"
-	start-stop-daemon --stop --pidfile "${MURMUR_PID}" \
-		--exec /usr/bin/murmurd
-	eend $?
+start_pre() {
+	checkpath -d -o ${MURMUR_USER} ${pidfile%/*}
 }
 
 reload() {
-	if [ ! -f "${MURMUR_PID}" ]; then
+	if [ ! -f "${pidfile}" ]; then
 		eerror "Murmur is not running"
 	return 1
 	fi
 	ebegin "Reloading Murmur"
-	start-stop-daemon --signal HUP --pidfile "${MURMUR_PID}" \
-		--exec /usr/bin/murmurd
+	start-stop-daemon --signal HUP --pidfile "${pidfile}" \
+		--exec ${command}
 	eend $?
 }
 
diff --git a/media-sound/murmur/murmur-1.2.3-r3.ebuild b/media-sound/murmur/murmur-1.2.3-r4.ebuild
index 621c59a18d6e..d3238bf7b00f 100644
--- a/media-sound/murmur/murmur-1.2.3-r3.ebuild
+++ b/media-sound/murmur/murmur-1.2.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.3-r3.ebuild,v 1.6 2012/06/09 23:13:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.3-r4.ebuild,v 1.1 2012/12/31 09:52:43 polynomial-c Exp $
 
 EAPI="4"
 
diff --git a/media-sound/murmur/murmur-1.2.4_beta1.ebuild b/media-sound/murmur/murmur-1.2.4_beta1-r1.ebuild
index f69a736dc411..5d89bd78cad0 100644
--- a/media-sound/murmur/murmur-1.2.4_beta1.ebuild
+++ b/media-sound/murmur/murmur-1.2.4_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4_beta1.ebuild,v 1.1 2012/11/16 00:49:08 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4_beta1-r1.ebuild,v 1.1 2012/12/31 09:52:43 polynomial-c Exp $
 
 EAPI="4"