From 287a2693cb2f417d6a9704453a94f25910d944fc Mon Sep 17 00:00:00 2001 From: Tomáš Mráz Date: Aug 26 2009 09:44:11 +0000 Subject: - more openssl-1.0 build fixes --- diff --git a/qt-x11-opensource-src-4.5.2-ossl10.patch b/qt-x11-opensource-src-4.5.2-ossl10.patch index efc702f..7820549 100644 --- a/qt-x11-opensource-src-4.5.2-ossl10.patch +++ b/qt-x11-opensource-src-4.5.2-ossl10.patch @@ -1,3 +1,15 @@ +diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp +--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.openssl 2009-06-20 06:57:57.000000000 +0200 ++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp 2009-08-26 11:43:31.000000000 +0200 +@@ -362,7 +362,7 @@ QMultiMapx509) + return result; + +- STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); ++ STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); + + if (altNames) { + for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) { diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp --- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl 2009-06-20 06:57:57.000000000 +0200 +++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp 2009-08-26 10:40:09.000000000 +0200