Attachment #163025 for bug #204467

View | Details | Raw Unified | Return to bug 204467
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	murmur
PORTVERSION=	1.2.10
PORTREVISION=	1
CATEGORIES=	audio net
MASTER_SITES=	SF/mumble/Mumble/${PORTVERSION}
DISTNAME=	mumble-${PORTVERSION}

MAINTAINER=	feld@FreeBSD.org


USERS=		murmur
GROUPS=		murmur
USES=		compiler qmake pkgconfig
USE_QT4=	moc_build corelib network xml sql sql-sqlite3_run

USE_OPENSSL=	YES
WITH_OPENSSL_PORT=	YES

USE_GITHUB=	YES
GH_ACCOUNT=	mumble-voip
GH_PROJECT=	mumble

CONFIG=		no-client
QMAKE_ARGS=	"CONFIG+=${CONFIG}"


Lines 1-2 Link Here

(-)audio/murmur/distinfo (-2 / +2 lines)
1	SHA256 (mumble-1.2.8.tar.gz) = 4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159	1	SHA256 (mumble-1.2.10_GH0.tar.gz) = 8eb14d03b67d2f83d894b05f79125fe7a1b1798078d5821744d9a3de38d7d2ef
2	SIZE (mumble-1.2.8.tar.gz) = 3202518	2	SIZE (mumble-1.2.10_GH0.tar.gz) = 3309556




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
+++ src/mumble/main.cpp
@@ -170,6 +170,9 @@
 	os_init();
 #endif
 
+	SSL_library_init();
+	SSL_load_error_strings();
+
 	bool bAllowMultiple = false;
 	QUrl url;
 	if (a.arguments().count() > 1) {
--- src/murmur/main.cpp
+++ src/murmur/main.cpp
@@ -203,6 +203,9 @@
 	qsrand(QDateTime::currentDateTime().toTime_t());
 	qInstallMsgHandler(murmurMessageOutput);
 
+	SSL_library_init();
+	SSL_load_error_strings();
+
 #ifdef Q_OS_WIN
 	Tray tray(NULL, &le);
 #endif




--- src/mumble.pri.orig	2015-11-11 21:54:35 UTC
+++ src/mumble.pri
@@ -53,11 +53,7 @@ unix {
 	CONFIG *= link_pkgconfig
 	LIBS *= -lprotobuf
 
-	contains(UNAME, FreeBSD) {
-		LIBS *= -lcrypto
-	} else {
-		PKGCONFIG *= openssl
-	}
+	PKGCONFIG *= openssl
 }
 
 QMAKE_EXTRA_COMPILERS *= pb pbh

Return to bug 204467

Lines 2-11 Link Here

(-)audio/murmur/Makefile (-4 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= murmur	4	PORTNAME= murmur
5	PORTVERSION= 1.2.8	5	PORTVERSION= 1.2.10
6	PORTREVISION= 1
7	CATEGORIES= audio net	6	CATEGORIES= audio net
8	MASTER_SITES= SF/mumble/Mumble/${PORTVERSION}
9	DISTNAME= mumble-${PORTVERSION}	7	DISTNAME= mumble-${PORTVERSION}
10		8
11	MAINTAINER= feld@FreeBSD.org	9	MAINTAINER= feld@FreeBSD.org
Lines 18-26 Link Here
18		16
19	USERS= murmur	17	USERS= murmur
20	GROUPS= murmur	18	GROUPS= murmur
21	USES= compiler qmake	19	USES= compiler qmake pkgconfig
22	USE_QT4= moc_build corelib network xml sql sql-sqlite3_run	20	USE_QT4= moc_build corelib network xml sql sql-sqlite3_run
23		21
		22	USE_OPENSSL= YES
		23	WITH_OPENSSL_PORT= YES
		24
		25	USE_GITHUB= YES
		26	GH_ACCOUNT= mumble-voip
		27	GH_PROJECT= mumble
		28
24	CONFIG= no-client	29	CONFIG= no-client
25	QMAKE_ARGS= "CONFIG+=${CONFIG}"	30	QMAKE_ARGS= "CONFIG+=${CONFIG}"
26		31

Line 0 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
	12	+++ src/mumble/main.cpp
	13	@@ -170,6 +170,9 @@
	14	os_init();
	15	#endif
	16
	17	+ SSL_library_init();
	18	+ SSL_load_error_strings();
	19	+
	20	bool bAllowMultiple = false;
	21	QUrl url;
	22	if (a.arguments().count() > 1) {
	23	--- src/murmur/main.cpp
	24	+++ src/murmur/main.cpp
	25	@@ -203,6 +203,9 @@
	26	qsrand(QDateTime::currentDateTime().toTime_t());
	27	qInstallMsgHandler(murmurMessageOutput);
	28
	29	+ SSL_library_init();
	30	+ SSL_load_error_strings();
	31	+
	32	#ifdef Q_OS_WIN
	33	Tray tray(NULL, &le);
	34	#endif

Line 0 Link Here

(-)audio/murmur/files/patch-src_mumble.pri (+15 lines)
	1	--- src/mumble.pri.orig 2015-11-11 21:54:35 UTC
	2	+++ src/mumble.pri
	3	@@ -53,11 +53,7 @@ unix {
	4	CONFIG *= link_pkgconfig
	5	LIBS *= -lprotobuf
	6
	7	- contains(UNAME, FreeBSD) {
	8	- LIBS *= -lcrypto
	9	- } else {
	10	- PKGCONFIG *= openssl
	11	- }
	12	+ PKGCONFIG *= openssl
	13	}
	14
	15	QMAKE_EXTRA_COMPILERS *= pb pbh