View | Details | Raw Unified | Return to bug 261395 | Differences between
and this patch

Collapse All | Expand All

(-)b/GIDs (-1 / +1 lines)
Lines 278-284 honeytrap:*:333: Link Here
278
# free: 335
278
# free: 335
279
# free: 336
279
# free: 336
280
daapd:*:337:
280
daapd:*:337:
281
murmur:*:338:
281
mumble-server:*:338:
282
# free: 339
282
# free: 339
283
wildfire:*:340:
283
wildfire:*:340:
284
stunnel:*:341:
284
stunnel:*:341:
(-)b/MOVED (+1 lines)
Lines 7774-7776 textproc/rubygem-nokogiri114|textproc/rubygem-nokogiri|2023-07-09|Remove obsolet Link Here
7774
japanese/kterm||2023-07-12|Has expired: Last upstream release was in 2011
7774
japanese/kterm||2023-07-12|Has expired: Last upstream release was in 2011
7775
graphics/gmic-qt@krita|graphics/krita-gmic-plugin|2023-07-14|Forked to a seperate project
7775
graphics/gmic-qt@krita|graphics/krita-gmic-plugin|2023-07-14|Forked to a seperate project
7776
devel/capstone5|devel/capstone|2023-07-15|Keep the latest version without any pkgnamesufix
7776
devel/capstone5|devel/capstone|2023-07-15|Keep the latest version without any pkgnamesufix
7777
audio/murmur|audio/mumble-server|2023-07-15|Renamed by upstream
(-)b/UIDs (-1 / +1 lines)
Lines 283-289 honeytrap:*:333:333::0:0:HoneyTrap Daemon:/nonexistent:/usr/sbin/nologin Link Here
283
# free: 335
283
# free: 335
284
_pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin
284
_pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin
285
daapd:*:337:337::0:0:daapd User:/nonexistent:/usr/sbin/nologin
285
daapd:*:337:337::0:0:daapd User:/nonexistent:/usr/sbin/nologin
286
murmur:*:338:338::0:0:& User:/nonexistent:/usr/sbin/nologin
286
mumble-server:*:338:338::0:0:& User:/nonexistent:/usr/sbin/nologin
287
# free: 339
287
# free: 339
288
wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin
288
wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin
289
stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin
289
stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin
(-)b/UPDATING (+22 lines)
Lines 5-10 they are unavoidable. Link Here
5
You should get into the habit of checking this file for changes each time
5
You should get into the habit of checking this file for changes each time
6
you update your ports collection, before attempting any port upgrades.
6
you update your ports collection, before attempting any port upgrades.
7
7
8
20230715:
9
  AFFECTS: users of audio/murmur
10
  AUTHOR: vvd@FreeBSD.org
11
12
  Upstream rename murmur to mumble-server.
13
  1. Before upgrade stop server:
14
      service murmur stop
15
  2. Rename all working files and directories:
16
      mv /var/db/murmur/murmur.sqlite /var/db/murmur/mumble-server.sqlite
17
      mv /var/db/murmur               /var/db/mumble-server
18
      mv /var/log/murmur/murmur.log   /var/log/murmur/mumble-server.log
19
      mv /var/log/murmur              /var/log/mumble-server
20
      mv /var/run/murmur              /var/run/mumble-server
21
  3. Backup murmur.ini:
22
      mv /usr/local/etc/murmur.ini    /usr/local/etc/murmur.ini.old
23
  4. Upgrade port.
24
  5. Add your customizations in /usr/local/etc/mumble-server.ini.
25
  6. Update /etc/rc.conf:
26
      replace murmur_enable="YES" with mumble_server_enable="YES".
27
  7. Start server:
28
      service mumble_server_enable start
29
8
20230620:
30
20230620:
9
  AFFECTS: users of lang/elixir-devel
31
  AFFECTS: users of lang/elixir-devel
10
  AUTHOR: dch@FreeBSD.org
32
  AUTHOR: dch@FreeBSD.org
