[packages/qt5-qtbase] - keep locations from other systems

[atler]

commit 84bbd11ddf219679b906da40934f700c45ad4459
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jan 1 13:51:29 2015 +0100

    - keep locations from other systems

 qt5-qtbase-system_cacerts.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtbase-system_cacerts.patch b/qt5-qtbase-system_cacerts.patch
index 916d475..22ceef7 100644
--- a/qt5-qtbase-system_cacerts.patch
+++ b/qt5-qtbase-system_cacerts.patch
@@ -1,12 +1,12 @@
 diff -urN qtbase-opensource-src-5.3.2.orig/src/network/ssl/qsslsocket_openssl.cpp qtbase-opensource-src-5.3.2/src/network/ssl/qsslsocket_openssl.cpp
 --- qtbase-opensource-src-5.3.2.orig/src/network/ssl/qsslsocket_openssl.cpp	2014-12-31 13:35:17.485983733 +0100
 +++ qtbase-opensource-src-5.3.2/src/network/ssl/qsslsocket_openssl.cpp	2014-12-31 13:36:25.965981516 +0100
-@@ -731,8 +731,7 @@
+@@ -731,8 +731,9 @@
          while (it.hasNext())
              systemCerts.append(QSslCertificate::fromPath(it.next(), platformEncodingFormat));
  # ifndef Q_OS_ANDROID
--        systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva
--        systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss
+         systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva
+         systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss
 +        systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/certs/ca-certificates.crt"), QSsl::Pem)); // PLD
  # endif
      }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtbase.git/commitdiff/84bbd11ddf219679b906da40934f700c45ad4459