gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-21 21:17:37 -08:00
Code Issues Projects Releases Wiki Activity

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

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

Signed-off-by: Kenton Groombridge <concord@gentoo.org>
This commit is contained in:
Kenton Groombridge 2025-11-05 10:37:03 -05:00
parent 6c0cff3f8e
commit c7038557bb
No known key found for this signature in database
GPG Key ID: 16DEEFE55F45B79E
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net-voip/murmur/files/murmur.initd-r3 Normal file
View File

@ -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 $?
}

3
net-voip/murmur/murmur-1.6.0_pre20250920.ebuild → net-voip/murmur/murmur-1.6.0_pre20250920-r1.ebuild
View File

@ -142,7 +142,7 @@ src_install() {
newins "${FILESDIR}"/murmur.logrotate murmur newins "${FILESDIR}"/murmur.logrotate murmur
# Copy over the initd file so we can modify it incase zeroconf support is on. # 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 if use zeroconf; then
sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die 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" \ mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \
"${D}/$(systemd_get_systemunitdir)/murmur.service" || die "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
sed -i 's|mumble-server\.ini|murmur.ini|' "${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 readme.gentoo_create_doc
} }

3
net-voip/murmur/murmur-9999.ebuild
View File

@ -142,7 +142,7 @@ src_install() {
newins "${FILESDIR}"/murmur.logrotate murmur newins "${FILESDIR}"/murmur.logrotate murmur
# Copy over the initd file so we can modify it incase zeroconf support is on. # 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 if use zeroconf; then
sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die 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" \ mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \
"${D}/$(systemd_get_systemunitdir)/murmur.service" || die "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
sed -i 's|mumble-server\.ini|murmur.ini|' "${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 readme.gentoo_create_doc
} }