Date: Tue, 22 Oct 2019 15:12:05 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r515200 - in branches/2019Q4/audio/murmur: . files Message-ID: <201910221512.x9MFC5vr023493@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Tue Oct 22 15:12:04 2019 New Revision: 515200 URL: https://svnweb.freebsd.org/changeset/ports/515200 Log: MFH: r515199 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. Approved by: portmgr (implicit) Added: branches/2019Q4/audio/murmur/files/patch-scripts_murmur.ini - copied unchanged from r515199, head/audio/murmur/files/patch-scripts_murmur.ini Modified: branches/2019Q4/audio/murmur/Makefile branches/2019Q4/audio/murmur/files/murmur.in branches/2019Q4/audio/murmur/files/patch-initialize-SSL Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/audio/murmur/Makefile ============================================================================== --- branches/2019Q4/audio/murmur/Makefile Tue Oct 22 15:10:42 2019 (r515199) +++ branches/2019Q4/audio/murmur/Makefile Tue Oct 22 15:12:04 2019 (r515200) @@ -3,7 +3,7 @@ PORTNAME= murmur PORTVERSION= 1.3.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio net MAINTAINER= feld@FreeBSD.org Modified: branches/2019Q4/audio/murmur/files/murmur.in ============================================================================== --- branches/2019Q4/audio/murmur/files/murmur.in Tue Oct 22 15:10:42 2019 (r515199) +++ branches/2019Q4/audio/murmur/files/murmur.in Tue Oct 22 15:12:04 2019 (r515200) @@ -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 Modified: branches/2019Q4/audio/murmur/files/patch-initialize-SSL ============================================================================== --- branches/2019Q4/audio/murmur/files/patch-initialize-SSL Tue Oct 22 15:10:42 2019 (r515199) +++ branches/2019Q4/audio/murmur/files/patch-initialize-SSL Tue Oct 22 15:12:04 2019 (r515200) @@ -8,27 +8,27 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport. 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 Copied: branches/2019Q4/audio/murmur/files/patch-scripts_murmur.ini (from r515199, head/audio/murmur/files/patch-scripts_murmur.ini) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/audio/murmur/files/patch-scripts_murmur.ini Tue Oct 22 15:12:04 2019 (r515200, copy of r515199, head/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910221512.x9MFC5vr023493>