summaryrefslogtreecommitdiffstats
path: root/mandriva/2010.2/kdebase/fix_openssl.patch
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-10-14 23:31:33 -0500
committerTimothy Pearson <[email protected]>2011-10-14 23:31:33 -0500
commitd2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b (patch)
tree86eec4e4a0f6ba88cc7e6fab9ec926bc93d72396 /mandriva/2010.2/kdebase/fix_openssl.patch
parentf63b035a91cf5baff629f5e5dee4aeb7efe8d57b (diff)
parentec2515f058c60d2478a549f58376db628ba556b9 (diff)
downloadtde-packaging-d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b.tar.gz
tde-packaging-d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/kdebase/fix_openssl.patch')
-rw-r--r--mandriva/2010.2/kdebase/fix_openssl.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdebase/fix_openssl.patch b/mandriva/2010.2/kdebase/fix_openssl.patch
new file mode 100644
index 000000000..373a39b4b
--- /dev/null
+++ b/mandriva/2010.2/kdebase/fix_openssl.patch
@@ -0,0 +1,30 @@
+diff -Naur kdebase-3.5.10/kcontrol/crypto/crypto.cpp kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp
+--- kdebase-3.5.10/kcontrol/crypto/crypto.cpp 2006-10-01 20:31:49.000000000 +0300
++++ kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp 2010-05-05 08:27:59.323611142 +0300
+@@ -2321,7 +2321,7 @@
+ unsigned int i;
+ SSL_CTX *ctx;
+ SSL *ssl;
+-SSL_METHOD *meth;
++SSL_METHOD const *meth;
+
+ SSLv2Box->clear();
+ SSLv3Box->clear();
+@@ -2337,7 +2337,7 @@
+ CipherItem *item;
+ for (i=0; ; i++) {
+ int j, k;
+- SSL_CIPHER *sc;
++ SSL_CIPHER const *sc;
+ sc = (meth->get_cipher)(i);
+ if (!sc)
+ break;
+@@ -2365,7 +2365,7 @@
+
+ for (i=0; ; i++) {
+ int j, k;
+- SSL_CIPHER *sc;
++ SSL_CIPHER const *sc;
+ sc = (meth->get_cipher)(i);
+ if (!sc)
+ break;