diff --git a/GIDs b/GIDs --- a/GIDs +++ b/GIDs @@ -278,7 +278,7 @@ # free: 335 # free: 336 daapd:*:337: -murmur:*:338: +mumble-server:*:338: # free: 339 wildfire:*:340: stunnel:*:341: diff --git a/MOVED b/MOVED --- a/MOVED +++ b/MOVED @@ -2933,3 +2933,4 @@ devel/py-pygithub|devel/py-PyGithub|2024-01-06|Rename port match upstream devel/freebsd-gcc9||2024-01-09|No longer able to build base system, use GCC 12 or later instead net/downzemall|net/arrowdl|2024-01-11|Project was renamed upstream +audio/murmur|audio/mumble-server|2024-01-12|Project was renamed upstream diff --git a/UIDs b/UIDs --- a/UIDs +++ b/UIDs @@ -283,7 +283,7 @@ # free: 335 _pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin daapd:*:337:337::0:0:daapd User:/nonexistent:/usr/sbin/nologin -murmur:*:338:338::0:0:& User:/nonexistent:/usr/sbin/nologin +mumble-server:*:338:338::0:0:& User:/nonexistent:/usr/sbin/nologin # free: 339 wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin diff --git a/UPDATING b/UPDATING --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,32 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20240112: + AFFECTS: users of audio/murmur + AUTHOR: vvd@FreeBSD.org + + Upstream has renamed murmur to mumble-server, so when upgrading to + version 1.5.x, you need to do the following: + 1. Before upgrade stop server: + service murmur stop + 2. Rename all working files and directories: + mv /var/db/murmur/murmur.sqlite /var/db/murmur/mumble-server.sqlite + mv /var/db/murmur /var/db/mumble-server + mv /var/log/murmur/murmur.log /var/log/murmur/mumble-server.log + mv /var/log/murmur /var/log/mumble-server + mv /var/run/murmur /var/run/mumble-server + 3. Backup murmur.ini: + mv /usr/local/etc/murmur.ini /usr/local/etc/murmur.ini.old + 4. Upgrade the port. + 5. Rename user and group murmur to mumble-server: + pw usermod murmur -l mumble-server + pw groupmod murmur -l mumble-server + 6. Add your customizations in /usr/local/etc/mumble-server.ini. + 7. Update /etc/rc.conf: + replace murmur_enable="YES" with mumble_server_enable="YES". + 8. Start server: + service mumble_server_enable start + 20231229: AFFECTS: users of databases/tarantool AUTHOR: arrowd@FreeBSD.org diff --git a/audio/mumble_server/Makefile b/audio/mumble_server/Makefile new file mode 100644 --- /dev/null +++ b/audio/mumble_server/Makefile @@ -0,0 +1,85 @@ +PORTNAME= mumble-server +DISTVERSION= 1.5.517 +CATEGORIES= audio net + +MAINTAINER= vvd@FreeBSD.org +COMMENT= Server component of Mumble +WWW= https://www.mumble.info/ + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= boost-libs>0:devel/boost-libs +LIB_DEPENDS= libprotobuf.so:devel/protobuf + +USES= cmake compiler:c++14-lang qmake pkgconfig python:build qt:5 ssl +USE_CXXSTD= c++14 +USE_QT= buildtools:build core network sql xml + +USE_GITHUB= yes +GH_TUPLE= mumble-voip:mumble:v${DISTVERSION} \ + Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter \ + microsoft:GSL:0f6dbc9:mumble_gsl/3rdparty/gsl \ + mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook \ + mumble-voip:speexdsp:6e4634f:mumble_speexdsp/3rdparty/speexdsp \ + wolfpld:tracy:1a4f369:mumble_tracy/3rdparty/tracy + +CMAKE_ON= server +CMAKE_OFF= client + +USE_RC_SUBR= mumble_server +SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" + +OPTIONS_DEFINE= AVAHI DBUS DOCS ICE LTO +OPTIONS_DEFAULT= AVAHI LTO MYSQL SQLITE +OPTIONS_MULTI= SQL +OPTIONS_MULTI_SQL= MYSQL PGSQL SQLITE + +AVAHI_CMAKE_BOOL= zeroconf +AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns + +DBUS_USES= qt:5 +DBUS_USE= QT=dbus +DBUS_CMAKE_BOOL= dbus + +ICE_DESC= Ice Support +ICE_CMAKE_BOOL= ice +ICE_LIB_DEPENDS= libIce.so:devel/ice + +LTO_CMAKE_BOOL= lto + +MYSQL_USES= qt:5 +MYSQL_USE= QT=sql-mysql:run + +PGSQL_USES= qt:5 +PGSQL_USE= QT=sql-pgsql:run + +SQLITE_USES= qt:5 +SQLITE_USE= QT=sql-sqlite3:run + +USERS= mumble-server +GROUPS= mumble-server + +.include + +pre-install: + ${SED} -i '' -e 's|database=.*|database=/var/db/mumble-server/mumble-server.sqlite| ; \ + s|;pidfile=.*|pidfile=/var/run/mumble-server/mumble-server.pid| ; \ + s|;logfile=.*|logfile=/var/log/mumble-server/mumble-server.log| ; \ + s|;host=.*|host=0.0.0.0|' \ + ${WRKSRC}/auxiliary_files/mumble-server.ini + +do-install: + ${INSTALL_PROGRAM} ${WRKDIR}/.build/mumble-server ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/auxiliary_files/mumble-server.ini \ + ${STAGEDIR}${PREFIX}/etc/mumble-server.ini.sample + ${INSTALL_MAN} ${WRKSRC}/auxiliary_files/man_files/mumble-server.1 \ + ${STAGEDIR}${MANPREFIX}/share/man/man1/mumble-server.1 + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in README.md SECURITY.md docs/additional-readmes/README.static.linux + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} +.endfor + +.include diff --git a/audio/mumble_server/distinfo b/audio/mumble_server/distinfo new file mode 100644 --- /dev/null +++ b/audio/mumble_server/distinfo @@ -0,0 +1,13 @@ +TIMESTAMP = 1689430803 +SHA256 (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = f7ea7c8f5267fa8f744a7622bb96ad373ee40c6458b9ce01d81d071898f6a6da +SIZE (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = 6120684 +SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05 +SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817 +SHA256 (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 63d53ed611862f90517048db57617d8264200810a1e9fbb7ff9a524747f8dab3 +SIZE (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 78207 +SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033 +SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651 +SHA256 (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = f596d946feeffc66ad2f8a5886945019d79a1a45f3e9c1a1191b4faabb0e84ea +SIZE (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = 895204 +SHA256 (wolfpld-tracy-1a4f369_GH0.tar.gz) = b1fbb7b8ec38c58addd97f9cd6d17e879ecab9bfc184751297ce2162a6b8d008 +SIZE (wolfpld-tracy-1a4f369_GH0.tar.gz) = 4633541 diff --git a/audio/mumble_server/files/mumble_server.in b/audio/mumble_server/files/mumble_server.in new file mode 100644 --- /dev/null +++ b/audio/mumble_server/files/mumble_server.in @@ -0,0 +1,41 @@ +#!/bin/sh + +# PROVIDE: mumble_server +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# mumble_server_enable (bool): Set to NO by default. +# Set it to YES to enable mumble_server. +# mumble_server_flags (str): Set to "" by default. +# Extra flags passed to start command. +# + +. /etc/rc.subr + +name=mumble_server +rcvar=mumble_server_enable +load_rc_config $name + +# Set some defaults +: ${mumble_server_enable:=NO} +: ${mumble_server_user=%%USERS%%} + +command="%%PREFIX%%/sbin/mumble-server" +command_args="-ini %%PREFIX%%/etc/mumble-server.ini" +pidfile=/var/run/mumble-server/mumble-server.pid +start_precmd=mumble_server_prestart +extra_commands="reload" +sig_reload="USR1" + +mumble_server_prestart() { + for i in /var/log/mumble-server /var/run/mumble-server /var/db/mumble-server; do + if [ ! -d ${i} ]; then + install -d -o %%USERS%% -g %%GROUPS%% ${i} + fi + done +} + +run_rc_command "$1" diff --git a/audio/murmur/files/patch-initialize-SSL b/audio/mumble_server/files/patch-initialize-SSL rename from audio/murmur/files/patch-initialize-SSL rename to audio/mumble_server/files/patch-initialize-SSL diff --git a/audio/murmur/files/patch-scripts_murmur.ini b/audio/mumble_server/files/patch-scripts_murmur.ini rename from audio/murmur/files/patch-scripts_murmur.ini rename to audio/mumble_server/files/patch-scripts_murmur.ini diff --git a/audio/murmur/files/patch-src_SelfSignedCertificate.cpp b/audio/mumble_server/files/patch-src_SelfSignedCertificate.cpp rename from audio/murmur/files/patch-src_SelfSignedCertificate.cpp rename to audio/mumble_server/files/patch-src_SelfSignedCertificate.cpp diff --git a/audio/mumble_server/pkg-descr b/audio/mumble_server/pkg-descr new file mode 100644 --- /dev/null +++ b/audio/mumble_server/pkg-descr @@ -0,0 +1,2 @@ +Mumble-server is the server component of Mumble, a free, open source, +low-latency, high quality voice chat application. diff --git a/audio/mumble_server/pkg-message b/audio/mumble_server/pkg-message new file mode 100644 --- /dev/null +++ b/audio/mumble_server/pkg-message @@ -0,0 +1,55 @@ +[ +{ + type: install + message: < -# PCH is broken on GCC -.if ${CHOSEN_COMPILER_TYPE} == gcc -CONFIG+= no-pch -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|--no-add-needed|--no-copy-dt-needed-entries|' ${WRKSRC}/qmake/compiler.pri - @${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 - ${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/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 diff --git a/audio/murmur/distinfo b/audio/murmur/distinfo deleted file mode 100644 --- a/audio/murmur/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1602262186 -SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7 -SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708 diff --git a/audio/murmur/files/murmur.in b/audio/murmur/files/murmur.in deleted file mode 100644 --- a/audio/murmur/files/murmur.in +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# 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" diff --git a/audio/murmur/pkg-descr b/audio/murmur/pkg-descr deleted file mode 100644 --- a/audio/murmur/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Murmur is the server component of Mumble, a low-latency, high quality -VoIP application. diff --git a/audio/murmur/pkg-plist b/audio/murmur/pkg-plist deleted file mode 100644 --- a/audio/murmur/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -@sample etc/murmur.ini.sample -share/man/man1/murmurd.1.gz -sbin/murmurd -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.Linux