diff options
| author | Pol Vinogradov | 2010-12-23 20:55:51 -0500 |
|---|---|---|
| committer | Pol Vinogradov | 2010-12-23 20:55:51 -0500 |
| commit | 115e67169d155dc0dae393aefe175b2ddd767c35 (patch) | |
| tree | fc9517b5d92a4701fc05a66eeb65ca5a58ec1858 /ftp-libs | |
| parent | f0710315e95c1e93f628ff7e86a12d04d1f06b75 (diff) | |
ftp-libs/dclib: added openssl dependency and patch to build with its 1.0 branch
Diffstat (limited to 'ftp-libs')
| -rwxr-xr-x | ftp-libs/dclib/DEPENDS | 3 | ||||
| -rw-r--r-- | ftp-libs/dclib/HISTORY | 4 | ||||
| -rwxr-xr-x | ftp-libs/dclib/PRE_BUILD | 6 | ||||
| -rw-r--r-- | ftp-libs/dclib/dclib-openssl-1.patch | 50 |
4 files changed, 62 insertions, 1 deletions
diff --git a/ftp-libs/dclib/DEPENDS b/ftp-libs/dclib/DEPENDS index b431aa4e07..5be670b7b8 100755 --- a/ftp-libs/dclib/DEPENDS +++ b/ftp-libs/dclib/DEPENDS @@ -1 +1,2 @@ -depends libxml2 +depends libxml2 && +depends openssl diff --git a/ftp-libs/dclib/HISTORY b/ftp-libs/dclib/HISTORY index 03296eb8b5..54f33cedfd 100644 --- a/ftp-libs/dclib/HISTORY +++ b/ftp-libs/dclib/HISTORY @@ -1,3 +1,7 @@ +2010-12-23 Pol Vinogradov <vin.public@gmail.com> + * DEPENDS: added openssl + * PRE_BUILD, dclib-openssl-1.patch: added to build with openssl 1.0 + 2010-06-20 Bor Kraljič <pyrobor@ver.si> * DETAILS: updated spell to 0.3.23 diff --git a/ftp-libs/dclib/PRE_BUILD b/ftp-libs/dclib/PRE_BUILD new file mode 100755 index 0000000000..8a864bfb3e --- /dev/null +++ b/ftp-libs/dclib/PRE_BUILD @@ -0,0 +1,6 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && + +if [[ "$(installed_version openssl | cut -d. -f-2)" == "1.0" ]]; then + patch -p0 < ${SCRIPT_DIRECTORY}/dclib-openssl-1.patch +fi diff --git a/ftp-libs/dclib/dclib-openssl-1.patch b/ftp-libs/dclib/dclib-openssl-1.patch new file mode 100644 index 0000000000..b577d8acf3 --- /dev/null +++ b/ftp-libs/dclib/dclib-openssl-1.patch @@ -0,0 +1,50 @@ +--- dclib/core/cssl.cpp ++++ dclib/core/cssl.cpp +@@ -86,7 +86,11 @@ + /** */ + SSL_CTX * CSSL::InitClientCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *method; ++ #else + SSL_METHOD *method; ++ #endif + SSL_CTX *ctx = NULL; + + method = SSLv23_client_method(); /* Create new client-method instance */ +@@ -109,7 +113,11 @@ + /** */ + SSL_CTX * CSSL::InitServerCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *method; ++ #else + SSL_METHOD *method; ++ #endif + SSL_CTX *ctx = NULL; + + method = SSLv23_server_method(); /* Create new client-method instance */ +@@ -130,7 +138,11 @@ + /** */ + SSL_CTX * CSSL::NewTLSv1ClientCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD * method = TLSv1_client_method(); ++ #else + SSL_METHOD * method = TLSv1_client_method(); ++ #endif + SSL_CTX * ctx = NULL; + + if ( method != NULL ) +@@ -149,7 +161,11 @@ + /** */ + SSL_CTX * CSSL::NewTLSv1ServerCTX() + { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD * method = TLSv1_server_method(); ++ #else + SSL_METHOD * method = TLSv1_server_method(); ++ #endif + SSL_CTX * ctx = NULL; + + if ( method != NULL ) |