Skip to content

Commit 3f28493

Browse files
committed
1 parent 77aa89d commit 3f28493

File tree

11 files changed

+73
-143
lines changed

11 files changed

+73
-143
lines changed

‎GIDs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ honeytrap:*:333:
279279
# free: 336
280280
daapd:*:337:
281281
murmur:*:338:
282-
# free: 339
282+
mumble-server:*:339:
283283
wildfire:*:340:
284284
stunnel:*:341:
285285
openfire:*:342:

‎UIDs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ honeytrap:*:333:333::0:0:HoneyTrap Daemon:/nonexistent:/usr/sbin/nologin
284284
_pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin
285285
daapd:*:337:337::0:0:daapd User:/nonexistent:/usr/sbin/nologin
286286
murmur:*:338:338::0:0:& User:/nonexistent:/usr/sbin/nologin
287-
# free: 339
287+
mumble-server:*:339:339::0:0:& User:/nonexistent:/usr/sbin/nologin
288288
wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin
289289
stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin
290290
openfire:*:342:342::0:0:Openfire IM Daemon:/nonexistent:/usr/sbin/nologin

‎audio/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@
499499
SUBDIR += mps
500500
SUBDIR += mpz
501501
SUBDIR += mumble
502+
SUBDIR += mumble-server
502503
SUBDIR += murmur
503504
SUBDIR += murmur-cli
504505
SUBDIR += muse-sequencer

‎audio/mumble-server/Makefile‎

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
PORTNAME= murmur
2-
PORTVERSION= 1.3.4
1+
PORTNAME= mumble-server
2+
DISTVERSION= 1.5.517
33
CATEGORIES= audio net
4+
MASTER_SITES= https://github.com/${PORTNAME:S/-server//}-voip/${PORTNAME:S/-server//}/releases/download/v${DISTVERSION}/
5+
DISTNAME= ${PORTNAME:S/-server//}-${DISTVERSION}
46

57
MAINTAINER= vvd@FreeBSD.org
68
COMMENT= Server component of Mumble
@@ -9,76 +11,69 @@ WWW= https://www.mumble.info/
911
LICENSE= BSD3CLAUSE
1012
LICENSE_FILE= ${WRKSRC}/LICENSE
1113

12-
BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
14+
BUILD_DEPENDS= boost-libs>0:devel/boost-libs
1315
LIB_DEPENDS= libabsl_base.so:devel/abseil \
1416
libprotobuf.so:devel/protobuf
1517

16-
USES= compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl
17-
BROKEN_SSL= openssl openssl31
18-
BROKEN_SSL_REASON= Requires OpenSSL 3.0.0 deprecated CRYPTO_MEM_CHECK_ON
19-
USE_CXXSTD= c++11
20-
USE_QT= buildtools:build core network sql xml
18+
USES= cmake compiler:c++17-lang pkgconfig python:build qt:5 ssl
19+
USE_CXXSTD= c++17
20+
USE_QT= buildtools:build core network qmake:build sql xml
2121

22-
USE_GITHUB= YES
23-
GH_ACCOUNT= mumble-voip
24-
GH_PROJECT= mumble
22+
CMAKE_ON= server
23+
CMAKE_OFF= client
2524

26-
CONFIG= no-client
27-
QMAKE_ARGS= "CONFIG+=${CONFIG}"
28-
QMAKE_ENV+= "MUMBLE_PYTHON=${PYTHON_CMD}"
25+
CXXFLAGS+= -Wno-deprecated-declarations
2926

30-
USE_RC_SUBR= murmur
27+
USE_RC_SUBR= mumble_server
3128
SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}"
3229

33-
OPTIONS_DEFINE= BONJOUR DBUS DOCS ICE
34-
OPTIONS_DEFAULT= BONJOUR MYSQL SQLITE
30+
EXTRA_PATCHES+= ${.CURDIR}/../mumble/files/patch-protobuf
31+
32+
OPTIONS_DEFINE= AVAHI DBUS DOCS ICE LTO
33+
OPTIONS_DEFAULT= AVAHI LTO MYSQL SQLITE
3534
OPTIONS_MULTI= SQL
36-
OPTIONS_MULTI_SQL= MYSQL SQLITE
35+
OPTIONS_MULTI_SQL= MYSQL PGSQL SQLITE
3736

38-
BONJOUR_DESC= Bonjour Support
39-
BONJOUR_VARS_OFF= CONFIG+=no-bonjour
40-
BONJOUR_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder
37+
AVAHI_CMAKE_BOOL= zeroconf
38+
AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns
4139

42-
DBUS_VARS_OFF= CONFIG+=no-dbus
4340
DBUS_USE= QT=dbus
41+
DBUS_CMAKE_BOOL= dbus
4442

4543
ICE_DESC= Ice Support
46-
ICE_VARS_OFF= CONFIG+=no-ice
44+
ICE_CMAKE_BOOL= ice
4745
ICE_LIB_DEPENDS= libIce.so:devel/ice
4846

49-
MYSQL_VARS_OFF= CONFIG+=no-sql-mysql
50-
MYSQL_USE= QT=sql-mysql
47+
LTO_CMAKE_BOOL= lto
5148

52-
SQLITE_VARS_OFF= CONFIG+=no-sqlite3_run
49+
MYSQL_USE= QT=sql-mysql:run
50+
PGSQL_USE= QT=sql-pgsql:run
5351
SQLITE_USE= QT=sql-sqlite3:run
5452

