Attachment #231229 for bug #261395




# Created by: Ayumi M <ayu@commun.jp>

PORTNAME=	murmur
DISTVERSION=	1.4.230
PORTREVISION=	2
CATEGORIES=	audio net

MAINTAINER=	feld@FreeBSD.org

BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
LIB_DEPENDS=	libprotobuf.so:devel/protobuf

USES=		cmake compiler:c++11-lang pkgconfig python:build qt:5 ssl
USE_CXXSTD=	c++11
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

CMAKE_ON=	server
CMAKE_OFF=	client
QMAKE_ENV+=	"MUMBLE_PYTHON=${PYTHON_CMD}"

USE_RC_SUBR=	murmur
SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"

OPTIONS_DEFINE=		BONJOUR DBUS DOCS GRPC ICE
OPTIONS_DEFAULT=	BONJOUR MYSQL SQLITE
OPTIONS_MULTI=		SQL
OPTIONS_MULTI_SQL=	MYSQL PGSQL SQLITE

BONJOUR_DESC=		Bonjour Support
BONJOUR_CMAKE_BOOL=	zeroconf
BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder

DBUS_CMAKE_BOOL=	dbus
DBUS_USE=		QT=dbus

GRPC_DESC=		Build support for gRPC
GRPC_CMAKE_BOOL=	grpc
GRPC_LIB_DEPENDS=	lib/libgrpc.so:devel/grpc

ICE_DESC=		Ice Support
ICE_CMAKE_BOOL=		ice
ICE_LIB_DEPENDS=	libIce.so:devel/ice

MYSQL_USE=		QT=sql-mysql_run
MYSQL_USE=		QT=sql-mysql

PGSQL_USE=		QT=sql-pgsql_run

SQLITE_USE=		QT=sql-sqlite3_run

USERS=		murmur
GROUPS=		murmur

.include <bsd.port.pre.mk>
# 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|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/../.build/mumble-server ${STAGEDIR}${PREFIX}/sbin/murmurd
	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1


Lines 1-3 Link Here

