svn commit: r401396 - in head/audio/murmur: . files
Mark Felder
feld at FreeBSD.org
Thu Nov 12 20:23:55 UTC 2015
Author: feld
Date: Thu Nov 12 20:23:53 2015
New Revision: 401396
URL: https://svnweb.freebsd.org/changeset/ports/401396
Log:
audio/murmur: Update to 1.2.10
PR: 204467
Added:
head/audio/murmur/files/patch-initialize-SSL (contents, props changed)
head/audio/murmur/files/patch-src_mumble.pri (contents, props changed)
Modified:
head/audio/murmur/Makefile
head/audio/murmur/distinfo
Modified: head/audio/murmur/Makefile
==============================================================================
--- head/audio/murmur/Makefile Thu Nov 12 20:10:36 2015 (r401395)
+++ head/audio/murmur/Makefile Thu Nov 12 20:23:53 2015 (r401396)
@@ -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 at FreeBSD.org
@@ -18,9 +16,16 @@ LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/
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}"
Modified: head/audio/murmur/distinfo
==============================================================================
--- head/audio/murmur/distinfo Thu Nov 12 20:10:36 2015 (r401395)
+++ head/audio/murmur/distinfo Thu Nov 12 20:23:53 2015 (r401396)
@@ -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
Added: head/audio/murmur/files/patch-initialize-SSL
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/murmur/files/patch-initialize-SSL Thu Nov 12 20:23:53 2015 (r401396)
@@ -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 at herbesfolles.org>
+ Christohper Knadle <Chris.Knadle at 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
Added: head/audio/murmur/files/patch-src_mumble.pri
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/murmur/files/patch-src_mumble.pri Thu Nov 12 20:23:53 2015 (r401396)
@@ -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
More information about the svn-ports-all
mailing list