[packages/qt5-qtbase] - new patch for customizing location of system CA certificates

[atler]

commit c05a48fbf49ac07847745aca4e1efcbab6b2b7c6
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Dec 31 14:04:04 2014 +0100

    - new patch for customizing location of system CA certificates

 qt5-qtbase-system_cacerts.patch | 13 +++++++++++++
 qt5-qtbase.spec                 |  2 ++
 2 files changed, 15 insertions(+)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 7c8f2b6..1823717 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -69,6 +69,7 @@ Source0:	http://download.qt-project.org/official_releases/qt/5.3/%{version}/subm
 Source1:	http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
 # Source1-md5:	f2332bedc9c1ac8e762c62cfa71aa640
 Patch0:		qtbase-oracle-instantclient.patch
+Patch1:		%{name}-system_cacerts.patch
 URL:		http://qt-project.org/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	EGL-devel
@@ -793,6 +794,7 @@ Generator plików makefile dla aplikacji Qt5.
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version} %{?with_qm:-a1}
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
 
diff --git a/qt5-qtbase-system_cacerts.patch b/qt5-qtbase-system_cacerts.patch
new file mode 100644
index 0000000..916d475
--- /dev/null
+++ b/qt5-qtbase-system_cacerts.patch
@@ -0,0 +1,13 @@
+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 @@
+         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/certs/ca-certificates.crt"), QSsl::Pem)); // PLD
+ # endif
+     }
+ #endif
================================================================

---- gitweb:

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