From 284d0954a26e37e0fe6d5442cdcf07e1ff6c3e54 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 22 Oct 2019 15:10:42 +0000 Subject: audio/murmur: Fix for clean installs Config file in 1.3.0 does not specify logfile location and attempts to write murmur.log to $PWD. Specify path for log and pidfile by patching sample config file. Also support reloading service via SIGUSR1 so TLS cert/key updates can be deployed without restarting server. MFH: 2019Q4 --- audio/murmur/Makefile | 2 +- audio/murmur/files/murmur.in | 2 ++ audio/murmur/files/patch-initialize-SSL | 22 +++++++++++----------- audio/murmur/files/patch-scripts_murmur.ini | 18 ++++++++++++++++++ 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 audio/murmur/files/patch-scripts_murmur.ini diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index b2c246da0d60..9786177c2341 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -3,7 +3,7 @@ PORTNAME= murmur PORTVERSION= 1.3.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio net MAINTAINER= feld@FreeBSD.org diff --git a/audio/murmur/files/murmur.in b/audio/murmur/files/murmur.in index b3eced81adbb..07afc2f838ed 100644 --- a/audio/murmur/files/murmur.in +++ b/audio/murmur/files/murmur.in @@ -29,6 +29,8 @@ command="%%PREFIX%%/sbin/murmurd" command_args="-ini %%PREFIX%%/etc/murmur.ini" pidfile=/var/run/murmur/murmur.pid start_precmd=murmur_prestart +extra_commands="reload" +sig_reload="USR1" murmur_prestart() { for i in /var/log/murmur /var/run/murmur /var/db/murmur; do diff --git a/audio/murmur/files/patch-initialize-SSL b/audio/murmur/files/patch-initialize-SSL index aa959f47b2b9..00687b8ebed3 100644 --- a/audio/murmur/files/patch-initialize-SSL +++ b/audio/murmur/files/patch-initialize-SSL @@ -8,27 +8,27 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363 Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876 Last-Updated: 2015-11-10 ---- src/mumble/main.cpp.orig 2015-07-09 13:23:46 UTC +--- src/mumble/main.cpp.orig 2019-08-30 01:01:56 UTC +++ src/mumble/main.cpp -@@ -170,6 +170,9 @@ int main(int argc, char **argv) { +@@ -132,6 +132,9 @@ int main(int argc, char **argv) { + os_init(); - #endif + SSL_library_init(); + SSL_load_error_strings(); + bool bAllowMultiple = false; - QUrl url; - if (a.arguments().count() > 1) { ---- src/murmur/main.cpp.orig 2015-07-09 13:23:46 UTC + bool suppressIdentity = false; + bool customJackClientName = false; +--- src/murmur/main.cpp.orig 2019-08-30 01:01:56 UTC +++ src/murmur/main.cpp -@@ -203,6 +203,9 @@ int main(int argc, char **argv) { - qsrand(QDateTime::currentDateTime().toTime_t()); - qInstallMsgHandler(murmurMessageOutput); +@@ -205,6 +205,9 @@ int main(int argc, char **argv) { + QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + #endif + SSL_library_init(); + SSL_load_error_strings(); + #ifdef Q_OS_WIN - Tray tray(NULL, &le); - #endif + // By default, windbus expects the path to dbus-daemon to be in PATH, and the path + // should contain bin\\, and the path to the config is hardcoded as ..\etc diff --git a/audio/murmur/files/patch-scripts_murmur.ini b/audio/murmur/files/patch-scripts_murmur.ini new file mode 100644 index 000000000000..cce298933ad9 --- /dev/null +++ b/audio/murmur/files/patch-scripts_murmur.ini @@ -0,0 +1,18 @@ +--- scripts/murmur.ini.orig 2019-10-22 15:01:53 UTC ++++ scripts/murmur.ini +@@ -102,13 +102,13 @@ icesecretwrite= + ; logs to the file 'murmur.log'. If you leave this field blank + ; on Unix-like systems, Murmur will force itself into foreground + ; mode which logs to the console. +-;logfile=murmur.log ++logfile=/var/log/murmur/murmur.log + + ; If set, Murmur will write its process ID to this file + ; when running in daemon mode (when the -fg flag is not + ; specified on the command line). Only available on + ; Unix-like systems. +-;pidfile= ++pidfile=/var/run/murmur/murmur.pid + + ; The below will be used as defaults for new configured servers. + ; If you're just running one server (the default), it's easier to -- cgit v1.2.3