From fdd9a442685d1d4ac328b10631fa860cde0c2a29 Mon Sep 17 00:00:00 2001
From: feld <feld@FreeBSD.org>
Date: Thu, 12 Nov 2015 20:23:53 +0000
Subject: audio/murmur: Update to 1.2.10

PR:		204467
---
 audio/murmur/Makefile                   | 13 +++++++++----
 audio/murmur/distinfo                   |  4 ++--
 audio/murmur/files/patch-initialize-SSL | 34 +++++++++++++++++++++++++++++++++
 audio/murmur/files/patch-src_mumble.pri | 15 +++++++++++++++
 4 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 audio/murmur/files/patch-initialize-SSL
 create mode 100644 audio/murmur/files/patch-src_mumble.pri

(limited to 'audio')

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 513e931f8c90..96945d1b2c97 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	murmur
-PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTVERSION=	1.2.10
 CATEGORIES=	audio net
-MASTER_SITES=	SF/mumble/Mumble/${PORTVERSION}
 DISTNAME=	mumble-${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
@@ -18,9 +16,16 @@ LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
 
 USERS=		murmur
 GROUPS=		murmur
-USES=		compiler qmake
+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}"
 
diff --git a/audio/murmur/distinfo b/audio/murmur/distinfo
index 833abcb14e7e..0d8085829b9a 100644
--- a/audio/murmur/distinfo
+++ b/audio/murmur/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mumble-1.2.8.tar.gz) = 4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159
-SIZE (mumble-1.2.8.tar.gz) = 3202518
+SHA256 (mumble-1.2.10_GH0.tar.gz) = 8eb14d03b67d2f83d894b05f79125fe7a1b1798078d5821744d9a3de38d7d2ef
+SIZE (mumble-1.2.10_GH0.tar.gz) = 3309556
diff --git a/audio/murmur/files/patch-initialize-SSL b/audio/murmur/files/patch-initialize-SSL
new file mode 100644
index 000000000000..5513176cc423
--- /dev/null
+++ b/audio/murmur/files/patch-initialize-SSL
@@ -0,0 +1,34 @@
+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
diff --git a/audio/murmur/files/patch-src_mumble.pri b/audio/murmur/files/patch-src_mumble.pri
new file mode 100644
index 000000000000..36f64ba504de
--- /dev/null
+++ b/audio/murmur/files/patch-src_mumble.pri
@@ -0,0 +1,15 @@
+--- 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
-- 
cgit