(-)b/audio/mumble-server/Makefile (-45 / +41 lines)
Lines 1-84 Link Here
1
PORTNAME=	murmur
1
PORTNAME=	mumble-server
2
PORTVERSION=	1.3.3
2
PORTVERSION=	1.5.517
3
PORTREVISION=	6
4
CATEGORIES=	audio net
3
CATEGORIES=	audio net
5
4
6
MAINTAINER=	feld@FreeBSD.org
5
MAINTAINER=	feld@FreeBSD.org
7
COMMENT=	Server component of Mumble
6
COMMENT=	Server component of Mumble
8
WWW=		http://mumble.sourceforge.net/
7
WWW=		https://www.mumble.info/
9
8
10
LICENSE=	BSD3CLAUSE
9
LICENSE=	BSD3CLAUSE
11
LICENSE_FILE=	${WRKSRC}/LICENSE
10
LICENSE_FILE=	${WRKSRC}/LICENSE
12
11
13
BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
12
BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
14
LIB_DEPENDS=	libprotobuf.so:devel/protobuf
13
LIB_DEPENDS=	libprotobuf.so:devel/protobuf
15
14
16
USES=		compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl
15
USES=		cmake compiler:c++14-lang qmake pkgconfig python:build qt:5 ssl
17
BROKEN_SSL=	openssl30 openssl31
16
USE_CXXSTD=	c++14
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
17
USE_QT=		buildtools:build core network sql xml
21
18
22
USE_GITHUB=	YES
19
USE_GITHUB=	yes
23
GH_ACCOUNT=	mumble-voip
20
GH_TUPLE=	mumble-voip:mumble:v${DISTVERSION} \
24
GH_PROJECT=	mumble
21
		Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter \
22
		microsoft:GSL:0f6dbc9:mumble_gsl/3rdparty/gsl \
23
		mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook \
24
		mumble-voip:speexdsp:6e4634f:mumble_speexdsp/3rdparty/speexdsp \
25
		wolfpld:tracy:1a4f369:mumble_tracy/3rdparty/tracy
