[packages/qt5-qtbase] rediffed patch

atler atler at pld-linux.org
Tue May 25 13:08:35 CEST 2021


commit d273853571411587a7e7353246fb7bd0922135bb
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue May 25 13:06:37 2021 +0200

    rediffed patch

 qt5-qtbase-system_cacerts.patch | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/qt5-qtbase-system_cacerts.patch b/qt5-qtbase-system_cacerts.patch
index 22ceef7..743326a 100644
--- a/qt5-qtbase-system_cacerts.patch
+++ b/qt5-qtbase-system_cacerts.patch
@@ -1,9 +1,7 @@
 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,9 @@
-         while (it.hasNext())
-             systemCerts.append(QSslCertificate::fromPath(it.next(), platformEncodingFormat));
+@@ -731,6 +731,7 @@
  # 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
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list