diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-07-24 18:31:14 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-07-24 18:31:14 +0300 |
| commit | aa5606ccab54c2022543a1a8d0861b1fbbee9b63 (patch) | |
| tree | dbae9a655eaa0f0a66ee2e328c7c41f2f0178471 /media-sound | |
| parent | 14800f275d46d0a03095af737de0e8d4821d6f6c (diff) | |
murmur: force tls1.2, ebuild cleanup
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/murmur/files/force_tls12.patch | 13 | ||||
| -rw-r--r-- | media-sound/murmur/murmur-scm.ebuild | 5 |
2 files changed, 15 insertions, 3 deletions
diff --git a/media-sound/murmur/files/force_tls12.patch b/media-sound/murmur/files/force_tls12.patch new file mode 100644 index 0000000..9180061 --- /dev/null +++ b/media-sound/murmur/files/force_tls12.patch @@ -0,0 +1,13 @@ +diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp +index 8a1856fb..17fa1ec9 100644 +--- a/src/murmur/Server.cpp ++++ b/src/murmur/Server.cpp +@@ -1251,7 +1251,7 @@ void Server::newClient() { + u->setToS(); + + #if QT_VERSION >= 0x050500 +- sock->setProtocol(QSsl::TlsV1_0OrLater); ++ sock->setProtocol(QSsl::TlsV1_2OrLater); + #elif QT_VERSION >= 0x050400 + // In Qt 5.4, QSsl::SecureProtocols is equivalent + // to "TLSv1.0 or later", which we require. diff --git a/media-sound/murmur/murmur-scm.ebuild b/media-sound/murmur/murmur-scm.ebuild index b1a2c2d..a5157b8 100644 --- a/media-sound/murmur/murmur-scm.ebuild +++ b/media-sound/murmur/murmur-scm.ebuild @@ -4,9 +4,8 @@ EAPI="5" -QT_MINIMAL="4" -inherit eutils qt4-r2 systemd user readme.gentoo git-r3 +inherit eutils systemd user readme.gentoo git-r3 qmake-utils DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" @@ -57,7 +56,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/acl_edit_log.patch" - qt4-r2_src_prepare + epatch "${FILESDIR}/force_tls12.patch" sed \ -e 's:mumble-server:murmur:g' \ |