]> git.pld-linux.org Git - packages/qt5-qtbase.git/commitdiff
- keep locations from other systems
authorJan Palus <atler@pld-linux.org>
Thu, 1 Jan 2015 12:51:29 +0000 (13:51 +0100)
committerJan Palus <atler@pld-linux.org>
Thu, 1 Jan 2015 12:51:29 +0000 (13:51 +0100)
qt5-qtbase-system_cacerts.patch

index 916d475ca662d06902f2a91f1312561505820a7d..22ceef7c1dfdf8ec36e556dca955f8836d3f245a 100644 (file)
@@ -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
      }
This page took 0.038779 seconds and 4 git commands to generate.