svn commit: r402103 - in head/audio/murmur: . files
Mark Felder
feld at FreeBSD.org
Fri Nov 20 21:43:48 UTC 2015
Author: feld
Date: Fri Nov 20 21:43:46 2015
New Revision: 402103
URL: https://svnweb.freebsd.org/changeset/ports/402103
Log:
audio/murmur: Fix segfault on FreeBSD 9.x, use base OpenSSL
FreeBSD 9.x was segfaulting with the update to 1.2.10 due to the
change to build against the ports OpenSSL. The problem was that while
murmur was linked against ports OpenSSL, it was also linked to QT which
pulled in the base system OpenSSL. FreeBSD 10.x and head did not
segfault due to pure luck.
While here, require compiler:c++11-lang. This is definitely required for
the upcoming 1.3.0 release, but also I want to avoid and weirdness on
FreeBSD 9.x which was building murmur with gcc but required a
clang-built boost at build time.
Added:
head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp (contents, props changed)
Modified:
head/audio/murmur/Makefile
head/audio/murmur/files/patch-src_mumble.pri
Modified: head/audio/murmur/Makefile
==============================================================================
--- head/audio/murmur/Makefile Fri Nov 20 20:45:25 2015 (r402102)
+++ head/audio/murmur/Makefile Fri Nov 20 21:43:46 2015 (r402103)
@@ -3,6 +3,7 @@
PORTNAME= murmur
PORTVERSION= 1.2.10
+PORTREVISION= 1
CATEGORIES= audio net
DISTNAME= mumble-${PORTVERSION}
@@ -16,11 +17,10 @@ LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/
USERS= murmur
GROUPS= murmur
-USES= compiler qmake pkgconfig
+USES= compiler:c++11-lang 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
@@ -63,6 +63,10 @@ CONFIG+= no-bonjour
CONFIG+= no-pch
.endif
+.if ${OSVERSION} < 1000510
+EXTRA_PATCHES= ${FILESDIR}/FreeBSD9-patch-src_SSL.cpp
+.endif
+
post-patch:
@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
Added: head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp Fri Nov 20 21:43:46 2015 (r402103)
@@ -0,0 +1,11 @@
+--- src/SSL.cpp.orig 2015-11-20 16:02:09 UTC
++++ src/SSL.cpp
+@@ -43,7 +43,7 @@ QList<QSslCipher> MumbleSSL::ciphersFrom
+
+ SSL_CTX *ctx = NULL;
+ SSL *ssl = NULL;
+- const SSL_METHOD *meth = NULL;
++ SSL_METHOD *meth = NULL;
+ int i = 0;
+
+ QByteArray csbuf = cipherString.toLatin1();
Modified: head/audio/murmur/files/patch-src_mumble.pri
==============================================================================
--- head/audio/murmur/files/patch-src_mumble.pri Fri Nov 20 20:45:25 2015 (r402102)
+++ head/audio/murmur/files/patch-src_mumble.pri Fri Nov 20 21:43:46 2015 (r402103)
@@ -1,15 +1,11 @@
---- src/mumble.pri.orig 2015-11-11 21:54:35 UTC
+--- src/mumble.pri.orig 2015-07-09 13:23:46 UTC
+++ src/mumble.pri
-@@ -53,11 +53,7 @@ unix {
- CONFIG *= link_pkgconfig
+@@ -54,7 +54,7 @@ unix {
LIBS *= -lprotobuf
-- contains(UNAME, FreeBSD) {
+ contains(UNAME, FreeBSD) {
- LIBS *= -lcrypto
-- } else {
-- PKGCONFIG *= openssl
-- }
-+ PKGCONFIG *= openssl
- }
-
- QMAKE_EXTRA_COMPILERS *= pb pbh
++ LIBS *= -lcrypto -lssl
+ } else {
+ PKGCONFIG *= openssl
+ }
More information about the svn-ports-head
mailing list