diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2011-11-29 23:13:29 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2011-11-29 23:13:29 +0100 |
| commit | 6a776d9b89c2db0e71e25d8c7ba0dfaa3ff66f45 (patch) | |
| tree | 72f44751d58fd2f7357ad8b6941cf7551e82330a /redhat/kdebase/r1201705.diff | |
| parent | d2b8d132658dbe56f6a6722a3917f1a7d29e2ef6 (diff) | |
| download | tde-packaging-6a776d9b89c2db0e71e25d8c7ba0dfaa3ff66f45.tar.gz tde-packaging-6a776d9b89c2db0e71e25d8c7ba0dfaa3ff66f45.zip | |
RHEL/Fedora: add forgotten kdebase patches
Diffstat (limited to 'redhat/kdebase/r1201705.diff')
| -rw-r--r-- | redhat/kdebase/r1201705.diff | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/redhat/kdebase/r1201705.diff b/redhat/kdebase/r1201705.diff new file mode 100644 index 000000000..c7dff1e6e --- /dev/null +++ b/redhat/kdebase/r1201705.diff @@ -0,0 +1,43 @@ +Index: kdebase/kcontrol/crypto/crypto.cpp +=================================================================== +--- kdebase/kcontrol/crypto/crypto.cpp (revision 1201704) ++++ kdebase/kcontrol/crypto/crypto.cpp (revision 1201705) +@@ -2316,12 +2316,19 @@ + + + #ifdef HAVE_SSL ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define SSL_CONST const ++#else ++#define SSL_CONST ++#endif ++ + // This gets all the available ciphers from OpenSSL + bool KCryptoConfig::loadCiphers() { + unsigned int i; + SSL_CTX *ctx; + SSL *ssl; +-const SSL_METHOD *meth; ++SSL_CONST SSL_METHOD *meth; + + SSLv2Box->clear(); + SSLv3Box->clear(); +@@ -2337,7 +2344,7 @@ + CipherItem *item; + for (i=0; ; i++) { + int j, k; +- const SSL_CIPHER *sc; ++ SSL_CONST SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; +@@ -2365,7 +2372,7 @@ + + for (i=0; ; i++) { + int j, k; +- const SSL_CIPHER *sc; ++ SSL_CONST SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; |