Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (714e7b5f2d71a47f3f43f24e90e278b2a404d839)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (714e7b5f2d71a47f3f43f24e90e278b2a404d839)
  • Date: Tue, 16 Aug 2011 19:38:13 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

ftp/wget/BUILD | 2 ++
ftp/wget/CONFIGURE | 2 ++
ftp/wget/DEPENDS | 12 ++++++++----
ftp/wget/HISTORY | 2 ++
ftp/wget/PRE_SUB_DEPENDS | 5 ++++-
ftp/wget/SUB_DEPENDS | 11 ++++++++++-
6 files changed, 28 insertions(+), 6 deletions(-)

New commits:
commit 714e7b5f2d71a47f3f43f24e90e278b2a404d839
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wget can use none, openssl and gnutls as ssl backend now

diff --git a/ftp/wget/BUILD b/ftp/wget/BUILD
index 4d779db..480741f 100755
--- a/ftp/wget/BUILD
+++ b/ftp/wget/BUILD
@@ -1,3 +1,5 @@
+[[ $WGET_SSL == "none" ]] && OPTS="--without-ssl $OPTS"
+
OPTS="$WGET_OPTS $OPTS --build=${BUILD}"
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"

diff --git a/ftp/wget/CONFIGURE b/ftp/wget/CONFIGURE
index dfa83ef..98c06e0 100755
--- a/ftp/wget/CONFIGURE
+++ b/ftp/wget/CONFIGURE
@@ -1,2 +1,4 @@
+config_query_list WGET_SSL "Which SSL backend do you want for https and
ftps?" none gnutls openssl &&
+
config_query_option WGET_OPTS "Enable IPv6 support?" y \
"--enable-ipv6" "--disable-ipv6"
diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index 88eeb81..fefc43b 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -16,10 +16,14 @@ optional_depends "texinfo" \
"" \
"to build info files" &&

-optional_depends "openssl" \
- "--with-ssl=openssl" \
- "--without-ssl" \
- "for https and ftps" &&
+case $WGET_SSL in
+ none)
+ ;;
+ gnutls) depends gnutls "--with-ssl=gnutls"
+ ;;
+ openssl) depends openssl "--with-ssl=openssl"
+ ;;
+esac

if is_depends_enabled $SPELL openssl ; then
optional_depends ca-certificates \
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index aa364ce..2a92a64 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,5 +1,7 @@
2011-08-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.13.1
+ * CONFIGURE, DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS, BUILD:
+ none, openssl and gnutls can be used for wget ssl backend now

2011-08-16 Vlad Glagolev <stealth AT sourcemage.org>
* SUB_DEPENDS: subdeps are used in configure stage; allow to build
diff --git a/ftp/wget/PRE_SUB_DEPENDS b/ftp/wget/PRE_SUB_DEPENDS
index fe1f8b9..be2be9d 100755
--- a/ftp/wget/PRE_SUB_DEPENDS
+++ b/ftp/wget/PRE_SUB_DEPENDS
@@ -1,5 +1,8 @@
case $THIS_SUB_DEPENDS in
- SSL) is_depends_enabled $SPELL openssl && return 0 ;;
+ SSL) if is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL
gnutls; then
+ return 0
+ fi
+ ;;
*) echo "unknown sub_depends!" ;;
esac
return 1
diff --git a/ftp/wget/SUB_DEPENDS b/ftp/wget/SUB_DEPENDS
index 058a7f3..0c45289 100755
--- a/ftp/wget/SUB_DEPENDS
+++ b/ftp/wget/SUB_DEPENDS
@@ -1,4 +1,13 @@
case $THIS_SUB_DEPENDS in
- SSL) depends openssl '--with-ssl=openssl';;
+ SSL) message "wget with SSL backend is requested, forcing it" &&
+ persistent_remove WGET_SSL &&
+ config_query_list WGET_SSL "Which SSL backend do you want for https
and ftps?" gnutls openssl &&
+ case $WGET_SSL in
+ gnutls) depends gnutls "--with-ssl=gnutls"
+ ;;
+ openssl) depends openssl "--with-ssl=openssl"
+ ;;
+ esac
+ ;;
*) echo "unknown sub_depends $THIS_SUB_DEPENDS"; false ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (714e7b5f2d71a47f3f43f24e90e278b2a404d839), Ladislav Hagara, 08/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page