diff options
| author | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
| commit | ecd088049d4aa2e8262f4cc1e0ac45e135964229 (patch) | |
| tree | 49ed22e9e7852fd3f26854aecf41c96169d59629 /redhat/tdebase/r1201705.diff | |
| parent | 855439d3f99b0c152c33ae76a06cce9853f9b8dd (diff) | |
| parent | 01a7863524342e1aec31679e55d08830cc571066 (diff) | |
| download | tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.tar.gz tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdebase/r1201705.diff')
| -rw-r--r-- | redhat/tdebase/r1201705.diff | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/redhat/tdebase/r1201705.diff b/redhat/tdebase/r1201705.diff deleted file mode 100644 index c7dff1e6e..000000000 --- a/redhat/tdebase/r1201705.diff +++ /dev/null @@ -1,43 +0,0 @@ -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; |