diff options
author | Remko van der Vossen | 2022-11-30 14:24:42 +0100 |
---|---|---|
committer | Remko van der Vossen | 2022-11-30 14:24:42 +0100 |
commit | a07458a1e89df7f5ddc679f1386c2bca565f7d80 (patch) | |
tree | 880a880e4197d7c0c58efb25c956e276189847da /ftp | |
parent | 78b9d33a79484808d1d329e557b894e82bfc73b5 (diff) |
wget: use {optional_,}depends_one_of for SSL library
Diffstat (limited to 'ftp')
-rwxr-xr-x | ftp/wget/CONFIGURE | 7 | ||||
-rwxr-xr-x | ftp/wget/DEPENDS | 18 | ||||
-rwxr-xr-x | ftp/wget/SUB_DEPENDS | 13 |
3 files changed, 15 insertions, 23 deletions
diff --git a/ftp/wget/CONFIGURE b/ftp/wget/CONFIGURE index 0cbdfafcbe..dfa83efa50 100755 --- a/ftp/wget/CONFIGURE +++ b/ftp/wget/CONFIGURE @@ -1,9 +1,2 @@ -if [[ "$WGET_SSL" == "openssl" ]]; then - WGET_SSL="SSL" && - persistent_add WGET_SSL -fi && - -config_query_list WGET_SSL "Which SSL backend do you want for https and ftps?" none gnutls SSL && - config_query_option WGET_OPTS "Enable IPv6 support?" y \ "--enable-ipv6" "--disable-ipv6" diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS index 297d610840..55057526b9 100755 --- a/ftp/wget/DEPENDS +++ b/ftp/wget/DEPENDS @@ -1,3 +1,5 @@ +. "$GRIMOIRE/depends_one_of.function" + depends smgl-fhs && optional_depends pcre \ @@ -50,13 +52,9 @@ optional_depends util-linux \ '--without-libuuid' \ 'for UUID generation for WARC files' && -case $WGET_SSL in - none) - ;; - gnutls) depends gnutls "--with-ssl=gnutls" - ;; - SSL) - depends SSL "--with-ssl=openssl" && - optional_depends ca-certificates '' '' 'provides security certificates' - ;; -esac +optional_depends_one_of WGET_SSL \ + gnutls '--with-ssl=gnutls' \ + openssl '--with-ssl=openssl' \ + libressl '--with-ssl=openssl' \ + '--without-ssl' \ + 'SSL library' diff --git a/ftp/wget/SUB_DEPENDS b/ftp/wget/SUB_DEPENDS index e530c54899..5b326ee041 100755 --- a/ftp/wget/SUB_DEPENDS +++ b/ftp/wget/SUB_DEPENDS @@ -1,11 +1,12 @@ +. "$GRIMOIRE/depends_one_of.function" + case $THIS_SUB_DEPENDS in SSL) message "wget with SSL backend is requested, forcing it" && - case $WGET_SSL in - gnutls) depends gnutls "--with-ssl=gnutls" - ;; - SSL) depends SSL "--with-ssl=openssl" - ;; - esac + depends_one_of WGET_SSL \ + gnutls '--with-ssl=gnutls' \ + openssl '--with-ssl=openssl' \ + libressl '--with-ssl=openssl' \ + 'SSL library' ;; *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; false ;; esac |