[SM-Commit] GIT changes to master grimoire by George Sherwood (787159ac69ec30de51f14e131bb0ae6fce9c9878)

George Sherwood scm at sourcemage.org
Thu Dec 4 13:58:21 EST 2008


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

 ftp/curl/CONFIGURE |    2 +-
 ftp/curl/DEPENDS   |   10 ++++++++--
 ftp/curl/HISTORY   |    5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 787159ac69ec30de51f14e131bb0ae6fce9c9878
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    curl: Added option to use nss to supply SSL.

diff --git a/ftp/curl/CONFIGURE b/ftp/curl/CONFIGURE
index 0c8d29b..933f9c0 100755
--- a/ftp/curl/CONFIGURE
+++ b/ftp/curl/CONFIGURE
@@ -1 +1 @@
-config_query_list CURL_SSL "Which SSL lib do you want?" none openssl gnutls
+config_query_list CURL_SSL "Which SSL lib do you want?" none openssl gnutls nss
diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS
index ed9bdee..cbae3eb 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -2,17 +2,23 @@ depends  zlib  &&
 
 if [[ "$CURL_SSL" == "gnutls" ]]; then
      depends  gnutls     \
-     "--with-gnutls=$INSTALL_ROOT/usr \
+     "--with-gnutls \
       --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 \
+     "--with-ssl \
       --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 \
+      --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 260daec..6fa03aa 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,8 @@
+2008-12-04 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: Added nss options.  Sooner then I thought. :)
+	  Removed directory info on configure options was causing errors
+	* CONFIGURE: Added option to use nss for SSL.
+
 2008-12-01 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: Removed nss options. Not happening soon.
 



More information about the SM-Commit mailing list