diff options
| author | Vlad Glagolev | 2014-10-31 18:10:17 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2014-10-31 18:10:17 +0300 |
| commit | acc58e17e372eac5ca64c6d1a8260d507dcb8073 (patch) | |
| tree | 3bf386479dbaa6e2fa8d666a4c471f38b79739f5 /collab | |
| parent | 530a7251ce1178e48d134430d3c8238ae50460b2 (diff) | |
Revert "libssh - fix build with libressl"
This reverts commit 75391160584a7b620f2f8dc6a38344f5bb1a0d82.
Diffstat (limited to 'collab')
| -rwxr-xr-x | collab/openldap/CONFIGURE | 1 | ||||
| -rwxr-xr-x | collab/openldap/DEPENDS | 2 | ||||
| -rw-r--r-- | collab/openldap/HISTORY | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/collab/openldap/CONFIGURE b/collab/openldap/CONFIGURE index 4fc53e57ce..8ea1eb8fb2 100755 --- a/collab/openldap/CONFIGURE +++ b/collab/openldap/CONFIGURE @@ -25,7 +25,6 @@ fi && config_query_list OPENLDAP_TLS "Which backend do you want for TLS/SSL support?" \ none \ openssl \ - libressl \ gnutls \ moznss && diff --git a/collab/openldap/DEPENDS b/collab/openldap/DEPENDS index 78f421ed58..b7e2902aab 100755 --- a/collab/openldap/DEPENDS +++ b/collab/openldap/DEPENDS @@ -9,7 +9,7 @@ optional_depends SYSTEM-LOGGER \ case $OPENLDAP_TLS in none) OPTS="--without-tls $OPTS" ;; - SSL) depends SSL "--with-tls=openssl" + SSL) depends openssl "--with-tls=openssl" ;; gnutls) depends gnutls "--with-tls=gnutls" ;; diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY index 9f3472aac4..e86613dffd 100644 --- a/collab/openldap/HISTORY +++ b/collab/openldap/HISTORY @@ -1,6 +1,6 @@ 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL - * CONFIGURE: fix + * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL 2014-01-30 Vlad Glagolev <stealth@sourcemage.org> |