Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (bdaad393feddce716fa7c8fb4db0d8dd6112cd5d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (bdaad393feddce716fa7c8fb4db0d8dd6112cd5d)
  • Date: Fri, 2 Dec 2022 05:48:34 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

ftp/curl/HISTORY | 4 +++
ftp/curl/PRE_SUB_DEPENDS | 5 ++++
ftp/curl/REPAIR^all^PRE_SUB_DEPENDS | 11
++++++++++
ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS | 6 -----
ftp/curl/SUB_DEPENDS | 8
+++++++
5 files changed, 28 insertions(+), 6 deletions(-)

New commits:
commit bdaad393feddce716fa7c8fb4db0d8dd6112cd5d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

curl: add SSL sub depends

diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 9f55702..41d18c5 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,7 @@
+2022-12-02 Remko van der Vossen <wich AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS:
+ add SSL sub depends
+
2022-12-01 Remko van der Vossen <wich AT sourcemage.org>
* CONFIGURE, DEPENDS: use optional_depends_one_of for SSL library
selection

diff --git a/ftp/curl/PRE_SUB_DEPENDS b/ftp/curl/PRE_SUB_DEPENDS
index b76a3f0..6993a86 100755
--- a/ftp/curl/PRE_SUB_DEPENDS
+++ b/ftp/curl/PRE_SUB_DEPENDS
@@ -1,6 +1,11 @@
case $THIS_SUB_DEPENDS in
ARES) is_depends_enabled $SPELL c-ares;;
NO_ARES) is_depends_enabled $SPELL c-ares || return 0;;
+ SSL) is_depends_enabled $SPELL gnutls \
+ || is_depends_enabled $SPELL openssl \
+ || is_depends_enabled $SPELL libressl \
+ || is_depends_enabled $SPELL mbedtls \
+ || is_depends_enabled $SPELL wolfssl ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS
b/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..6993a86
--- /dev/null
+++ b/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+ ARES) is_depends_enabled $SPELL c-ares;;
+ NO_ARES) is_depends_enabled $SPELL c-ares || return 0;;
+ SSL) is_depends_enabled $SPELL gnutls \
+ || is_depends_enabled $SPELL openssl \
+ || is_depends_enabled $SPELL libressl \
+ || is_depends_enabled $SPELL mbedtls \
+ || is_depends_enabled $SPELL wolfssl ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS
b/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS
deleted file mode 100755
index b76a3f0..0000000
--- a/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- ARES) is_depends_enabled $SPELL c-ares;;
- NO_ARES) is_depends_enabled $SPELL c-ares || return 0;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/ftp/curl/SUB_DEPENDS b/ftp/curl/SUB_DEPENDS
index 26976f9..2c64b9e 100755
--- a/ftp/curl/SUB_DEPENDS
+++ b/ftp/curl/SUB_DEPENDS
@@ -3,6 +3,14 @@ case $THIS_SUB_DEPENDS in
depends c-ares "--enable-ares=$INSTALL_ROOT/usr" ;;
NO_ARES) message "Curl without c-ares requested, forcing disabled c-ares
dependency" &&
optional_depends c-ares "--disable-ares" ;;
+ SSL) message "Curl with SSL requested, forcing SSL library dependency"
&&
+ depends_one_of CURL_SSL \
+ gnutls '--with-ssl --with-gnutls --without-openssl
--without-nss --without-mbedtls --without-wolfssl' \
+ openssl '--with-ssl --without-gnutls
--with-openssl --without-nss --without-mbedtls --without-wolfssl' \
+ libressl '--with-ssl --without-gnutls
--with-openssl --without-nss --without-mbedtls --without-wolfssl' \
+ mbedtls '--with-ssl --without-gnutls
--without-openssl --without-nss --with-mbedtls --without-wolfssl' \
+ wolfssl '--with-ssl --without-gnutls
--without-openssl --without-nss --without-mbedtls --with-wolfssl' \
+ 'SSL library' ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (bdaad393feddce716fa7c8fb4db0d8dd6112cd5d), Remko van der Vossen, 12/02/2022

Archive powered by MHonArc 2.6.24.

Top of Page