mumble: set of secure tls ciphers which work on both libressl and openssl, allow higher audio frame size and higher audio bitrate

3 files changed, 38 insertions, 10 deletions

diff --git a/media-sound/mumble/files/allow_higher_bitrate_and_frame_size.patch b/media-sound/mumble/files/allow_higher_bitrate_and_frame_size.patch
new file mode 100644
index 0000000..87aaee0
--- /dev/null
+++ b/media-sound/mumble/files/allow_higher_bitrate_and_frame_size.patch
@@ -0,0 +1,29 @@
+diff --git a/src/mumble/AudioInput.ui b/src/mumble/AudioInput.ui
+index f2a67a5b..b250b3b7 100644
+--- a/src/mumble/AudioInput.ui
++++ b/src/mumble/AudioInput.ui
+@@ -483,7 +483,7 @@
+          <number>8000</number>
+         </property>
+         <property name="maximum">
+-         <number>96000</number>
++         <number>128000</number>
+         </property>
+         <property name="singleStep">
+          <number>1000</number>
+@@ -534,11 +534,14 @@
+          <number>1</number>
+         </property>
+         <property name="maximum">
+-         <number>4</number>
++         <number>6</number>
+         </property>
+         <property name="pageStep">
+          <number>2</number>
+         </property>
++        <property name="value">
++         <number>6</number>
++        </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
diff --git a/media-sound/mumble/files/tls12_strong_ciphers.patch b/media-sound/mumble/files/tls12_strong_ciphers.patch
index df40502..86297a1 100644
--- a/media-sound/mumble/files/tls12_strong_ciphers.patch
+++ b/media-sound/mumble/files/tls12_strong_ciphers.patch
@@ -1,29 +1,27 @@
 diff --git a/src/Connection.cpp b/src/Connection.cpp
-index 3b67c2c2..cee57657 100644
+index 5dc7443e..c7fc968f 100644
 --- a/src/Connection.cpp
 +++ b/src/Connection.cpp
-@@ -25,6 +25,10 @@ HANDLE Connection::hQoS = NULL;
+@@ -25,6 +25,9 @@ HANDLE Connection::hQoS = NULL;
  Connection::Connection(QObject *p, QSslSocket *qtsSock) : QObject(p) {
  	qtsSocket = qtsSock;
  	qtsSocket->setParent(this);
 +#if QT_VERSION >= 0x050500
-+    qtsSocket->setProtocol(QSsl::TlsV1_2OrLater);
++	qtsSocket->setProtocol(QSsl::TlsV1_2OrLater);
 +#endif
-+
  	iPacketLength = -1;
  	bDisconnectedEmitted = false;
  
 diff --git a/src/SSL.cpp b/src/SSL.cpp
-index 9c372569..fe1e5cdb 100644
+index 7f7e8121..16cddd28 100644
 --- a/src/SSL.cpp
 +++ b/src/SSL.cpp
-@@ -40,7 +40,8 @@ void MumbleSSL::destroy() {
+@@ -40,7 +40,7 @@ void MumbleSSL::destroy() {
  }
  
  QString MumbleSSL::defaultOpenSSLCipherString() {
 -	return QLatin1String("EECDH+AESGCM:EDH+aRSA+AESGCM:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:AES256-SHA:AES128-SHA");
-+    return QLatin1String("DHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CAMELLIA256-SHA256:\
-+DHE-RSA-AES128-GCM-SHA256:AES256-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256");
++	return QLatin1String("DHE-RSA-CHACHA20-POLY1305:DHE-RSA-CAMELLIA256-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384");
  }
  
  QList<QSslCipher> MumbleSSL::ciphersFromOpenSSLCipherString(QString cipherString) {
diff --git a/media-sound/mumble/mumble-scm.ebuild b/media-sound/mumble/mumble-scm.ebuild
index 216d456..bfbdd21 100644
--- a/media-sound/mumble/mumble-scm.ebuild
+++ b/media-sound/mumble/mumble-scm.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.5.ebuild,v 1.3 2014/02/15 21:28:10 ago Exp $
 
-EAPI="5"
+EAPI="6"
 
 QT_MINIMAL="5"
 
-inherit base eutils toolchain-funcs flag-o-matic libtool git-r3 multilib qt4-r2
+inherit eutils toolchain-funcs flag-o-matic libtool git-r3 qmake-utils
 
 #MY_P="${PN}-${PV/_/~}"
 
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/gcc.patch
 	"${FILESDIR}"/tls12_strong_ciphers.patch
 	"${FILESDIR}"/higher_opus_complexity.patch
+	"${FILESDIR}"/allow_higher_bitrate_and_frame_size.patch
 )
 
 #S="${WORKDIR}/${MY_P}"