diff options
author | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
---|---|---|
committer | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
commit | 7a0adf35896618a7570e425941fc1b74c54def47 (patch) | |
tree | 16dab9d8bfbd93575440f357c70907cbb5480980 /mandriva/2010.2/kdebase/fix_openssl.patch | |
parent | cd71be65dc30c8007ec54becdf6c50260ed8e908 (diff) | |
parent | a8707e2a9f22d082cecb8ea6079175076f983c55 (diff) | |
download | tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.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.patch | 30 |
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; |