[gentoo-commits] repo/gentoo:master commit in: net-voip/murmur/files/, net-voip/murmur/

[Kenton Groombridge]

commit:     c7038557bb8f4938b682168bffbdb2442181a7a4
Author:     Kenton Groombridge <concord <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  5 15:37:03 2025 +0000
Commit:     Kenton Groombridge <concord <AT> gentoo <DOT> org>
CommitDate: Wed Nov  5 15:42:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7038557

net-voip/murmur: fix args for 1.6.0_pre20250920, 9999

mumble-server's CLI arguments have changed, but upstream has not updated
the systemd unit yet.

Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>

 net-voip/murmur/files/murmur.initd-r3              | 24 ++++++++++++++++++++++
 ...0.ebuild => murmur-1.6.0_pre20250920-r1.ebuild} |  3 ++-
 net-voip/murmur/murmur-9999.ebuild                 |  3 ++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/net-voip/murmur/files/murmur.initd-r3 
b/net-voip/murmur/files/murmur.initd-r3
new file mode 100644
index 000000000000..9b36c2080352
--- /dev/null
+++ b/net-voip/murmur/files/murmur.initd-r3
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+pidfile="/run/murmur/murmur.pid"
+command="/usr/bin/mumble-server"
+command_args="--ini \"${MURMUR_CONF}\""
+start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" 
--wait 20"
+extra_started_commands="reload"
+
+depend() {
+       need localmount net
+       use dbus logger
+       after bootmisc mysql
+}
+
+start_pre() {
+       checkpath -q -d -o ${MURMUR_USER} ${pidfile%/*}
+}
+
+reload() {
+       ebegin "Reloading Murmur"
+       start-stop-daemon --signal HUP --pidfile "${pidfile}" \
+               --exec ${command}
+       eend $?
+}

diff --git a/net-voip/murmur/murmur-1.6.0_pre20250920.ebuild 
b/net-voip/murmur/murmur-1.6.0_pre20250920-r1.ebuild
similarity index 96%
rename from net-voip/murmur/murmur-1.6.0_pre20250920.ebuild
rename to net-voip/murmur/murmur-1.6.0_pre20250920-r1.ebuild
index 922869839366..22edf8abdfc5 100644
--- a/net-voip/murmur/murmur-1.6.0_pre20250920.ebuild
+++ b/net-voip/murmur/murmur-1.6.0_pre20250920-r1.ebuild
@@ -142,7 +142,7 @@ src_install() {
        newins "${FILESDIR}"/murmur.logrotate murmur
 
        # Copy over the initd file so we can modify it incase zeroconf support 
is on.
-       cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd || die
+       cp "${FILESDIR}"/murmur.initd-r3 "${T}"/murmur.initd || die
 
        if use zeroconf; then
                sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die
@@ -159,6 +159,7 @@ src_install() {
        mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \
                "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
        sed -i 's|mumble-server\.ini|murmur.ini|' 
"${D}/$(systemd_get_systemunitdir)/murmur.service" || die
+       sed -i '/^ExecStart/{s|-ini|--ini|;s| -fg||}' 
"${D}/$(systemd_get_systemunitdir)/murmur.service" || die
 
        readme.gentoo_create_doc
 }

diff --git a/net-voip/murmur/murmur-9999.ebuild 
b/net-voip/murmur/murmur-9999.ebuild
index 922869839366..22edf8abdfc5 100644
--- a/net-voip/murmur/murmur-9999.ebuild
+++ b/net-voip/murmur/murmur-9999.ebuild
@@ -142,7 +142,7 @@ src_install() {
        newins "${FILESDIR}"/murmur.logrotate murmur
 
        # Copy over the initd file so we can modify it incase zeroconf support 
is on.
-       cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd || die
+       cp "${FILESDIR}"/murmur.initd-r3 "${T}"/murmur.initd || die
 
        if use zeroconf; then
                sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die
@@ -159,6 +159,7 @@ src_install() {
        mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \
                "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
        sed -i 's|mumble-server\.ini|murmur.ini|' 
"${D}/$(systemd_get_systemunitdir)/murmur.service" || die
+       sed -i '/^ExecStart/{s|-ini|--ini|;s| -fg||}' 
"${D}/$(systemd_get_systemunitdir)/murmur.service" || die
 
        readme.gentoo_create_doc
 }