Revbump adding patches for Qt 4.8 SSL compatibility. Fix bug #398791, thanks to Hans Nieser. Remove old.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

6 files changed, 202 insertions, 110 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index d6024a4bc4ab..af4c5d6f1f5a 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/murmur
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.26 2011/09/15 21:42:38 tgurr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.27 2012/02/20 19:10:16 tgurr Exp $
+
+*murmur-1.2.3-r2 (20 Feb 2012)
+
+  20 Feb 2012; Timo Gurr <tgurr@gentoo.org> -murmur-1.1.8.ebuild,
+  -murmur-1.2.3-r1.ebuild, +murmur-1.2.3-r2.ebuild,
+  +files/mumble-1.2.3-fix-cert-validation.patch,
+  +files/mumble-1.2.3-remove-certs.patch:
+  Revbump adding patches for Qt 4.8 SSL compatibility. Fix bug #398791, thanks
+  to Hans Nieser. Remove old.
 
 *murmur-1.2.3-r1 (15 Sep 2011)
 
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 4620ad8a6765..2277a08729a5 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,11 +1,11 @@
+AUX mumble-1.2.3-fix-cert-validation.patch 955 RMD160 0c8bc744f17359db4a8fa66f5dc1adde1951b2e0 SHA1 9099892d29a5fde80a7f6aaedac4ef37f5626744 SHA256 1fb865392221131bcf6811d6bfac9ceeb31dfa2503790175626c2cc7647ccae1
+AUX mumble-1.2.3-remove-certs.patch 7944 RMD160 fa5e292c5b574d768aee6c0edb23f7eb53fcbaf1 SHA1 a890dee75c90549b40fadc734de72df7072deff7 SHA256 119754f721fb232797fb3937216fca3922dc4dc36f1bcb506fa042cef05ecde4
 AUX murmur-1.2.3-ice-3.4.2-compat.patch 611 RMD160 ad5a585f45cd5c6306d6e82e545e799e53cabe9a SHA1 2deb14fa2d9431fe59caad87bc94d06b83bafd34 SHA256 72cc624b3fb0aa62c38daeed45636c27856831a147284e79aa7a61c88f8f1bf6
 AUX murmur.confd 244 RMD160 c15d1f5ea8ac2e7673f4a99853b8ffc04722ef6f SHA1 5333693bd28ff70c13dc48638d69d503cb930564 SHA256 f1b452f3d67884a74a08afcaebb2e7ba9c88e4213d8c24f598479bfde3bf7f2f
 AUX murmur.initd 681 RMD160 70a62fc0011fb8334966d0ab6705aac0062cef19 SHA1 70fb0ec14151252736452beade83e2fcc6e55cd6 SHA256 36efaa00cc532a1384ec52f0aef98fb2ef26fc757e8885ed69a74a9f78c578a5
 AUX murmur.logrotate 127 RMD160 1053af850dad13fa9d1232dc176752889ed9f8bd SHA1 22e7b4cbf222cf558267bf3ff0d4dae805f737c6 SHA256 203d1f0c159d1c8ed06aac13c7a2cf20d67f36cb4ad043f54d90bef3b9de62c6
-DIST mumble-1.1.8.tar.gz 1241365 RMD160 d2d05993b38749f30ed67b8b92a22ef236dc7cf1 SHA1 83b5ef771b6801953290ee184f1590686e831b8c SHA256 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856
 DIST mumble-1.2.3.tar.gz 3448053 RMD160 c02e1c42e6996e7b6052772089febd22be67582d SHA1 420e245ef978d7e51ca3ed97922acf13f5ef982d SHA256 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
