FreeBSD Bugzilla – Attachment 163025 Details for
Bug 204467
audio/murmur: Switch to github and update to 1.2.10
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update murmur to 1.2.10
murmur.diff (text/plain), 3.73 KB, created by
Mark Felder
on 2015-11-11 22:01:44 UTC
(
hide
)
Description:
update murmur to 1.2.10
Filename:
MIME Type:
Creator:
Mark Felder
Created:
2015-11-11 22:01:44 UTC
Size:
3.73 KB
patch
obsolete
>Index: audio/murmur/Makefile >=================================================================== >--- audio/murmur/Makefile (revision 401098) >+++ audio/murmur/Makefile (working copy) >@@ -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 @@ > > 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}" > >Index: audio/murmur/distinfo >=================================================================== >--- audio/murmur/distinfo (revision 401098) >+++ audio/murmur/distinfo (working copy) >@@ -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 >Index: audio/murmur/files/patch-initialize-SSL >=================================================================== >--- audio/murmur/files/patch-initialize-SSL (nonexistent) >+++ audio/murmur/files/patch-initialize-SSL (working copy) >@@ -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 > >Property changes on: audio/murmur/files/patch-initialize-SSL >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: audio/murmur/files/patch-src_mumble.pri >=================================================================== >--- audio/murmur/files/patch-src_mumble.pri (nonexistent) >+++ audio/murmur/files/patch-src_mumble.pri (working copy) >@@ -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 > >Property changes on: audio/murmur/files/patch-src_mumble.pri >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 204467
: 163025