rpms/qt/devel qt-x11-opensource-src-4.5.2-ossl10.patch,1.2,1.3

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30701

Modified Files:
	qt-x11-opensource-src-4.5.2-ossl10.patch 
Log Message:
- one more fix needed


qt-x11-opensource-src-4.5.2-ossl10.patch:
 qsslcertificate.cpp            |    4 ++--
 qsslsocket_openssl.cpp         |    2 +-
 qsslsocket_openssl_symbols.cpp |   24 ++++++++++++------------
 qsslsocket_openssl_symbols_p.h |   32 ++++++++++++++++++++------------
 4 files changed, 35 insertions(+), 27 deletions(-)

Index: qt-x11-opensource-src-4.5.2-ossl10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.2-ossl10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 09:44:11 -0000	1.2
+++ qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 10:15:18 -0000	1.3
@@ -1,6 +1,6 @@
 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
++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-26 12:14:32.000000000 +0200
 @@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
      if (!d->x509)
          return result;
@@ -10,6 +10,15 @@ diff -up qt-x11-opensource-src-4.5.2/src
  
      if (altNames) {
          for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) {
+@@ -383,7 +383,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
+             else if (genName->type == GEN_EMAIL)
+                 result.insert(QSsl::EmailEntry, altName);
+         }
+-        q_sk_free(altNames);
++        q_sk_free((STACK *)altNames);
+     }
+ 
+     return result;
 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