Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (705f5fb931c96f6bec6c56bae55eb5811a555348)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (705f5fb931c96f6bec6c56bae55eb5811a555348)
  • Date: Fri, 22 Aug 2014 23:37:41 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/libssh2/CONFIGURE | 2 +-
crypto/libssh2/DEPENDS | 6 +++++-
crypto/libssh2/HISTORY | 5 ++++-
3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 705f5fb931c96f6bec6c56bae55eb5811a555348
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libssh2: Allow the use of libressl

diff --git a/crypto/libssh2/CONFIGURE b/crypto/libssh2/CONFIGURE
index 6f4c50b..f5187f5 100755
--- a/crypto/libssh2/CONFIGURE
+++ b/crypto/libssh2/CONFIGURE
@@ -1 +1 @@
-config_query_list SSH2_CRYPTO "which crypto library" libgcrypt openssl
+config_query_list SSH2_CRYPTO "which crypto library" libgcrypt
openssl/libressl
diff --git a/crypto/libssh2/DEPENDS b/crypto/libssh2/DEPENDS
index cd5d2b0..a0115e1 100755
--- a/crypto/libssh2/DEPENDS
+++ b/crypto/libssh2/DEPENDS
@@ -1,2 +1,6 @@
-depends $SSH2_CRYPTO "--with-$SSH2_CRYPTO" &&
+if [ "$SSH2_CRYPTO" = libgcrypt ]; then
+ depends libgcrypt --with-libgcrypt
+else
+ depends SSL --with-openssl
+fi &&
depends zlib
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index c44650b..08bd800 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,7 +1,10 @@
+2014-08-23 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE, DEPENDS: Allow the use of libressl
+
2013-01-20 Treeve Jelbert <treeve AT sourcemage.org>
* CONFIGURE: added, allow choice of openssl, libgcrypt
* DEPENDS: use chosen crypto library
-
+
2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.3




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (705f5fb931c96f6bec6c56bae55eb5811a555348), Ismael Luceno, 08/23/2014

Archive powered by MHonArc 2.6.24.

Top of Page