- new patch for customizing location of system CA certificates

diff --git a/qt5-qtbase-system_cacerts.patch b/qt5-qtbase-system_cacerts.patch
new file mode 100644 (file)
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

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 7c8f2b671668df638ec1c4c1eb3a732d463b5c0d..182371734cfe7742b6f1b4ed06b7cc5da45c6b49 100644 (file)
--- 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