Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 ftp/curl/BUILD     |    5 +++++
 ftp/curl/CONFIGURE |    1 +
 ftp/curl/DEPENDS   |   31 +++++++++++++++++++------------
 ftp/curl/HISTORY   |    5 +++++
 4 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit 5877bea419741df3135df711d961ea0af98a799c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    curl: Fixed so that it will do https with either openssl or
    gnutls.  According to curl dev we should only be using one
    of these two.  Still working on getting nss to provide ssl.

diff --git a/ftp/curl/BUILD b/ftp/curl/BUILD
new file mode 100755
index 0000000..22c63c9
--- /dev/null
+++ b/ftp/curl/BUILD
@@ -0,0 +1,5 @@
+if [[ "$CURL_SSL" == "none" ]]; then
+   OPTS="--without-gnutls --without-nss --without-ssl $OPTS"
+fi &&
+
+default_build
diff --git a/ftp/curl/CONFIGURE b/ftp/curl/CONFIGURE
new file mode 100755
index 0000000..0c8d29b
--- /dev/null
+++ b/ftp/curl/CONFIGURE
@@ -0,0 +1 @@
+config_query_list CURL_SSL "Which SSL lib do you want?" none openssl gnutls
diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS
index efda616..bd9a087 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -1,17 +1,24 @@
 depends  zlib  &&
 
-optional_depends  gnutls                                       \
-                  "--with-gnutls=$INSTALL_ROOT/usr"            \
-                  '--without-gnutls'                           \
-                  'for encrypted communications using GNUTLS'  &&
-
-optional_depends  openssl                          \
-                  "--with-ssl=$INSTALL_ROOT/usr --without-ca-bundle 
--with-ca-path=$INSTALL_ROOT/etc/ssl/certs"   \
-                  '--without-ssl'                  \
-                  "for https encrypted transport"  &&
-
-if is_depends_enabled $SPELL openssl; then
-  depends ca-certificates
+if [[ "$CURL_SSL" == "gnutls" ]]; then
+     depends  gnutls     \
+     "--with-gnutls=$INSTALL_ROOT/usr \
+      --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
+      --without-ssl --without-nss" &&
+     depends ca-certificates
+elif [[ "$CURL_SSL" == "openssl" ]]; then
+     depends  openssl         \
+     "--with-ssl=$INSTALL_ROOT/usr \
+      --without-ca-bundle \
+      --with-ca-path=$INSTALL_ROOT/etc/ssl/certs \
+      --without-gnutls --without-nss"  &&
+      depends ca-certificates
+#elif [[ "$CURL_SSL" == "nss" ]]; then
+#     depends  nss         \
+#     "--with-nss=$INSTALL_ROOT/usr \
+#      --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
+#      --without-gnutls --without-ssl"  &&
+#     depends ca-certificates
 fi &&
 
 optional_depends  libssh2                              \
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 3adf6ab..9189617 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,8 @@
+2008-11-29 George Sherwood <gsherwood AT sourcemage.org>
+       * BUILD: Added to set options for no SSL
+       * CONFIGURE: Added for SSL query
+       * DEPENDS: Modified to set options correctly depending on ssl selected
+
 2008-11-27 George Sherwood <gsherwood AT sourcemage.org>
        * DEPENDS: add options for openssl to use ca-certificates
          add depends ca-certificates if using openssl