25
26
26
CONFIG=		no-client
27
CMAKE_ON=	server
27
QMAKE_ARGS=	"CONFIG+=${CONFIG}"
28
CMAKE_OFF=	client
28
QMAKE_ENV+=	"MUMBLE_PYTHON=${PYTHON_CMD}"
29
29
30
USE_RC_SUBR=	murmur
30
USE_RC_SUBR=	mumble_server
31
SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
31
SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
32
32
33
OPTIONS_DEFINE=		BONJOUR DBUS DOCS ICE
33
OPTIONS_DEFINE=		AVAHI DBUS DOCS ICE LTO
34
OPTIONS_DEFAULT=	BONJOUR MYSQL SQLITE
34
OPTIONS_DEFAULT=	AVAHI LTO MYSQL SQLITE
35
OPTIONS_MULTI=		SQL
35
OPTIONS_MULTI=		SQL
36
OPTIONS_MULTI_SQL=	MYSQL SQLITE
36
OPTIONS_MULTI_SQL=	MYSQL PGSQL SQLITE
37
37
38
BONJOUR_DESC=		Bonjour Support
38
AVAHI_CMAKE_BOOL=	zeroconf
39
BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
39
AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
40
BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
41
40
42
DBUS_VARS_OFF=		CONFIG+=no-dbus
41
DBUS_CMAKE_BOOL=	dbus
43
DBUS_USE=		QT=dbus
42
DBUS_USE=		QT=dbus
44
43
45
ICE_DESC=		Ice Support
44
ICE_DESC=		Ice Support
46
ICE_VARS_OFF=		CONFIG+=no-ice
45
ICE_CMAKE_BOOL=		ice
47
ICE_LIB_DEPENDS=	libIce.so:devel/ice
46
ICE_LIB_DEPENDS=	libIce.so:devel/ice
48
47
49
MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
48
LTO_CMAKE_BOOL=		lto
50
MYSQL_USE=		QT=sql-mysql
49
50
MYSQL_USE=		QT=sql-mysql:run
51
52
PGSQL_USE=		QT=sql-pgsql:run
51
53
52
SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
53
SQLITE_USE=		QT=sql-sqlite3:run
54
SQLITE_USE=		QT=sql-sqlite3:run
54
55
55
USERS=		murmur
56
USERS=		mumble-server
56
GROUPS=		murmur
57
GROUPS=		mumble-server
57
58
58
.include <bsd.port.pre.mk>
59
.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
60
68
pre-install:
61
pre-install:
69
	${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
62
	${SED} -i '' -e 's|database=.*|database=/var/db/mumble-server/mumble-server.sqlite| ; \
70
	${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
63
			s|;pidfile=.*|pidfile=/var/run/mumble-server/mumble-server.pid| ; \
71
	${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini
64
			s|;logfile=.*|logfile=/var/log/mumble-server/mumble-server.log| ; \
72
	${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
65
			s|;host=.*|host=0.0.0.0|' \
66
		${WRKSRC}/auxiliary_files/mumble-server.ini
73
67
74
do-install:
68
do-install:
75
	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
69
	${INSTALL_PROGRAM} ${WRKDIR}/.build/mumble-server ${STAGEDIR}${PREFIX}/sbin
76
	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
70
	${INSTALL_DATA} ${WRKSRC}/auxiliary_files/mumble-server.ini \
77
	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1
71
			${STAGEDIR}${PREFIX}/etc/mumble-server.ini.sample
72
	${INSTALL_MAN} ${WRKSRC}/auxiliary_files/man_files/mumble-server.1 \
73
			${STAGEDIR}${MANPREFIX}/share/man/man1/mumble-server.1
78
74
79
do-install-DOCS-on:
75
do-install-DOCS-on:
80
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
76
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
81
.for f in CHANGES INSTALL README README.Linux
77
.for f in README.md SECURITY.md docs/additional-readmes/README.static.linux
82
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
78
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
83
.endfor
79
.endfor
84
80
(-)b/audio/mumble-server/distinfo (-3 / +13 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1602262186
1
TIMESTAMP = 1689430803
2
SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7
2
SHA256 (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = f7ea7c8f5267fa8f744a7622bb96ad373ee40c6458b9ce01d81d071898f6a6da
3
SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708
3
SIZE (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = 6120684
4
SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
5
SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
6
SHA256 (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 63d53ed611862f90517048db57617d8264200810a1e9fbb7ff9a524747f8dab3
7
SIZE (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 78207
8
SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
9
SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
10
SHA256 (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = f596d946feeffc66ad2f8a5886945019d79a1a45f3e9c1a1191b4faabb0e84ea
11
SIZE (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = 895204
12
SHA256 (wolfpld-tracy-1a4f369_GH0.tar.gz) = b1fbb7b8ec38c58addd97f9cd6d17e879ecab9bfc184751297ce2162a6b8d008
13
SIZE (wolfpld-tracy-1a4f369_GH0.tar.gz) = 4633541
(-)b/audio/mumble-server/files/mumble_server.in (-14 / +14 lines)
Lines 1-37 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
2
3
# PROVIDE: murmur
3
# PROVIDE: mumble_server
4
# REQUIRE: DAEMON
4
# REQUIRE: DAEMON
5
# KEYWORD: shutdown
5
# KEYWORD: shutdown
6
#
6
#
7
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
7
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
8
# to enable this service:
8
# to enable this service:
9
#
9
#
10
# murmur_enable (bool):		Set to NO by default.
10
# mumble_server_enable (bool):	Set to NO by default.
11
#				Set it to YES to enable murmur.
11
#				Set it to YES to enable mumble_server.
12
# murmur_flags (str):		Set to "" by default.
12
# mumble_server_flags (str):	Set to "" by default.
13
#				Extra flags passed to start command.
13
#				Extra flags passed to start command.
14
#
14
#
15
15
16
. /etc/rc.subr
16
. /etc/rc.subr
17
17
18
name=murmur
18
name=mumble_server
19
rcvar=murmur_enable
19
rcvar=mumble_server_enable
20
load_rc_config $name
20
load_rc_config $name
21
21
22
# Set some defaults
22
# Set some defaults
23
: ${murmur_enable:=NO}
23
: ${mumble_server_enable:=NO}
24
: ${murmur_user=%%USERS%%}
24
: ${mumble_server_user=%%USERS%%}
25
25
26
command="%%PREFIX%%/sbin/murmurd"
26
command="%%PREFIX%%/sbin/mumble-server"
27
command_args="-ini %%PREFIX%%/etc/murmur.ini"
27
command_args="-ini %%PREFIX%%/etc/mumble-server.ini"
28
pidfile=/var/run/murmur/murmur.pid
28
pidfile=/var/run/mumble-server/mumble-server.pid
29
start_precmd=murmur_prestart
29
start_precmd=mumble_server_prestart
30
extra_commands="reload"
30
extra_commands="reload"
31
sig_reload="USR1"
31
sig_reload="USR1"
32
32
33
murmur_prestart() {
33
mumble_server_prestart() {
34
	for i in /var/log/murmur /var/run/murmur /var/db/murmur; do
34
	for i in /var/log/mumble-server /var/run/mumble-server /var/db/mumble-server; do
35
		if [ ! -d ${i} ]; then
35
		if [ ! -d ${i} ]; then
36
			install -d -o %%USERS%% -g %%GROUPS%% ${i}
36
			install -d -o %%USERS%% -g %%GROUPS%% ${i}
37
		fi
37
		fi
(-)a/audio/mumble-server/files/patch-initialize-SSL (-34 lines)
Removed Link Here
1
Description: the SSL library must be initialized, otherwise mumble and
2
   mumble-server both fail to find the available ciphers after a rebuild
3
   with openssl_1.0.2d-3.  The two calls used are based on:
4
     https://wiki.openssl.org/index.php/SSL/TLS_Client#Initialization
5
Author: Colomban Wendling <lists.ban@herbesfolles.org>
6
        Christohper Knadle <Chris.Knadle@coredump.us>
7
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363
8
Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876
9
Last-Updated: 2015-11-10
10
11
--- src/mumble/main.cpp.orig	2019-08-30 01:01:56 UTC
12
+++ src/mumble/main.cpp
13
@@ -132,6 +132,9 @@ int main(int argc, char **argv) {
14
 
15
 	os_init();
16
 
17
+	SSL_library_init();
18
+	SSL_load_error_strings();
19
+
20
 	bool bAllowMultiple = false;
21
 	bool suppressIdentity = false;
22
 	bool customJackClientName = false;
23
--- src/murmur/main.cpp.orig	2019-08-30 01:01:56 UTC
24
+++ src/murmur/main.cpp
25
@@ -205,6 +205,9 @@ int main(int argc, char **argv) {
26
 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
27
 #endif
28
 
29
+	SSL_library_init();
30
+	SSL_load_error_strings();
31
+
32
 #ifdef Q_OS_WIN
33
 	// By default, windbus expects the path to dbus-daemon to be in PATH, and the path
34
 	// should contain bin\\, and the path to the config is hardcoded as ..\etc
(-)a/audio/mumble-server/files/patch-scripts_murmur.ini (-18 lines)
Removed Link Here
1
--- scripts/murmur.ini.orig	2020-09-04 21:33:39 UTC
2
+++ scripts/murmur.ini
3
@@ -93,13 +93,13 @@ icesecretwrite=
4
 ; logs to the file 'murmur.log'. If you leave this field blank
5
 ; on Unix-like systems, Murmur will force itself into foreground
6
 ; mode which logs to the console.
7
-;logfile=murmur.log
8
+logfile=/var/log/murmur/murmur.log
9
 
10
 ; If set, Murmur will write its process ID to this file
11
 ; when running in daemon mode (when the -fg flag is not
12
 ; specified on the command line). Only available on
13
 ; Unix-like systems.
14
-;pidfile=
15
+pidfile=/var/run/murmur/murmur.pid
16
 
17
 ; The below will be used as defaults for new configured servers.
18
 ; If you're just running one server (the default), it's easier to
(-)a/audio/mumble-server/files/patch-src_SelfSignedCertificate.cpp (-15 lines)
Removed Link Here
1
--- src/SelfSignedCertificate.cpp.orig	2023-06-11 17:43:07 UTC
2
+++ src/SelfSignedCertificate.cpp
3
@@ -45,10 +45,12 @@ bool SelfSignedCertificate::generate(CertificateType c
4
 	QString commonName;
5
 	bool isServerCert = certificateType == CertificateTypeServerCertificate;
6
 
7
+#ifdef CRYPTO_MEM_CHECK_ON
8
 	if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
9
 		ok = false;
10
 		goto out;
11
 	}
12
+#endif
13
 
14
 	x509 = X509_new();
15
 	if (x509 == NULL) {
(-)b/audio/mumble-server/pkg-descr (-2 / +2 lines)
Lines 1-2 Link Here
1
Murmur is the server component of Mumble, a low-latency, high quality
1
Mumble-server is the server component of Mumble, a free, open source,
2
VoIP application.
2
low-latency, high quality voice chat application.
(-)b/audio/mumble-server/pkg-plist (-7 / +6 lines)
Lines 1-7 Link Here
1
@sample etc/murmur.ini.sample
1
@sample etc/mumble-server.ini.sample
2
share/man/man1/murmurd.1.gz
2
sbin/mumble-server
3
sbin/murmurd
3
share/man/man1/mumble-server.1.gz
4
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
4
%%PORTDOCS%%%%DOCSDIR%%/README.md
5
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
5
%%PORTDOCS%%%%DOCSDIR%%/SECURITY.md
6
%%PORTDOCS%%%%DOCSDIR%%/README
6
%%PORTDOCS%%%%DOCSDIR%%/README.static.linux
7
%%PORTDOCS%%%%DOCSDIR%%/README.Linux

Return to bug 261395