-EBUILD murmur-1.1.8.ebuild 2845 RMD160 c533fb32d57915ccfa3721cfb530d7d9fa85c6cf SHA1 c1a1a937eeda981420235ac1768b6921bd56e652 SHA256 07f16db719ed5f33a4fdf601235797cd107cd77def524c781ecfbbc3ef6cd05a
-EBUILD murmur-1.2.3-r1.ebuild 2815 RMD160 8efb946fa24f19a469935dde15c675bc8a20661e SHA1 c6ae33feb23d882f8fd3db29624dd90f215f8ec8 SHA256 97143763858ca94e7b236851e0b2477ee4b35cf1102a4eb64ce46e516efc90dd
+EBUILD murmur-1.2.3-r2.ebuild 2975 RMD160 388c244b0bfdae758a67af097067f189d0995268 SHA1 35a6748d27944e8a3529f2731fcd75d2a3191c6e SHA256 4a7d041b589702719f463820b36aa970a1e05e1b98882ecd72d481321c97a490
 EBUILD murmur-1.2.3.ebuild 3297 RMD160 a175f4ef7fc21b451015c0c6db5fe66ad28d1caa SHA1 6ebe724890666a2eba75bfac733a6718f949c2c4 SHA256 4f942bfd16e98cf0b926f6321b24d779fd749866312adfef84892fe4f6a38e73
-MISC ChangeLog 4776 RMD160 1719782ca24f1a6d8c61c3ab4f7106a24300e773 SHA1 78f049642bd3f62eda1e002f88eaa77d3cd4cee1 SHA256 9be8a369ee2a665320cb98a89e7fc36331c45e5c2facda64872e55d7ec809e97
+MISC ChangeLog 5127 RMD160 7df84b39c439b1783fcf0beb5d95bbdfdc7c4623 SHA1 81a4e13dc1494c45c5b95998627d65c1887ffed7 SHA256 ec3433f70db0d36600011444fb00ed16f1b3327304c4fa16b7dff00107550a4c
 MISC metadata.xml 480 RMD160 6e9216bf763dbbc619a699b787a4ae20c0c8f500 SHA1 bd2ab47ea3dce184e6a560a8a77034ecc2b85372 SHA256 4fa0864013dcdcda9b1e16a8f97af9e0af12b4ccefd2d163954f241391f76c2c
