Index: head/audio/murmur/Makefile =================================================================== --- head/audio/murmur/Makefile (revision 515198) +++ head/audio/murmur/Makefile (revision 515199) @@ -1,85 +1,85 @@ # Created by: Ayumi M # $FreeBSD$ PORTNAME= murmur PORTVERSION= 1.3.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio net MAINTAINER= feld@FreeBSD.org COMMENT= Murmur is the server component of Mumble LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:devel/boost-libs LIB_DEPENDS= libprotobuf.so:devel/protobuf USES= compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl USE_CXXSTD= c++11 USE_QT= buildtools_build core network sql xml USE_GITHUB= YES GH_ACCOUNT= mumble-voip GH_PROJECT= mumble CONFIG= no-client QMAKE_ARGS= "CONFIG+=${CONFIG}" QMAKE_ENV+= "MUMBLE_PYTHON=${PYTHON_CMD}" USE_RC_SUBR= murmur SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" OPTIONS_DEFINE= BONJOUR DBUS DOCS ICE OPTIONS_DEFAULT= BONJOUR MYSQL SQLITE OPTIONS_MULTI= SQL OPTIONS_MULTI_SQL= MYSQL SQLITE BONJOUR_DESC= Bonjour Support BONJOUR_VARS_OFF= CONFIG+=no-bonjour BONJOUR_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder DBUS_VARS_OFF= CONFIG+=no-dbus DBUS_USE= QT=dbus ICE_DESC= Ice Support ICE_VARS_OFF= CONFIG+=no-ice ICE_LIB_DEPENDS= libIce.so:devel/ice MYSQL_VARS_OFF= CONFIG+=no-sql-mysql MYSQL_USE= QT=sql-mysql SQLITE_VARS_OFF= CONFIG+=no-sqlite3_run SQLITE_USE= QT=sql-sqlite3_run USERS= murmur GROUPS= murmur .include # PCH is broken on GCC .if ${CHOSEN_COMPILER_TYPE} == gcc CONFIG+= no-pch .endif post-patch: @${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro pre-install: ${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini ${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini ${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini ${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini do-install: ${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample ${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1 ${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in CHANGES INSTALL README README.Linux ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/audio/murmur/files/murmur.in =================================================================== --- head/audio/murmur/files/murmur.in (revision 515198) +++ head/audio/murmur/files/murmur.in (revision 515199) @@ -1,41 +1,43 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: murmur # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # murmur_enable (bool): Set to NO by default. # Set it to YES to enable murmur. # murmur_flags (str): Set to "" by default. # Extra flags passed to start command. # . /etc/rc.subr name=murmur rcvar=murmur_enable load_rc_config $name # Set some defaults : ${murmur_enable:=NO} : ${murmur_user=%%USERS%%} 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 if [ ! -d ${i} ]; then install -d -o %%USERS%% -g %%GROUPS%% ${i} fi done } run_rc_command "$1" Index: head/audio/murmur/files/patch-initialize-SSL =================================================================== --- head/audio/murmur/files/patch-initialize-SSL (revision 515198) +++ head/audio/murmur/files/patch-initialize-SSL (revision 515199) @@ -1,34 +1,34 @@ Description: the SSL library must be initialized, otherwise mumble and mumble-server both fail to find the available ciphers after a rebuild with openssl_1.0.2d-3. The two calls used are based on: https://wiki.openssl.org/index.php/SSL/TLS_Client#Initialization Author: Colomban Wendling Christohper Knadle 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 Index: head/audio/murmur/files/patch-scripts_murmur.ini =================================================================== --- head/audio/murmur/files/patch-scripts_murmur.ini (nonexistent) +++ head/audio/murmur/files/patch-scripts_murmur.ini (revision 515199) @@ -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 Property changes on: head/audio/murmur/files/patch-scripts_murmur.ini ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property