- rel 30

- more openssl1

Changed files:
    kde4-kde3support.spec -> 1.49
    openssl1.patch -> 1.3

diff --git a/kde4-kde3support.spec b/kde4-kde3support.spec
index c0a560ef0903756b22ddab712f68f93e61f426dc..e063dceb6bd96c2bb6a95ebd338381e0b6848a31 100644 (file)
--- a/kde4-kde3support.spec
+++ b/kde4-kde3support.spec
@@ -18,7 +18,7 @@ Summary(ru.UTF-8):    K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):     K Desktop Environment - Бібліотеки
 Name:          kde4-kde3support
 Version:       3.5.10
-Release:       29
+Release:       30
 License:       LGPL
 Group:         X11/Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{origname}-%{version}.tar.bz2

diff --git a/openssl1.patch b/openssl1.patch
index dbf1b6f80a2a29ac278fcf82b90a6a460fb7c860..f180fa05ddce11ccad70b22fa178da890c5d1a63 100644 (file)
--- a/openssl1.patch
+++ b/openssl1.patch
@@ -206,3 +206,17 @@ diff -urN kdelibs-3.5.10/kio/kssl/ksslcertificate.cc kdelibs-3.5.12/kio/kssl/kss
  
        ktf.close();
  
+diff -urN kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc kdelibs-3.5.12/kio/kssl/ksmimecrypto.cc
+--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc    2005-10-10 17:05:44.000000000 +0200
++++ kdelibs-3.5.12/kio/kssl/ksmimecrypto.cc    2010-09-02 23:52:23.000000000 +0200
+@@ -86,8 +86,8 @@
+ }
+ 
+ 
+-STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
+-    STACK_OF(X509) *x509 = sk_new(NULL);
++STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(TQPtrList<KSSLCertificate> &certs) {
++    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
+     KSSLCertificate *cert = certs.first();
+     while(cert) {
+       sk_X509_push(x509, cert->getCert());