(-)audio/murmur/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1602262186	1	TIMESTAMP = 1642783207
2	SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7	2	SHA256 (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 0a6591568a2d63b7a6bb29a3b10e4289a34dfd75e33cb2143ae6c738b1e92983
3	SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708	3	SIZE (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 5804439
		4	SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
		5	SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817




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 <lists.ban@herbesfolles.org>
        Christohper Knadle <Chris.Knadle@coredump.us>
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	2019-08-30 01:01:56 UTC
+++ src/mumble/main.cpp
@@ -132,6 +132,9 @@ int main(int argc, char **argv) {
 
 	os_init();
 
+	SSL_library_init();
+	SSL_load_error_strings();
+
 	bool bAllowMultiple = false;
 	bool suppressIdentity = false;
 	bool customJackClientName = false;
--- src/murmur/main.cpp.orig	2019-08-30 01:01:56 UTC
+++ src/murmur/main.cpp
@@ -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
 	// 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

Return to bug 261395

Lines 1-8 Link Here

(-)audio/murmur/Makefile (-24 / +19 lines)
1	# Created by: Ayumi M <ayu@commun.jp>	1	# Created by: Ayumi M <ayu@commun.jp>
2		2
3	PORTNAME= murmur	3	PORTNAME= murmur
4	PORTVERSION= 1.3.3	4	DISTVERSION= 1.4.230
5	PORTREVISION= 2
6	CATEGORIES= audio net	5	CATEGORIES= audio net
7		6
8	MAINTAINER= feld@FreeBSD.org	7	MAINTAINER= feld@FreeBSD.org
Lines 14-68 Link Here
14	BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:devel/boost-libs	13	BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
15	LIB_DEPENDS= libprotobuf.so:devel/protobuf	14	LIB_DEPENDS= libprotobuf.so:devel/protobuf
16		15
17	USES= compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl	16	USES= cmake compiler:c++11-lang pkgconfig python:build qt:5 ssl
18	USE_CXXSTD= c++11	17	USE_CXXSTD= c++11
19	USE_QT= buildtools_build core network sql xml	18	USE_QT= buildtools_build core network sql xml
20		19
21	USE_GITHUB= YES	20	USE_GITHUB= YES
22	GH_ACCOUNT= mumble-voip	21	GH_TUPLE= mumble-voip:mumble:v${DISTVERSION} \
23	GH_PROJECT= mumble	22	Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter
24		23
25	CONFIG= no-client	24	CMAKE_ON= server
26	QMAKE_ARGS= "CONFIG+=${CONFIG}"	25	CMAKE_OFF= client
27	QMAKE_ENV+= "MUMBLE_PYTHON=${PYTHON_CMD}"
28		26
29	USE_RC_SUBR= murmur	27	USE_RC_SUBR= murmur
30	SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}"	28	SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}"
31		29
32	OPTIONS_DEFINE= BONJOUR DBUS DOCS ICE	30	OPTIONS_DEFINE= BONJOUR DBUS DOCS GRPC ICE
33	OPTIONS_DEFAULT= BONJOUR MYSQL SQLITE	31	OPTIONS_DEFAULT= BONJOUR MYSQL SQLITE
34	OPTIONS_MULTI= SQL	32	OPTIONS_MULTI= SQL
35	OPTIONS_MULTI_SQL= MYSQL SQLITE	33	OPTIONS_MULTI_SQL= MYSQL PGSQL SQLITE
36		34
37	BONJOUR_DESC= Bonjour Support	35	BONJOUR_DESC= Bonjour Support
38	BONJOUR_VARS_OFF= CONFIG+=no-bonjour	36	BONJOUR_CMAKE_BOOL= zeroconf
39	BONJOUR_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder	37	BONJOUR_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder
40		38
41	DBUS_VARS_OFF= CONFIG+=no-dbus	39	DBUS_CMAKE_BOOL= dbus
42	DBUS_USE= QT=dbus	40	DBUS_USE= QT=dbus
43		41
		42	GRPC_DESC= Build support for gRPC
		43	GRPC_CMAKE_BOOL= grpc
		44	GRPC_LIB_DEPENDS= lib/libgrpc.so:devel/grpc
		45
44	ICE_DESC= Ice Support	46	ICE_DESC= Ice Support
45	ICE_VARS_OFF= CONFIG+=no-ice	47	ICE_CMAKE_BOOL= ice
46	ICE_LIB_DEPENDS= libIce.so:devel/ice	48	ICE_LIB_DEPENDS= libIce.so:devel/ice
47		49
48	MYSQL_VARS_OFF= CONFIG+=no-sql-mysql	50	MYSQL_USE= QT=sql-mysql_run
49	MYSQL_USE= QT=sql-mysql
50		51
51	SQLITE_VARS_OFF= CONFIG+=no-sqlite3_run	52	PGSQL_USE= QT=sql-pgsql_run
		53
52	SQLITE_USE= QT=sql-sqlite3_run	54	SQLITE_USE= QT=sql-sqlite3_run
53		55
54	USERS= murmur	56	USERS= murmur
55	GROUPS= murmur	57	GROUPS= murmur
56		58
57	.include <bsd.port.pre.mk>	59	.include <bsd.port.pre.mk>
58	# PCH is broken on GCC
59	.if ${CHOSEN_COMPILER_TYPE} == gcc
60	CONFIG+= no-pch
61	.endif
62		60
63	post-patch:
64	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
65
66	pre-install:	61	pre-install:
67	${SED} -i '' -e 's\|database=.*\|database=/var/db/murmur/murmur.sqlite\|' ${WRKSRC}/scripts/murmur.ini	62	${SED} -i '' -e 's\|database=.*\|database=/var/db/murmur/murmur.sqlite\|' ${WRKSRC}/scripts/murmur.ini
68	${SED} -i '' -e 's\|#pidfile=.*\|pidfile=/var/run/murmur/murmur.pid\|' ${WRKSRC}/scripts/murmur.ini	63	${SED} -i '' -e 's\|#pidfile=.*\|pidfile=/var/run/murmur/murmur.pid\|' ${WRKSRC}/scripts/murmur.ini
Lines 70-76 Link Here
70	${SED} -i '' -e 's\|#host=.*\|host=0.0.0.0\|' ${WRKSRC}/scripts/murmur.ini	65	${SED} -i '' -e 's\|#host=.*\|host=0.0.0.0\|' ${WRKSRC}/scripts/murmur.ini
71		66
72	do-install:	67	do-install:
73	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin	68	${INSTALL_PROGRAM} ${WRKSRC}/../.build/mumble-server ${STAGEDIR}${PREFIX}/sbin/murmurd
74	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample	69	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
75	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1	70	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1
76		71

Lines 1-34 Link Here

(-)audio/murmur/files/patch-initialize-SSL (-34 lines)
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