rpms/qt/devel qt-x11-opensource-src-4.5.3-system_ca_certificates.patch, 1.1, 1.2
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 2 16:21:51 UTC 2009
- Previous message (by thread): rpms/jmol/devel jmol.spec,1.14,1.15
- Next message (by thread): rpms/jmol/EL-5 jmol-11.8-fedorabuild.patch, NONE, 1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30319
Modified Files:
qt-x11-opensource-src-4.5.3-system_ca_certificates.patch
Log Message:
fix botched patch
qt-x11-opensource-src-4.5.3-system_ca_certificates.patch:
qsslsocket_openssl.cpp | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
Index: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.3-system_ca_certificates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 1 Oct 2009 14:28:58 -0000 1.1
+++ qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 2 Oct 2009 16:21:51 -0000 1.2
@@ -1,6 +1,6 @@
diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
--- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates 2009-09-29 06:01:38.000000000 -0500
-+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp 2009-10-01 08:51:30.550913756 -0500
++++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp 2009-10-02 11:20:10.674662746 -0500
@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
@@ -19,7 +19,7 @@ diff -up qt-x11-opensource-src-4.5.3/src
+
// Qt provides a default bundle of certificates
- QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-+ caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
++ caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
return QSslCertificate::fromDevice(&caBundle);
- Previous message (by thread): rpms/jmol/devel jmol.spec,1.14,1.15
- Next message (by thread): rpms/jmol/EL-5 jmol-11.8-fedorabuild.patch, NONE, 1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list