Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ddns-scripts_route53-v1: Fix problems detecting curl

Browse source 
Ensure cURL is installed and has SSL support. This fixes
issue 6744.

Signed-off-by: Martin Konrad <info@martin-konrad.net>
This commit is contained in:
Martin Konrad 2018-08-12 23:19:08 -04:00 committed by Martin Konrad
parent da77cb5683
commit c9b5b02200
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ddns-scripts/Makefile
View file

@ -12,7 +12,7 @@ PKG_NAME:=ddns-scripts
PKG_VERSION:=2.7.8 PKG_VERSION:=2.7.8
# Release == build # Release == build
# increase on changes of services files or tld_names.dat # increase on changes of services files or tld_names.dat
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:= PKG_MAINTAINER:=

5
net/ddns-scripts/files/dynamic_dns_functions.sh
View file

@ -78,7 +78,8 @@ WGET=$(which wget)
WGET_SSL=$(which wget-ssl) WGET_SSL=$(which wget-ssl)
CURL=$(which curl) CURL=$(which curl)
# CURL_SSL not empty then SSL support available
CURL_SSL=$($(which curl) -V 2>/dev/null | grep "Protocols:" | grep -F "https")
# CURL_PROXY not empty then Proxy support available # CURL_PROXY not empty then Proxy support available
CURL_PROXY=$(find /lib /usr/lib -name libcurl.so* -exec strings {} 2>/dev/null \; | grep -im1 "all_proxy") CURL_PROXY=$(find /lib /usr/lib -name libcurl.so* -exec strings {} 2>/dev/null \; | grep -im1 "all_proxy")
@ -726,8 +727,6 @@ do_transfer() {
# 2nd choice is cURL IPv4/IPv6/HTTPS # 2nd choice is cURL IPv4/IPv6/HTTPS
# libcurl might be compiled without Proxy or HTTPS Support # libcurl might be compiled without Proxy or HTTPS Support
elif [ -n "$CURL" ]; then elif [ -n "$CURL" ]; then
# CURL_SSL not empty then SSL support available
CURL_SSL=$($(which curl) -V 2>/dev/null | grep "Protocols:" | grep -F "https")
__PROG="$CURL -RsS -o $DATFILE --stderr $ERRFILE" __PROG="$CURL -RsS -o $DATFILE --stderr $ERRFILE"
# check HTTPS support # check HTTPS support
[ -z "$CURL_SSL" -a $use_https -eq 1 ] && \ [ -z "$CURL_SSL" -a $use_https -eq 1 ] && \