diff --git a/media-sound/murmur/files/mumble-1.2.3-fix-cert-validation.patch b/media-sound/murmur/files/mumble-1.2.3-fix-cert-validation.patch
new file mode 100644
index 000000000000..2cfd9d6f9c8d
--- /dev/null
+++ b/media-sound/murmur/files/mumble-1.2.3-fix-cert-validation.patch
@@ -0,0 +1,30 @@
+From d16876d804d028153f37f4f8aff770469edf6997 Mon Sep 17 00:00:00 2001
+From: Benjamin Jemlich <pcgod@users.sourceforge.net>
+Date: Sun, 19 Feb 2012 08:55:06 +0100
+Subject: [PATCH] Fix certificate validation with QT 4.8
+
+Changed from setDefaultCaCertificates to addDefaultCaCertificates because
+Murmur adds CA certificates in sslCert before calling MumbleSSL::addSystemCA.
+
+Original patch written by Marc Deslauriers <marc.deslauriers@canonical.com>
+---
+ src/SSL.cpp |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/SSL.cpp b/src/SSL.cpp
+index f94d528..2ba3d27 100644
+--- a/src/SSL.cpp
++++ b/src/SSL.cpp
+@@ -142,4 +142,9 @@ void MumbleSSL::addSystemCA() {
+ 	}
+ 	QSslSocket::setDefaultCaCertificates(ql);
+ #endif // NO_SYSTEM_CA_OVERRIDE
++
++#if QT_VERSION >= 0x040800
++	// Don't perform on-demand loading of root certificates
++	QSslSocket::addDefaultCaCertificates(QSslSocket::systemCaCertificates());
++#endif
+ }
+-- 
+1.7.5.4
+
diff --git a/media-sound/murmur/files/mumble-1.2.3-remove-certs.patch b/media-sound/murmur/files/mumble-1.2.3-remove-certs.patch
new file mode 100644
index 000000000000..9cc9eb49dcd5
--- /dev/null
+++ b/media-sound/murmur/files/mumble-1.2.3-remove-certs.patch
@@ -0,0 +1,147 @@
+From 2d9d78ad68535b94e2eddf66b97183662ae67bef Mon Sep 17 00:00:00 2001
+From: Benjamin Jemlich <pcgod@users.sourceforge.net>
+Date: Sat, 18 Feb 2012 10:41:22 +0100
+Subject: [PATCH] Remove hardcoded CA certificates
+
+---
+ src/SSL.cpp |  119 -----------------------------------------------------------
+ 1 files changed, 0 insertions(+), 119 deletions(-)
+
+diff --git a/src/SSL.cpp b/src/SSL.cpp
+index ab9f0c8..f94d528 100644
+--- a/src/SSL.cpp
++++ b/src/SSL.cpp
+@@ -34,117 +34,6 @@
+ 
+ #include "Version.h"
+ 
+-/* CAs we recommend to end users, so support these */
+-
+-static const char *recommended_cas[] = {
+-	/* StartSSL */
+-	"-----BEGIN CERTIFICATE-----\n"
+-	"MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW\n"
+-	"MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg\n"
+-	"Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh\n"
+-	"dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9\n"
+-	"MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi\n"
+-	"U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh\n"
+-	"cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA\n"
+-	"A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk\n"
+-	"pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf\n"
+-	"OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C\n"
+-	"Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT\n"
+-	"Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi\n"
+-	"HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM\n"
+-	"Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w\n"
+-	"+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+\n"
+-	"Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3\n"
+-	"Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B\n"
+-	"26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID\n"
+-	"AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE\n"
+-	"FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j\n"
+-	"ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js\n"
+-	"LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM\n"
+-	"BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0\n"
+-	"Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy\n"
+-	"dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh\n"
+-	"cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh\n"
+-	"YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg\n"
+-	"dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp\n"
+-	"bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ\n"
+-	"YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT\n"
+-	"TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ\n"
+-	"9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8\n"
+-	"jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW\n"
+-	"FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz\n"
+-	"ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1\n"
+-	"ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L\n"
+-	"EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu\n"
+-	"L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq\n"
+-	"yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC\n"
+-	"O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V\n"
+-	"um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh\n"
+-	"NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=\n"
+-	"-----END CERTIFICATE-----\n"
+-	,
+-	/* Comodo */
+-	"-----BEGIN CERTIFICATE-----\n"
+-	"MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb\n"
+-	"MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow\n"
+-	"GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj\n"
+-	"YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL\n"
+-	"MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE\n"
+-	"BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM\n"
+-	"GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP\n"
+-	"ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua\n"
+-	"BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe\n"
+-	"3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4\n"
+-	"YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR\n"
+-	"rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm\n"
+-	"ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU\n"
+-	"oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF\n"
+-	"MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v\n"
+-	"QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t\n"
+-	"b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF\n"
+-	"AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q\n"
+-	"GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz\n"
+-	"Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2\n"
+-	"G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi\n"
+-	"l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3\n"
+-	"smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==\n"
+-	"-----END CERTIFICATE-----\n"
+-	,
+-	/* Comodo UserTrust */
+-	"-----BEGIN CERTIFICATE-----\n"
+-	"MIIE3TCCA8WgAwIBAgIQcZL75hlfrE0ShXRxNKIYpzANBgkqhkiG9w0BAQUFADB7\n"
+-	"MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD\n"
+-	"VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE\n"
+-	"AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4\n"
+-	"MTIzMTIzNTk1OVowga4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UE\n"
+-	"BxMOU2FsdCBMYWtlIENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29y\n"
+-	"azEhMB8GA1UECxMYaHR0cDovL3d3dy51c2VydHJ1c3QuY29tMTYwNAYDVQQDEy1V\n"
+-	"VE4tVVNFUkZpcnN0LUNsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgRW1haWwwggEi\n"
+-	"MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyOYWk8n2rQTtiRjeuzcFgdbw5\n"
+-	"ZflKGkeiucxIzGqY1U01GbmkQuXOSeKKLx580jEHx060g2SdLinVomTEhb2FUTV5\n"
+-	"pE5okHsceqSSqBfymBXyk8zJpDKVuwxPML2YoAuL5W4bokb6eLyib6tZXqUvz8ra\n"
+-	"baov66yhs2qqty5nNYt54R5piOLmRs2gpeq+C852OnoOm+r82idbPXMfIuZIYcZM\n"
+-	"82mxqC4bttQxICy8goqOpA6l14lD/BZarx1x1xFZ2rqHDa/68+HC8KTFZ4zW1lQ6\n"
+-	"3gqkugN3s2XI/R7TdGKqGMpokx6hhX71R2XL+E1XKHTSNP8wtu72YjAUjCzrAgMB\n"
+-	"AAGjggEnMIIBIzAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAdBgNV\n"
+-	"HQ4EFgQUiYJnfcSdJnAAS7RQSHzePa4Ebn0wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud\n"
+-	"EwEB/wQFMAMBAf8wHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMBEGA1Ud\n"
+-	"IAQKMAgwBgYEVR0gADB7BgNVHR8EdDByMDigNqA0hjJodHRwOi8vY3JsLmNvbW9k\n"
+-	"b2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA2oDSgMoYwaHR0cDov\n"
+-	"L2NybC5jb21vZG8ubmV0L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMBEGCWCG\n"
+-	"SAGG+EIBAQQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAnZXLPLh+pQnEHr8Lwsd2\n"
+-	"jjk8lMYQqk8MyeCrhF2JVOBlO/NtHHw3LCVUX5Yh/DeEkZ0V3BRPgc9UHWtsRWDH\n"
+-	"LfmXUUz5Zso8oIKMpsjw4unUSvnsP1bJ3XaMw4IBT2wA8x4aYXQERwOpxkBXkbxl\n"
+-	"IsUnZ09X22Ra2Y0fuoYv9AaunGnt6fTPKRfY4EqfGiAvl0xRu0YHxIo3TiDjCTFo\n"
+-	"x57Ei53ofhG8MmgQlhGYRNgqUWBNiOt0Ot9DBjLIOVaMOhFS00GkQwP07e8zJ9s5\n"
+-	"4BROJsnY9TniibiTXbcpJkHqs5uug/x3dcroyrX+4mVKYz5ExNDDXodzqZgcr38V\n"
+-	"fw==\n"
+-	"-----END CERTIFICATE-----\n"
+-
+-
+-};
+-
+-
+ void MumbleSSL::addSystemCA() {
+ #if QT_VERSION < 0x040700 && !defined(NO_SYSTEM_CA_OVERRIDE)
+ #if defined(Q_OS_WIN)
+@@ -253,12 +142,4 @@ void MumbleSSL::addSystemCA() {
+ 	}
+ 	QSslSocket::setDefaultCaCertificates(ql);
+ #endif // NO_SYSTEM_CA_OVERRIDE
+-
+-	for (unsigned int i=0;i<sizeof(recommended_cas)/sizeof(recommended_cas[0]);++i) {
+-		QSslCertificate cert(recommended_cas[i]);
+-		if (! QSslSocket::defaultCaCertificates().contains(cert)) {
+-			qWarning("SSL: Adding recommended CA %s", qPrintable(cert.subjectInfo(QSslCertificate::CommonName)));
+-			QSslSocket::addDefaultCaCertificates(QList<QSslCertificate>() << cert);
+-		}
+-	}
+ }
+-- 
+1.7.5.4
+
diff --git a/media-sound/murmur/murmur-1.1.8.ebuild b/media-sound/murmur/murmur-1.1.8.ebuild
deleted file mode 100644
index 2f42252f3e27..000000000000
--- a/media-sound/murmur/murmur-1.1.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.1.8.ebuild,v 1.5 2010/06/08 08:30:08 dev-zero Exp $
-
-EAPI="2"
-
-inherit eutils qt4
-
-MY_PN="mumble"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Voice chat software for gaming written in Qt4 (server)."
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +ice pch"
-
-RDEPEND="
-	>=sys-libs/libcap-2.15
-	x11-libs/qt-core:4[ssl]
-	x11-libs/qt-dbus:4
-	|| ( x11-libs/qt-sql:4[sqlite] x11-libs/qt-sql:4[mysql] )
-	ice? ( dev-libs/Ice dev-libs/boost )
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:mumble-server:murmur:g' \
-		scripts/murmur.conf \
-		scripts/murmur.ini.system \
-		|| die "sed failed."
-}
-
-src_configure() {
-	local conf_add
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use ice || conf_add="${conf_add} no-ice"
-	use pch || conf_add="${conf_add} no-pch"
-
-	eqmake4 main.pro -recursive \
-		CONFIG+="${conf_add} no-client no-bundled-speex" \
-		|| die "eqmake4 failed."
-}
-
-src_install() {
-	dodoc README CHANGES || die "Installing docs failed."
-
-	docinto scripts
-	dodoc scripts/*.php scripts/*.pl || die "Installing docs failed."
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/murmurd || die "Installing murmurd binary failed."
-
-	insinto /etc/murmur/
-	newins scripts/murmur.ini.system murmur.ini || die "Installing murmur.ini configuration file failed."
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur || die "Installing murmur logrotate file failed."
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf || die "Installing murmur.conf dbus configuration file failed."
-
-	newinitd "${FILESDIR}"/murmur.initd murmur || die "Installing murmur init.d file failed."
-	newconfd "${FILESDIR}"/murmur.confd murmur || die "Installing murmur conf.d file failed."
-
-	keepdir /var/lib/murmur /var/run/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/run/murmur /var/log/murmur || die "fowners failed."
-	fperms 750 /var/lib/murmur /var/run/murmur /var/log/murmur || die "fperms failed."
-
-	doman man/murmurd.1 || die "Installing murmur manpage failed."
-}
-
-pkg_postinst() {
-	echo
-	elog "Useful scripts are located in /usr/share/doc/${PF}/scripts."
-	elog "Please execute:"
-	elog "murmurd -ini /etc/murmur/murmur.ini -supw <pw>"
-	elog "chown murmur:murmur /var/lib/murmur/murmur.sqlite"
-	elog "to set the build-in 'SuperUser' password before starting murmur."
-	elog "Please restart dbus before starting murmur, or else dbus"
-	elog "registration will fail."
-	echo
-}
diff --git a/media-sound/murmur/murmur-1.2.3-r1.ebuild b/media-sound/murmur/murmur-1.2.3-r2.ebuild
index 61cbb00fe9d0..4eb6a004a91e 100644
--- a/media-sound/murmur/murmur-1.2.3-r1.ebuild
+++ b/media-sound/murmur/murmur-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.3-r1.ebuild,v 1.1 2011/09/15 21:42:38 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.3-r2.ebuild,v 1.1 2012/02/20 19:10:16 tgurr Exp $
 
 EAPI="4"
 
@@ -34,7 +34,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.3-ice-3.4.2-compat.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.3-ice-3.4.2-compat.patch
+	"${FILESDIR}"/mumble-1.2.3-remove-certs.patch
+	"${FILESDIR}"/mumble-1.2.3-fix-cert-validation.patch
+)
 
 pkg_setup() {
 	enewgroup murmur
@@ -90,6 +94,9 @@ src_install() {
 	insinto /etc/dbus-1/system.d/
 	doins scripts/murmur.conf
 
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
 	newinitd "${FILESDIR}"/murmur.initd murmur
 	newconfd "${FILESDIR}"/murmur.confd murmur