55-
USERS= murmur
56-
GROUPS= murmur
53+
USERS= mumble-server
54+
GROUPS= mumble-server
5755

5856
.include <bsd.port.pre.mk>
59-
# PCH is broken on GCC
60-
.if ${CHOSEN_COMPILER_TYPE} == gcc
61-
CONFIG+= no-pch
62-
.endif
63-
64-
post-patch:
65-
@${REINPLACE_CMD} -e 's|--no-add-needed|--no-copy-dt-needed-entries|' ${WRKSRC}/qmake/compiler.pri
66-
@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
67-
68-
pre-install:
69-
${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
70-
${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
71-
${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini
72-
${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
73-
74-
do-install:
75-
${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
76-
${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
77-
${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1
57+
58+
post-install:
59+
${SED} -i '' -e 's|database=.*|database=/var/db/mumble-server/mumble-server.sqlite| ; \
60+
s|;pidfile=.*|pidfile=/var/run/mumble-server/mumble-server.pid| ; \
61+
s|;logfile=.*|logfile=/var/log/mumble-server/mumble-server.log| ; \
62+
s|;host=.*|host=0.0.0.0|' \
63+
${STAGEDIR}${PREFIX}/etc/mumble/mumble-server.ini
64+
${MV} ${STAGEDIR}${PREFIX}/etc/mumble/mumble-server.ini \
65+
${STAGEDIR}${PREFIX}/etc/mumble/mumble-server.ini.sample
66+
.for f in bin/mumble-server-user-wrapper share/man/man1/mumble-server-user-wrapper.1 \
67+
etc/sysconfig.d/mumble-server.conf etc/systemd/system/mumble-server.service
68+
${RM} ${STAGEDIR}${PREFIX}/${f}
69+
.endfor
70+
.for d in etc/sysconfig.d etc/systemd/system etc/systemd
71+
${RMDIR} ${STAGEDIR}${PREFIX}/${d}
72+
.endfor
7873

7974
do-install-DOCS-on:
8075
@${MKDIR} ${STAGEDIR}${DOCSDIR}
81-
.for f in CHANGES INSTALL README README.Linux
76+
.for f in README.md SECURITY.md docs/additional-readmes/README.static.linux
8277
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
8378
.endfor
8479

‎audio/mumble-server/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1705575971
2-
SHA256 (mumble-voip-mumble-1.3.4_GH0.tar.gz) = a692840423ddbd00ecca1ce174e4279c753acf58278579f603e56b644eae6f8e
3-
SIZE (mumble-voip-mumble-1.3.4_GH0.tar.gz) = 4896282
1+
TIMESTAMP = 1692806872
2+
SHA256 (mumble-1.5.517.tar.gz) = 8efd06a0f47ebfe27735f7575ba0becfb21d0f400a5082202dbbd998ab8351de
3+
SIZE (mumble-1.5.517.tar.gz) = 12091432

‎audio/mumble-server/files/mumble_server.in‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
#!/bin/sh
22

3-
# PROVIDE: murmur
3+
# PROVIDE: mumble_server
44
# REQUIRE: DAEMON
55
# KEYWORD: shutdown
66
#
77
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
88
# to enable this service:
99
#
10-
# murmur_enable (bool): Set to NO by default.
11-
# Set it to YES to enable murmur.
12-
# murmur_flags (str): Set to "" by default.
10+
# mumble_server_enable (bool): Set to NO by default.
11+
# Set it to YES to enable mumble_server.
12+
# mumble_server_flags (str): Set to "" by default.
1313
# Extra flags passed to start command.
1414
#
1515

1616
. /etc/rc.subr
1717

18-
name=murmur
19-
rcvar=murmur_enable
18+
name=mumble_server
19+
rcvar=mumble_server_enable
2020
load_rc_config $name
2121

2222
# Set some defaults
23-
: ${murmur_enable:=NO}
24-
: ${murmur_user=%%USERS%%}
23+
: ${mumble_server_enable:=NO}
24+
: ${mumble_server_user=%%USERS%%}
2525

26-
command="%%PREFIX%%/sbin/murmurd"
27-
command_args="-ini %%PREFIX%%/etc/murmur.ini"
28-
pidfile=/var/run/murmur/murmur.pid
29-
start_precmd=murmur_prestart
26+
command="%%PREFIX%%/bin/mumble-server"
27+
command_args="-ini %%PREFIX%%/etc/mumble/mumble-server.ini"
28+
pidfile=/var/run/mumble-server/mumble-server.pid
29+
start_precmd=mumble_server_prestart
3030
extra_commands="reload"
3131
sig_reload="USR1"
3232

33-
murmur_prestart() {
34-
for i in /var/log/murmur /var/run/murmur /var/db/murmur; do
33+
mumble_server_prestart() {
34+
for i in /var/log/mumble-server /var/run/mumble-server /var/db/mumble-server; do
3535
if [ ! -d ${i} ]; then
3636
install -d -o %%USERS%% -g %%GROUPS%% ${i}
3737
fi

‎audio/mumble-server/files/patch-initialize-SSL‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎audio/mumble-server/files/patch-scripts_murmur.ini‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎audio/mumble-server/files/patch-src_SelfSignedCertificate.cpp‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎audio/mumble-server/pkg-descr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Murmur is the server component of Mumble, a low-latency, high quality
2-
VoIP application.
1+
Mumble-server is the server component of Mumble, a free, open source,
2+
low-latency, high quality voice chat application.

0 commit comments

Comments
 (0)