Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (115e67169d155dc0dae393aefe175b2ddd767c35)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (115e67169d155dc0dae393aefe175b2ddd767c35)
  • Date: Thu, 23 Dec 2010 19:56:07 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

ftp-libs/dclib/DEPENDS | 3 +-
ftp-libs/dclib/HISTORY | 4 ++
ftp-libs/dclib/PRE_BUILD | 6 ++++
ftp-libs/dclib/dclib-openssl-1.patch | 50
+++++++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+), 1 deletion(-)

New commits:
commit 115e67169d155dc0dae393aefe175b2ddd767c35
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

ftp-libs/dclib: added openssl dependency and patch to build with its 1.0
branch

diff --git a/ftp-libs/dclib/DEPENDS b/ftp-libs/dclib/DEPENDS
index b431aa4..5be670b 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 03296eb..54f33ce 100644
--- a/ftp-libs/dclib/HISTORY
+++ b/ftp-libs/dclib/HISTORY
@@ -1,3 +1,7 @@
+2010-12-23 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added openssl
+ * PRE_BUILD, dclib-openssl-1.patch: added to build with openssl 1.0
+
2010-06-20 Bor Kraljič <pyrobor AT 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 0000000..8a864bf
--- /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 0000000..b577d8a
--- /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 )



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (115e67169d155dc0dae393aefe175b2ddd767c35), Pol Vinogradov, 12/23/2010

Archive powered by MHonArc 2.6.24.

Top of Page