[Pkg-voip-commits] r9493 - in /mumble/trunk/debian: changelog patches/03-fix-cert-validation.diff patches/series

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sun Feb 12 11:07:04 2012
New Revision: 9493

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9493
Log:
* Add patch 03-fix-cert-validation from Marc Deslauriers, which fixes the
  certificate validation with Qt 4.8.
  Closes: #659035

Added:
    mumble/trunk/debian/patches/03-fix-cert-validation.diff
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/patches/series

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=9493&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun Feb 12 11:07:04 2012
@@ -7,8 +7,11 @@
   * Add patch 02-reject-with-ip-in-log to show up the IP address of a rejected
     connection in the mumble-server log.
     Closes: #627139
-
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 12 Feb 2012 11:59:18 +0100
+  * Add patch 03-fix-cert-validation from Marc Deslauriers, which fixes the
+    certificate validation with Qt 4.8.
+    Closes: #659035
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 12 Feb 2012 12:05:46 +0100
 
 mumble (1.2.3-192-g683d39b-1) experimental; urgency=low
 

Added: mumble/trunk/debian/patches/03-fix-cert-validation.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/03-fix-cert-validation.diff?rev=9493&op=file
==============================================================================
--- mumble/trunk/debian/patches/03-fix-cert-validation.diff (added)
+++ mumble/trunk/debian/patches/03-fix-cert-validation.diff Sun Feb 12 11:07:04 2012
@@ -1,0 +1,19 @@
+Description: Fix certificate validation with QT 4.8. For some reason, the
+ new on-demand root cert loading is not working with mumble.
+ Author: Marc Deslauriers <marc.deslauriers at canonical.com>
+ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mumble/+bug/928296
+
+--- mumble-1.2.3-277-g98f4ac1.orig/src/SSL.cpp	2012-02-05 14:00:59.000000000 +0100
++++ mumble-1.2.3-277-g98f4ac1/src/SSL.cpp	2012-02-12 12:04:01.596809036 +0100
+@@ -254,6 +254,11 @@
+ 	QSslSocket::setDefaultCaCertificates(ql);
+ #endif // NO_SYSTEM_CA_OVERRIDE
+ 
++#if QT_VERSION >= 0x040800
++        // Don't perform on-demand loading of root certificates
++        QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates());
++#endif
++
+ 	for (unsigned int i=0;i<sizeof(recommended_cas)/sizeof(recommended_cas[0]);++i) {
+ 		QSslCertificate cert(recommended_cas[i]);
+ 		if (! QSslSocket::defaultCaCertificates().contains(cert)) {

Modified: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=9493&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Sun Feb 12 11:07:04 2012
@@ -1,2 +1,3 @@
 01-fix-spelling-error.diff
 02-reject-with-ip-in-log.diff
+03-fix-cert-validation.diff